diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
index 7fad64b118..09e679b5f4 100644
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -16,7 +16,9 @@ on:
         required: true
         type: string
     secrets:
-      ACCESS_TOKEN:
+      GH_APP_ID:
+        required: true
+      GH_APP_PRIVATE_KEY:
         required: true
       ANDROID_RELEASE_KEYSTORE_B64:
         required: true
@@ -30,12 +32,21 @@ jobs:
     name: ${{ inputs.app-type-lower }}-build
     runs-on: ubuntu-latest
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           fetch-depth: 1
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
diff --git a/.github/workflows/create-tag.yml b/.github/workflows/create-tag.yml
new file mode 100644
index 0000000000..b909b3b32e
--- /dev/null
+++ b/.github/workflows/create-tag.yml
@@ -0,0 +1,99 @@
+name: Create Tag
+
+on:
+  push:
+    branches:
+      - 'release/student'
+      - 'release/teacher'
+      - 'release/parent'
+
+jobs:
+  create-tag:
+    name: create-tag
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: write
+    env:
+      JIRA_USERNAME: ${{ secrets.JIRA_USERNAME }}
+      JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Determine app from branch
+        id: app-info
+        run: |
+          APP_NAME=$(echo "${GITHUB_REF_NAME}" | sed 's|release/||')
+          echo "app-name=${APP_NAME}" >> "$GITHUB_OUTPUT"
+
+          VERSION_CODE=$(grep 'versionCode' apps/${APP_NAME}/build.gradle | head -1 | awk '{print $NF}')
+          VERSION_NAME=$(grep 'versionName' apps/${APP_NAME}/build.gradle | head -1 | awk '{print $NF}')
+          VERSION_NAME=${VERSION_NAME//\"/}
+          VERSION_NAME=${VERSION_NAME//\'/}
+
+          TAG="${APP_NAME}-${VERSION_NAME}-${VERSION_CODE}"
+          echo "version-code=${VERSION_CODE}" >> "$GITHUB_OUTPUT"
+          echo "version-name=${VERSION_NAME}" >> "$GITHUB_OUTPUT"
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+
+          echo "App: ${APP_NAME}"
+          echo "Version: ${VERSION_NAME} (${VERSION_CODE})"
+          echo "Tag: ${TAG}"
+
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Create and push tag
+        id: create-tag
+        run: |
+          TAG="${{ steps.app-info.outputs.tag }}"
+          if git rev-parse "$TAG" >/dev/null 2>&1; then
+            echo "Tag $TAG already exists, skipping tag creation"
+            echo "tag-exists=true" >> "$GITHUB_OUTPUT"
+          else
+            git tag "$TAG"
+            git push origin "$TAG"
+            echo "tag-exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create GitHub Release
+        if: steps.create-tag.outputs.tag-exists != 'true'
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          APP_NAME="${{ steps.app-info.outputs.app-name }}"
+          VERSION_NAME="${{ steps.app-info.outputs.version-name }}"
+          VERSION_CODE="${{ steps.app-info.outputs.version-code }}"
+          TAG="${{ steps.app-info.outputs.tag }}"
+
+          gh release create "$TAG" \
+            --title "${APP_NAME} ${VERSION_NAME} (${VERSION_CODE})" \
+            --notes "${APP_NAME} ${VERSION_NAME} (${VERSION_CODE})" \
+            --draft
+
+      - name: Update JIRA fix versions
+        if: steps.create-tag.outputs.tag-exists != 'true' && env.JIRA_USERNAME != ''
+        run: |
+          cd scripts
+          npm install jira-client@4.0.1
+          node update-jira-issues.js "${{ steps.app-info.outputs.tag }}"
\ No newline at end of file
diff --git a/.github/workflows/deploy-parent.yml b/.github/workflows/deploy-parent.yml
new file mode 100644
index 0000000000..534374088c
--- /dev/null
+++ b/.github/workflows/deploy-parent.yml
@@ -0,0 +1,79 @@
+name: Deploy Parent
+
+on:
+  push:
+    tags:
+      - 'parent-*'
+
+concurrency:
+  group: deploy-parent
+  cancel-in-progress: false
+
+jobs:
+  build-and-deploy:
+    name: build-and-deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: wrapper
+          java-version: '17'
+
+      - name: Decode release keystore
+        env:
+          KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
+        run: |
+          echo "$KEYSTORE_B64" | base64 --decode > release.jks
+          chmod 600 release.jks
+
+      - name: Build production release
+        run: |
+          ./gradle/gradlew -p apps \
+            :parent:assembleProdRelease \
+            :parent:bundleProdRelease \
+            --stacktrace \
+            --build-cache \
+            --parallel \
+            --max-workers=4 \
+            --no-daemon \
+            -Dorg.gradle.jvmargs="-Xmx6g -XX:+HeapDumpOnOutOfMemoryError" \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            -Pandroid.injected.signing.store.file=$(pwd)/release.jks \
+            -Pandroid.injected.signing.store.password="${KEYSTORE_PASSWORD}" \
+            -Pandroid.injected.signing.key.alias="${KEYSTORE_KEY_ALIAS}" \
+            -Pandroid.injected.signing.key.password="${KEYSTORE_KEY_PASSWORD}"
+        env:
+          GRADLE_OPTS: "-Djava.net.preferIPv4Stack=true"
+          KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+          KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD }}
+
+      - name: Upload to Google Play
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_ACCOUNT_KEY }}
+          packageName: com.instructure.parentapp
+          releaseFiles: apps/parent/build/outputs/bundle/prodRelease/parent-prod-release.aab
+          track: internal
+          status: completed
+
+      - name: Cleanup sensitive files
+        if: always()
+        run: rm -f release.jks
\ No newline at end of file
diff --git a/.github/workflows/deploy-student.yml b/.github/workflows/deploy-student.yml
new file mode 100644
index 0000000000..44d4fde07a
--- /dev/null
+++ b/.github/workflows/deploy-student.yml
@@ -0,0 +1,86 @@
+name: Deploy Student
+
+on:
+  push:
+    tags:
+      - 'student-*'
+
+concurrency:
+  group: deploy-student
+  cancel-in-progress: false
+
+jobs:
+  build-and-deploy:
+    name: build-and-deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: wrapper
+          java-version: '17'
+
+      - name: Decode release keystore
+        env:
+          KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
+        run: |
+          echo "$KEYSTORE_B64" | base64 --decode > release.jks
+          chmod 600 release.jks
+
+      - name: Build production release
+        run: |
+          ./gradle/gradlew -p apps \
+            :student:assembleProdRelease \
+            :student:bundleProdRelease \
+            --stacktrace \
+            --build-cache \
+            --parallel \
+            --max-workers=4 \
+            --no-daemon \
+            -Dorg.gradle.jvmargs="-Xmx6g -XX:+HeapDumpOnOutOfMemoryError" \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            -Pandroid.injected.signing.store.file=$(pwd)/release.jks \
+            -Pandroid.injected.signing.store.password="${KEYSTORE_PASSWORD}" \
+            -Pandroid.injected.signing.key.alias="${KEYSTORE_KEY_ALIAS}" \
+            -Pandroid.injected.signing.key.password="${KEYSTORE_KEY_PASSWORD}"
+        env:
+          GRADLE_OPTS: "-Djava.net.preferIPv4Stack=true"
+          KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+          KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD }}
+
+      - name: Extract update priority
+        id: priority
+        run: |
+          UPDATE_PRIORITY=$(grep 'updatePriority' apps/student/build.gradle | head -1 | awk '{print $NF}')
+          echo "value=${UPDATE_PRIORITY}" >> "$GITHUB_OUTPUT"
+
+      - name: Upload to Google Play
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_ACCOUNT_KEY }}
+          packageName: com.instructure.candroid
+          releaseFiles: apps/student/build/outputs/bundle/prodRelease/student-prod-release.aab
+          track: internal
+          inAppUpdatePriority: ${{ steps.priority.outputs.value }}
+          status: completed
+
+      - name: Cleanup sensitive files
+        if: always()
+        run: rm -f release.jks
\ No newline at end of file
diff --git a/.github/workflows/deploy-teacher.yml b/.github/workflows/deploy-teacher.yml
new file mode 100644
index 0000000000..22b57be63c
--- /dev/null
+++ b/.github/workflows/deploy-teacher.yml
@@ -0,0 +1,86 @@
+name: Deploy Teacher
+
+on:
+  push:
+    tags:
+      - 'teacher-*'
+
+concurrency:
+  group: deploy-teacher
+  cancel-in-progress: false
+
+jobs:
+  build-and-deploy:
+    name: build-and-deploy
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: wrapper
+          java-version: '17'
+
+      - name: Decode release keystore
+        env:
+          KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
+        run: |
+          echo "$KEYSTORE_B64" | base64 --decode > release.jks
+          chmod 600 release.jks
+
+      - name: Build production release
+        run: |
+          ./gradle/gradlew -p apps \
+            :teacher:assembleProdRelease \
+            :teacher:bundleProdRelease \
+            --stacktrace \
+            --build-cache \
+            --parallel \
+            --max-workers=4 \
+            --no-daemon \
+            -Dorg.gradle.jvmargs="-Xmx6g -XX:+HeapDumpOnOutOfMemoryError" \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            -Pandroid.injected.signing.store.file=$(pwd)/release.jks \
+            -Pandroid.injected.signing.store.password="${KEYSTORE_PASSWORD}" \
+            -Pandroid.injected.signing.key.alias="${KEYSTORE_KEY_ALIAS}" \
+            -Pandroid.injected.signing.key.password="${KEYSTORE_KEY_PASSWORD}"
+        env:
+          GRADLE_OPTS: "-Djava.net.preferIPv4Stack=true"
+          KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+          KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD }}
+
+      - name: Extract update priority
+        id: priority
+        run: |
+          UPDATE_PRIORITY=$(grep 'updatePriority' apps/teacher/build.gradle | head -1 | awk '{print $NF}')
+          echo "value=${UPDATE_PRIORITY}" >> "$GITHUB_OUTPUT"
+
+      - name: Upload to Google Play
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_ACCOUNT_KEY }}
+          packageName: com.instructure.teacher
+          releaseFiles: apps/teacher/build/outputs/bundle/prodRelease/teacher-prod-release.aab
+          track: internal
+          inAppUpdatePriority: ${{ steps.priority.outputs.value }}
+          status: completed
+
+      - name: Cleanup sensitive files
+        if: always()
+        run: rm -f release.jks
\ No newline at end of file
diff --git a/.github/workflows/import-translations.yml b/.github/workflows/import-translations.yml
new file mode 100644
index 0000000000..d0dbc99543
--- /dev/null
+++ b/.github/workflows/import-translations.yml
@@ -0,0 +1,46 @@
+name: Import Translations
+
+on:
+  workflow_dispatch:
+
+jobs:
+  import-translations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Configure git
+        run: |
+          git config user.name "inst-danger"
+          git config user.email "ios@instructure.com"
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+
+      - name: Import translations from S3
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.TRANSLATIONS_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.TRANSLATIONS_AWS_SECRET_ACCESS_KEY }}
+        run: ruby translations/import.rb
+
+      - name: Create pull request
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          BRANCH=$(git branch --show-current)
+          gh pr create --base master --title "Update translations" --body "Automated translation import" --head "$BRANCH"
\ No newline at end of file
diff --git a/.github/workflows/pr-pipeline.yml b/.github/workflows/pr-pipeline.yml
index 2b0a1c9dce..1daedd2349 100644
--- a/.github/workflows/pr-pipeline.yml
+++ b/.github/workflows/pr-pipeline.yml
@@ -25,7 +25,8 @@ jobs:
       app-type-lower: parent
       firebase-app-id-secret: FIREBASE_ANDROID_PARENT_APP_ID
     secrets:
-      ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
       ANDROID_RELEASE_KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
       FIREBASE_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_KEY }}
       FIREBASE_APP_ID: ${{ secrets.FIREBASE_ANDROID_PARENT_APP_ID }}
@@ -42,7 +43,8 @@ jobs:
       app-type-lower: student
       firebase-app-id-secret: FIREBASE_ANDROID_STUDENT_APP_ID
     secrets:
-      ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
       ANDROID_RELEASE_KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
       FIREBASE_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_KEY }}
       FIREBASE_APP_ID: ${{ secrets.FIREBASE_ANDROID_STUDENT_APP_ID }}
@@ -59,7 +61,8 @@ jobs:
       app-type-lower: teacher
       firebase-app-id-secret: FIREBASE_ANDROID_TEACHER_APP_ID
     secrets:
-      ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
       ANDROID_RELEASE_KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
       FIREBASE_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_KEY }}
       FIREBASE_APP_ID: ${{ secrets.FIREBASE_ANDROID_TEACHER_APP_ID }}
@@ -77,11 +80,20 @@ jobs:
         contains(github.event.pull_request.body, 'Teacher')
       )
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -147,12 +159,21 @@ jobs:
         (github.event.action == 'labeled' && (contains(github.event.pull_request.labels.*.name, 'run-ui-tests') || contains(github.event.pull_request.labels.*.name, 'run-e2e-tests')))
       ) && contains(github.event.pull_request.body, 'Parent')
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           fetch-depth: 1
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -201,12 +222,21 @@ jobs:
         (github.event.action == 'labeled' && (contains(github.event.pull_request.labels.*.name, 'run-ui-tests') || contains(github.event.pull_request.labels.*.name, 'run-e2e-tests')))
       ) && contains(github.event.pull_request.body, 'Student')
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           fetch-depth: 1
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -255,12 +285,21 @@ jobs:
         (github.event.action == 'labeled' && (contains(github.event.pull_request.labels.*.name, 'run-ui-tests') || contains(github.event.pull_request.labels.*.name, 'run-e2e-tests')))
       ) && contains(github.event.pull_request.body, 'Teacher')
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           fetch-depth: 1
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -310,12 +349,21 @@ jobs:
         (github.event.action == 'labeled' && (contains(github.event.pull_request.labels.*.name, 'run-ui-tests') || contains(github.event.pull_request.labels.*.name, 'run-e2e-tests')))
       ) && contains(github.event.pull_request.body, 'Student')
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           fetch-depth: 1
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -375,12 +423,21 @@ jobs:
         (github.event.action == 'labeled' && (contains(github.event.pull_request.labels.*.name, 'run-ui-tests') || contains(github.event.pull_request.labels.*.name, 'run-e2e-tests')))
       ) && contains(github.event.pull_request.body, 'Student')
     steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           fetch-depth: 1
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
new file mode 100644
index 0000000000..9bdee5e832
--- /dev/null
+++ b/.github/workflows/release-notes.yml
@@ -0,0 +1,186 @@
+name: Release Notes
+
+on:
+  workflow_dispatch:
+    inputs:
+      apps:
+        description: 'Apps to generate notes for'
+        type: choice
+        options:
+          - all
+          - student
+          - teacher
+          - parent
+        default: all
+
+jobs:
+  student-notes:
+    name: student-release-notes
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: inputs.apps == 'all' || inputs.apps == 'student'
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Fetch tags
+        run: git fetch --force --tags
+
+      - name: Generate release notes
+        id: notes
+        run: |
+          TAG=$(git tag --list --sort=-version:refname 'student-*' | head -n 1)
+          if [ -z "$TAG" ]; then
+            echo "No tags found for student"
+            exit 1
+          fi
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          FULL_OUTPUT=$(node scripts/generate-release-notes.js "$TAG")
+          NOTES=$(echo "$FULL_OUTPUT" | sed -n '/^Release Notes:$/,$ p' | tail -n +2)
+          if [ -z "$NOTES" ]; then
+            NOTES="No release notes found."
+          fi
+          echo "notes<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$NOTES" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+      - name: Post to Slack
+        uses: slackapi/slack-github-action@v2
+        with:
+          webhook: ${{ secrets.SLACK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            {
+              "text": ":student-app: *Student Release Notes* (${{ steps.notes.outputs.tag }})\n```\n${{ steps.notes.outputs.notes }}\n```"
+            }
+
+  teacher-notes:
+    name: teacher-release-notes
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: inputs.apps == 'all' || inputs.apps == 'teacher'
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Fetch tags
+        run: git fetch --force --tags
+
+      - name: Generate release notes
+        id: notes
+        run: |
+          TAG=$(git tag --list --sort=-version:refname 'teacher-*' | head -n 1)
+          if [ -z "$TAG" ]; then
+            echo "No tags found for teacher"
+            exit 1
+          fi
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          FULL_OUTPUT=$(node scripts/generate-release-notes.js "$TAG")
+          NOTES=$(echo "$FULL_OUTPUT" | sed -n '/^Release Notes:$/,$ p' | tail -n +2)
+          if [ -z "$NOTES" ]; then
+            NOTES="No release notes found."
+          fi
+          echo "notes<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$NOTES" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+      - name: Post to Slack
+        uses: slackapi/slack-github-action@v2
+        with:
+          webhook: ${{ secrets.SLACK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            {
+              "text": ":teacher-app: *Teacher Release Notes* (${{ steps.notes.outputs.tag }})\n```\n${{ steps.notes.outputs.notes }}\n```"
+            }
+
+  parent-notes:
+    name: parent-release-notes
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: inputs.apps == 'all' || inputs.apps == 'parent'
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Fetch tags
+        run: git fetch --force --tags
+
+      - name: Generate release notes
+        id: notes
+        run: |
+          TAG=$(git tag --list --sort=-version:refname 'parent-*' | head -n 1)
+          if [ -z "$TAG" ]; then
+            echo "No tags found for parent"
+            exit 1
+          fi
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          FULL_OUTPUT=$(node scripts/generate-release-notes.js "$TAG")
+          NOTES=$(echo "$FULL_OUTPUT" | sed -n '/^Release Notes:$/,$ p' | tail -n +2)
+          if [ -z "$NOTES" ]; then
+            NOTES="No release notes found."
+          fi
+          echo "notes<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$NOTES" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+
+      - name: Post to Slack
+        uses: slackapi/slack-github-action@v2
+        with:
+          webhook: ${{ secrets.SLACK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            {
+              "text": ":parent-app: *Parent Release Notes* (${{ steps.notes.outputs.tag }})\n```\n${{ steps.notes.outputs.notes }}\n```"
+            }
\ No newline at end of file
diff --git a/.github/workflows/release-parent.yml b/.github/workflows/release-parent.yml
new file mode 100644
index 0000000000..e1769377dd
--- /dev/null
+++ b/.github/workflows/release-parent.yml
@@ -0,0 +1,31 @@
+name: Release Parent
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - 'release/parent'
+
+concurrency:
+  group: release-parent-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  release:
+    uses: ./.github/workflows/reusable-release-pipeline.yml
+    with:
+      app-name: parent
+      app-display-name: Parent
+      include-e2e-offline: false
+      slack-emoji: ':parent-app:'
+    secrets:
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
+      ANDROID_RELEASE_KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
+      GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }}
+      SPLUNK_MOBILE_TOKEN: ${{ secrets.SPLUNK_MOBILE_TOKEN }}
+      OBSERVE_MOBILE_TOKEN: ${{ secrets.OBSERVE_MOBILE_TOKEN }}
+      ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+      ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD }}
+      SLACK_URL: ${{ secrets.SLACK_URL }}
\ No newline at end of file
diff --git a/.github/workflows/release-student.yml b/.github/workflows/release-student.yml
new file mode 100644
index 0000000000..bb2039023b
--- /dev/null
+++ b/.github/workflows/release-student.yml
@@ -0,0 +1,31 @@
+name: Release Student
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - 'release/student'
+
+concurrency:
+  group: release-student-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  release:
+    uses: ./.github/workflows/reusable-release-pipeline.yml
+    with:
+      app-name: student
+      app-display-name: Student
+      include-e2e-offline: true
+      slack-emoji: ':student-app:'
+    secrets:
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
+      ANDROID_RELEASE_KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
+      GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }}
+      SPLUNK_MOBILE_TOKEN: ${{ secrets.SPLUNK_MOBILE_TOKEN }}
+      OBSERVE_MOBILE_TOKEN: ${{ secrets.OBSERVE_MOBILE_TOKEN }}
+      ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+      ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD }}
+      SLACK_URL: ${{ secrets.SLACK_URL }}
\ No newline at end of file
diff --git a/.github/workflows/release-teacher.yml b/.github/workflows/release-teacher.yml
new file mode 100644
index 0000000000..0ee7f24e73
--- /dev/null
+++ b/.github/workflows/release-teacher.yml
@@ -0,0 +1,31 @@
+name: Release Teacher
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - 'release/teacher'
+
+concurrency:
+  group: release-teacher-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  release:
+    uses: ./.github/workflows/reusable-release-pipeline.yml
+    with:
+      app-name: teacher
+      app-display-name: Teacher
+      include-e2e-offline: false
+      slack-emoji: ':teacher-app:'
+    secrets:
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
+      ANDROID_RELEASE_KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
+      GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }}
+      SPLUNK_MOBILE_TOKEN: ${{ secrets.SPLUNK_MOBILE_TOKEN }}
+      OBSERVE_MOBILE_TOKEN: ${{ secrets.OBSERVE_MOBILE_TOKEN }}
+      ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+      ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+      ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD }}
+      SLACK_URL: ${{ secrets.SLACK_URL }}
\ No newline at end of file
diff --git a/.github/workflows/reusable-release-pipeline.yml b/.github/workflows/reusable-release-pipeline.yml
new file mode 100644
index 0000000000..3bb7772de3
--- /dev/null
+++ b/.github/workflows/reusable-release-pipeline.yml
@@ -0,0 +1,407 @@
+name: Reusable Release Pipeline
+
+on:
+  workflow_call:
+    inputs:
+      app-name:
+        description: 'App name (student, teacher, parent)'
+        required: true
+        type: string
+      app-display-name:
+        description: 'App display name (Student, Teacher, Parent)'
+        required: true
+        type: string
+      include-e2e-offline:
+        description: 'Include E2E offline tests (Student only)'
+        required: false
+        default: false
+        type: boolean
+      slack-emoji:
+        description: 'Slack emoji for the app'
+        required: true
+        type: string
+    secrets:
+      GH_APP_ID:
+        required: true
+      GH_APP_PRIVATE_KEY:
+        required: true
+      ANDROID_RELEASE_KEYSTORE_B64:
+        required: true
+      GCLOUD_KEY:
+        required: true
+      SPLUNK_MOBILE_TOKEN:
+        required: true
+      OBSERVE_MOBILE_TOKEN:
+        required: true
+      ANDROID_KEYSTORE_PASSWORD:
+        required: true
+      ANDROID_KEYSTORE_ALIAS:
+        required: true
+      ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD:
+        required: true
+      SLACK_URL:
+        required: true
+
+jobs:
+  build-qa-debug:
+    name: build-qa-debug
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          fetch-depth: 1
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: wrapper
+          java-version: '17'
+
+      - name: Build QA debug and test APKs
+        run: |
+          ./gradle/gradlew -p apps \
+            :${{ inputs.app-name }}:assembleQaDebug \
+            :${{ inputs.app-name }}:assembleQaDebugAndroidTest \
+            --build-cache \
+            --parallel \
+            --max-workers=4 \
+            --no-daemon \
+            -Dorg.gradle.jvmargs="-Xmx6g -XX:+HeapDumpOnOutOfMemoryError" \
+            -Dkotlin.compiler.execution.strategy=in-process
+        env:
+          GRADLE_OPTS: "-Djava.net.preferIPv4Stack=true"
+
+      - name: Upload QA debug APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.app-name }}-qa-debug.apk
+          path: apps/${{ inputs.app-name }}/build/outputs/apk/qa/debug/${{ inputs.app-name }}-qa-debug.apk
+          retention-days: 1
+
+      - name: Upload QA test APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.app-name }}-qa-debug-androidTest.apk
+          path: apps/${{ inputs.app-name }}/build/outputs/apk/androidTest/qa/debug/${{ inputs.app-name }}-qa-debug-androidTest.apk
+          retention-days: 1
+
+  unit-tests:
+    name: unit-tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          fetch-depth: 1
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: wrapper
+          java-version: '17'
+
+      - name: Run unit tests
+        run: |
+          ./gradle/gradlew -p apps \
+            :${{ inputs.app-name }}:testDevDebugUnitTest \
+            --build-cache \
+            --parallel \
+            --max-workers=4 \
+            --no-daemon \
+            -Dorg.gradle.jvmargs="-Xmx6g -XX:+HeapDumpOnOutOfMemoryError" \
+            -Dkotlin.compiler.execution.strategy=in-process
+        env:
+          GRADLE_OPTS: "-Djava.net.preferIPv4Stack=true"
+
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.app-name }}-unit-test-results
+          path: |
+            apps/${{ inputs.app-name }}/build/reports/tests/testDevDebugUnitTest/
+            apps/${{ inputs.app-name }}/build/test-results/testDevDebugUnitTest/
+          retention-days: 1
+
+  flank-tests:
+    name: flank-${{ matrix.test-type }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    needs: build-qa-debug
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - test-type: portrait
+            flank-config: flank.yml
+          - test-type: landscape
+            flank-config: flank_landscape.yml
+          - test-type: tablet
+            flank-config: flank_tablet.yml
+          - test-type: e2e
+            flank-config: flank_e2e.yml
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Setup Service account
+        env:
+          GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }}
+        run: |
+          if [ -z "${GCLOUD_KEY}" ]; then
+            echo "Error: GCLOUD_KEY secret is not set"
+            exit 1
+          fi
+          echo "${GCLOUD_KEY}" > service-account-key.json
+          chmod 600 service-account-key.json
+
+      - name: Setup Flank config
+        run: cp ./apps/${{ inputs.app-name }}/${{ matrix.flank-config }} ./flank.yml
+
+      - name: Copy APKs to expected locations
+        run: |
+          if [ -d "${{ inputs.app-name }}-qa-debug.apk" ]; then
+            mkdir -p apps/${{ inputs.app-name }}/build/outputs/apk/qa/debug
+            mv ${{ inputs.app-name }}-qa-debug.apk/${{ inputs.app-name }}-qa-debug.apk apps/${{ inputs.app-name }}/build/outputs/apk/qa/debug/
+            rm -rf ${{ inputs.app-name }}-qa-debug.apk
+          fi
+          if [ -d "${{ inputs.app-name }}-qa-debug-androidTest.apk" ]; then
+            mkdir -p apps/${{ inputs.app-name }}/build/outputs/apk/androidTest/qa/debug
+            mv ${{ inputs.app-name }}-qa-debug-androidTest.apk/${{ inputs.app-name }}-qa-debug-androidTest.apk apps/${{ inputs.app-name }}/build/outputs/apk/androidTest/qa/debug/
+            rm -rf ${{ inputs.app-name }}-qa-debug-androidTest.apk
+          fi
+
+      - name: Run Flank tests
+        uses: Flank/flank@v23.10.1
+        with:
+          version: 'v23.07.0'
+          platform: 'android'
+          service_account: './service-account-key.json'
+          flank_configuration_file: './flank.yml'
+
+      - name: Report test results
+        if: always()
+        run: |
+          if [ -d results ] && [ "$(ls results 2>/dev/null | wc -l)" -eq 1 ]; then
+            ./apps/postProcessTestRun.bash ${{ inputs.app-name }} results/$(ls results)
+          else
+            echo "Warning: Expected exactly one results directory, found: $(ls results 2>/dev/null || echo 'none')"
+          fi
+        env:
+          SPLUNK_MOBILE_TOKEN: ${{ secrets.SPLUNK_MOBILE_TOKEN }}
+          OBSERVE_MOBILE_TOKEN: ${{ secrets.OBSERVE_MOBILE_TOKEN }}
+          BITRISE_TRIGGERED_WORKFLOW_ID: ${{ github.workflow }}
+          BITRISE_GIT_BRANCH: ${{ github.head_ref || github.ref_name }}
+          BITRISE_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      - name: Cleanup sensitive files
+        if: always()
+        run: rm -f service-account-key.json
+
+  e2e-offline:
+    name: e2e-offline
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    needs: build-qa-debug
+    if: ${{ inputs.include-e2e-offline }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Setup Service account
+        env:
+          GCLOUD_KEY: ${{ secrets.GCLOUD_KEY }}
+        run: |
+          if [ -z "${GCLOUD_KEY}" ]; then
+            echo "Error: GCLOUD_KEY secret is not set"
+            exit 1
+          fi
+          echo "${GCLOUD_KEY}" > service-account-key.json
+          chmod 600 service-account-key.json
+
+      - name: Setup Flank config
+        run: cp ./apps/${{ inputs.app-name }}/flank_e2e_offline.yml ./flank.yml
+
+      - name: Copy APKs to expected locations
+        run: |
+          if [ -d "${{ inputs.app-name }}-qa-debug.apk" ]; then
+            mkdir -p apps/${{ inputs.app-name }}/build/outputs/apk/qa/debug
+            mv ${{ inputs.app-name }}-qa-debug.apk/${{ inputs.app-name }}-qa-debug.apk apps/${{ inputs.app-name }}/build/outputs/apk/qa/debug/
+            rm -rf ${{ inputs.app-name }}-qa-debug.apk
+          fi
+          if [ -d "${{ inputs.app-name }}-qa-debug-androidTest.apk" ]; then
+            mkdir -p apps/${{ inputs.app-name }}/build/outputs/apk/androidTest/qa/debug
+            mv ${{ inputs.app-name }}-qa-debug-androidTest.apk/${{ inputs.app-name }}-qa-debug-androidTest.apk apps/${{ inputs.app-name }}/build/outputs/apk/androidTest/qa/debug/
+            rm -rf ${{ inputs.app-name }}-qa-debug-androidTest.apk
+          fi
+
+      - name: Run Flank E2E offline tests
+        uses: Flank/flank@v23.10.1
+        with:
+          version: 'v23.07.0'
+          platform: 'android'
+          service_account: './service-account-key.json'
+          flank_configuration_file: './flank.yml'
+
+      - name: Report test results
+        if: always()
+        run: |
+          if [ -d results ] && [ "$(ls results 2>/dev/null | wc -l)" -eq 1 ]; then
+            ./apps/postProcessTestRun.bash ${{ inputs.app-name }} results/$(ls results)
+          else
+            echo "Warning: Expected exactly one results directory, found: $(ls results 2>/dev/null || echo 'none')"
+          fi
+        env:
+          SPLUNK_MOBILE_TOKEN: ${{ secrets.SPLUNK_MOBILE_TOKEN }}
+          OBSERVE_MOBILE_TOKEN: ${{ secrets.OBSERVE_MOBILE_TOKEN }}
+          BITRISE_TRIGGERED_WORKFLOW_ID: ${{ github.workflow }}
+          BITRISE_GIT_BRANCH: ${{ github.head_ref || github.ref_name }}
+          BITRISE_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+      - name: Cleanup sensitive files
+        if: always()
+        run: rm -f service-account-key.json
+
+  build-release-candidate:
+    name: build-release-candidate
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    needs: [unit-tests, flank-tests, e2e-offline]
+    if: |
+      always() &&
+      needs.unit-tests.result == 'success' &&
+      needs.flank-tests.result == 'success' &&
+      (needs.e2e-offline.result == 'success' || needs.e2e-offline.result == 'skipped')
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: canvas-android,android-vault
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+          fetch-depth: 1
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: wrapper
+          java-version: '17'
+
+      - name: Decode release keystore
+        env:
+          KEYSTORE_B64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_B64 }}
+        run: |
+          echo "$KEYSTORE_B64" | base64 --decode > release.jks
+          chmod 600 release.jks
+
+      - name: Build release candidate
+        run: |
+          ./gradle/gradlew -p apps \
+            :${{ inputs.app-name }}:assembleProdRelease \
+            :${{ inputs.app-name }}:bundleProdRelease \
+            --stacktrace \
+            --build-cache \
+            --parallel \
+            --max-workers=4 \
+            --no-daemon \
+            -Dorg.gradle.jvmargs="-Xmx6g -XX:+HeapDumpOnOutOfMemoryError" \
+            -Dkotlin.compiler.execution.strategy=in-process \
+            -Pandroid.injected.signing.store.file=$(pwd)/release.jks \
+            -Pandroid.injected.signing.store.password="${KEYSTORE_PASSWORD}" \
+            -Pandroid.injected.signing.key.alias="${KEYSTORE_KEY_ALIAS}" \
+            -Pandroid.injected.signing.key.password="${KEYSTORE_KEY_PASSWORD}"
+        env:
+          GRADLE_OPTS: "-Djava.net.preferIPv4Stack=true"
+          KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+          KEYSTORE_KEY_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD }}
+
+      - name: Upload release APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.app-name }}-prod-release.apk
+          path: apps/${{ inputs.app-name }}/build/outputs/apk/prod/release/${{ inputs.app-name }}-prod-release.apk
+          retention-days: 7
+
+      - name: Upload release AAB
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.app-name }}-prod-release.aab
+          path: apps/${{ inputs.app-name }}/build/outputs/bundle/prodRelease/${{ inputs.app-name }}-prod-release.aab
+          retention-days: 7
+
+      - name: Cleanup sensitive files
+        if: always()
+        run: rm -f release.jks
+
+  slack-notification:
+    name: slack-notification
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    needs: [build-release-candidate]
+    if: always()
+    steps:
+      - name: Notify Slack on success
+        if: needs.build-release-candidate.result == 'success'
+        uses: slackapi/slack-github-action@v2
+        with:
+          webhook: ${{ secrets.SLACK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            {
+              "text": ":android: ${{ inputs.slack-emoji }} Android ${{ inputs.app-display-name }} RC Available :android:\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|Download artifacts from GitHub Actions>"
+            }
+
+      - name: Notify Slack on failure
+        if: needs.build-release-candidate.result != 'success'
+        uses: slackapi/slack-github-action@v2
+        with:
+          webhook: ${{ secrets.SLACK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            {
+              "text": ":x: ${{ inputs.slack-emoji }} Android ${{ inputs.app-display-name }} Release Pipeline Failed\n<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View failed run>"
+            }
\ No newline at end of file
diff --git a/apps/buildSrc/src/main/java/GlobalDependencies.kt b/apps/buildSrc/src/main/java/GlobalDependencies.kt
index 51c7f0ffd3..19d8833326 100644
--- a/apps/buildSrc/src/main/java/GlobalDependencies.kt
+++ b/apps/buildSrc/src/main/java/GlobalDependencies.kt
@@ -25,7 +25,7 @@ object Versions {
 
     /* Others */
     const val APOLLO = "4.3.3"
-    const val NUTRIENT = "10.7.0"
+    const val NUTRIENT = "11.1.1"
     const val PHOTO_VIEW = "2.3.0"
     const val MOBIUS = "1.2.1"
     const val HILT = "2.57.2"
@@ -47,6 +47,7 @@ object Versions {
     const val GLANCE = "1.1.1"
     const val LIVEDATA = "1.9.0"
     const val REORDERABLE = "2.4.0"
+    const val MLKIT_DOCUMENT_SCANNER = "16.0.0"
 }
 
 object Libs {
@@ -95,6 +96,7 @@ object Libs {
     const val PLAY_IN_APP_UPDATES = "com.google.android.play:app-update:2.1.0"
     const val FLEXBOX_LAYOUT = "com.google.android.flexbox:flexbox:3.0.0"
     const val MATERIAL_DESIGN = "com.google.android.material:material:1.13.0"
+    const val MLKIT_DOCUMENT_SCANNER = "com.google.android.gms:play-services-mlkit-document-scanner:${Versions.MLKIT_DOCUMENT_SCANNER}"
 
     /* Mobius */
     const val MOBIUS_CORE = "com.spotify.mobius:mobius-core:${Versions.MOBIUS}"
diff --git a/apps/parent/build.gradle b/apps/parent/build.gradle
index d5bffc8112..5b7b0d4292 100644
--- a/apps/parent/build.gradle
+++ b/apps/parent/build.gradle
@@ -41,8 +41,8 @@ android {
         applicationId "com.instructure.parentapp"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode 67
-        versionName "4.10.1"
+        versionCode 68
+        versionName "4.11.0"
 
         buildConfigField "boolean", "IS_TESTING", "false"
         testInstrumentationRunner 'com.instructure.parentapp.ui.espresso.ParentHiltTestRunner'
diff --git a/apps/parent/src/androidTest/assets/samplepdf.pdf b/apps/parent/src/androidTest/assets/samplepdf.pdf
new file mode 100644
index 0000000000..1693fcb951
Binary files /dev/null and b/apps/parent/src/androidTest/assets/samplepdf.pdf differ
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/AlertsE2ETest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/AlertsE2ETest.kt
index 862af1d795..fa19e001e0 100644
--- a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/AlertsE2ETest.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/AlertsE2ETest.kt
@@ -442,4 +442,172 @@ class AlertsE2ETest : ParentComposeTest() {
         alertsPage.assertAlertRead("Course grade: 90.0% in ${course.courseCode}")
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.MANDATORY, FeatureCategory.ALERTS, TestCategory.E2E)
+    fun testAlertSettingsMarkBelowAboveDependencyE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, courses = 1, teachers = 1, parents = 1)
+        val parent = data.parentsList[0]
+        val student = data.studentsList[0]
+
+        Log.d(STEP_TAG, "Login with user: '${parent.name}', login id: '${parent.loginId}'.")
+        tokenLogin(parent)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open the Left Side Navigation Drawer menu.")
+        dashboardPage.openLeftSideMenu()
+
+        Log.d(STEP_TAG, "Open the Manage Students Page.")
+        leftSideNavigationDrawerPage.clickManageStudents()
+
+        Log.d(STEP_TAG, "Open the Student Alert Settings Page.")
+        manageStudentsPage.clickStudent(student.shortName)
+
+        val assignmentGradeBelow = "Assignment grade below"
+        val assignmentGradeAbove = "Assignment grade above"
+        Log.d(STEP_TAG, "Set '$assignmentGradeBelow' threshold to 30%.")
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "30")
+
+        Log.d(ASSERTION_TAG, "Assert that '$assignmentGradeBelow' threshold is set to '30%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "30%")
+
+        Log.d(STEP_TAG, "Open the '$assignmentGradeAbove' dialog and enter '20' (below the low threshold of 30).")
+        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_HIGH)
+        studentAlertSettingsPage.enterThreshold("20")
+
+        Log.d(ASSERTION_TAG, "Assert that an error is shown because 20 is not above the '$assignmentGradeBelow' threshold of 30.")
+        studentAlertSettingsPage.assertThresholdDialogError()
+
+        Log.d(STEP_TAG, "Change the '$assignmentGradeAbove' threshold value to '70'.")
+        studentAlertSettingsPage.enterThreshold("70")
+
+        Log.d(ASSERTION_TAG, "Assert that there is no error for '$assignmentGradeAbove' value 70.")
+        studentAlertSettingsPage.assertThresholdDialogNotError()
+
+        Log.d(STEP_TAG, "Save the '$assignmentGradeAbove' threshold.")
+        studentAlertSettingsPage.tapThresholdSaveButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$assignmentGradeAbove' threshold is saved as '70%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "70%")
+
+        Log.d(STEP_TAG, "Open the '$assignmentGradeBelow' dialog and enter '80' (above the '$assignmentGradeAbove' threshold of 70).")
+        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_LOW)
+        studentAlertSettingsPage.enterThreshold("80")
+
+        Log.d(ASSERTION_TAG, "Assert that an error is shown because 80 is not below the '$assignmentGradeAbove' threshold of 70.")
+        studentAlertSettingsPage.assertThresholdDialogError()
+
+        Log.d(STEP_TAG, "Change the '$assignmentGradeBelow' threshold value to '50'.")
+        studentAlertSettingsPage.enterThreshold("50")
+
+        Log.d(ASSERTION_TAG, "Assert that there is no error for '$assignmentGradeBelow' value 50.")
+        studentAlertSettingsPage.assertThresholdDialogNotError()
+
+        Log.d(STEP_TAG, "Save the '$assignmentGradeBelow' threshold.")
+        studentAlertSettingsPage.tapThresholdSaveButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$assignmentGradeBelow' threshold is saved as '50%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "50%")
+
+        Log.d(STEP_TAG, "Set '$assignmentGradeBelow' to Never so the '$assignmentGradeAbove' threshold has no lower bound.")
+        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_LOW)
+        studentAlertSettingsPage.tapThresholdNeverButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$assignmentGradeBelow' threshold is set to 'Never'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "Never")
+
+        Log.d(STEP_TAG, "Open the '$assignmentGradeAbove' dialog and enter '100' (boundary value that is not allowed).")
+        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_HIGH)
+        studentAlertSettingsPage.enterThreshold("100")
+
+        Log.d(ASSERTION_TAG, "Assert that an error is shown because 100 is not a valid '$assignmentGradeAbove' threshold (max is exclusive).")
+        studentAlertSettingsPage.assertThresholdDialogError()
+
+        Log.d(STEP_TAG, "Change the '$assignmentGradeAbove' threshold value to '99' (the maximum valid value).")
+        studentAlertSettingsPage.enterThreshold("99")
+
+        Log.d(ASSERTION_TAG, "Assert that there is no error for '$assignmentGradeAbove' value 99.")
+        studentAlertSettingsPage.assertThresholdDialogNotError()
+
+        Log.d(STEP_TAG, "Save the '$assignmentGradeAbove' threshold.")
+        studentAlertSettingsPage.tapThresholdSaveButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$assignmentGradeAbove' threshold is saved as '99%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "99%")
+
+        val courseGradeBelow = "Course grade below"
+        val courseGradeAbove = "Course grade above"
+        Log.d(STEP_TAG, "Set '$courseGradeBelow' threshold to 30%.")
+        studentAlertSettingsPage.setThreshold(AlertType.COURSE_GRADE_LOW, "30")
+
+        Log.d(ASSERTION_TAG, "Assert that '$courseGradeBelow' threshold is set to '30%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_LOW, "30%")
+
+        Log.d(STEP_TAG, "Open the '$courseGradeAbove' dialog and enter '20' (below the low threshold of 30).")
+        studentAlertSettingsPage.clickThreshold(AlertType.COURSE_GRADE_HIGH)
+        studentAlertSettingsPage.enterThreshold("20")
+
+        Log.d(ASSERTION_TAG, "Assert that an error is shown because 20 is not above the '$courseGradeBelow' threshold of 30.")
+        studentAlertSettingsPage.assertThresholdDialogError()
+
+        Log.d(STEP_TAG, "Change the '$courseGradeAbove' threshold value to '70'.")
+        studentAlertSettingsPage.enterThreshold("70")
+
+        Log.d(ASSERTION_TAG, "Assert that there is no error for '$courseGradeAbove' value 70.")
+        studentAlertSettingsPage.assertThresholdDialogNotError()
+
+        Log.d(STEP_TAG, "Save the '$courseGradeAbove' threshold.")
+        studentAlertSettingsPage.tapThresholdSaveButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$courseGradeAbove' threshold is saved as '70%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_HIGH, "70%")
+
+        Log.d(STEP_TAG, "Open the '$courseGradeBelow' dialog and enter '80' (above the '$courseGradeAbove' threshold of 70).")
+        studentAlertSettingsPage.clickThreshold(AlertType.COURSE_GRADE_LOW)
+        studentAlertSettingsPage.enterThreshold("80")
+
+        Log.d(ASSERTION_TAG, "Assert that an error is shown because 80 is not below the '$courseGradeAbove' threshold of 70.")
+        studentAlertSettingsPage.assertThresholdDialogError()
+
+        Log.d(STEP_TAG, "Change the '$courseGradeBelow' threshold value to '50'.")
+        studentAlertSettingsPage.enterThreshold("50")
+
+        Log.d(ASSERTION_TAG, "Assert that there is no error for '$courseGradeBelow' value 50.")
+        studentAlertSettingsPage.assertThresholdDialogNotError()
+
+        Log.d(STEP_TAG, "Save the '$courseGradeBelow' threshold.")
+        studentAlertSettingsPage.tapThresholdSaveButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$courseGradeBelow' threshold is saved as '50%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_LOW, "50%")
+
+        Log.d(STEP_TAG, "Set '$courseGradeBelow' to Never so the '$courseGradeAbove' threshold has no lower bound.")
+        studentAlertSettingsPage.clickThreshold(AlertType.COURSE_GRADE_LOW)
+        studentAlertSettingsPage.tapThresholdNeverButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$courseGradeBelow' threshold is set to 'Never'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_LOW, "Never")
+
+        Log.d(STEP_TAG, "Open the '$courseGradeAbove' dialog and enter '100' (boundary value that is not allowed).")
+        studentAlertSettingsPage.clickThreshold(AlertType.COURSE_GRADE_HIGH)
+        studentAlertSettingsPage.enterThreshold("100")
+
+        Log.d(ASSERTION_TAG, "Assert that an error is shown because 100 is not a valid '$courseGradeAbove' threshold (max is exclusive).")
+        studentAlertSettingsPage.assertThresholdDialogError()
+
+        Log.d(STEP_TAG, "Change the '$courseGradeAbove' threshold value to '99' (the maximum valid value).")
+        studentAlertSettingsPage.enterThreshold("99")
+
+        Log.d(ASSERTION_TAG, "Assert that there is no error for '$courseGradeAbove' value 99.")
+        studentAlertSettingsPage.assertThresholdDialogNotError()
+
+        Log.d(STEP_TAG, "Save the '$courseGradeAbove' threshold.")
+        studentAlertSettingsPage.tapThresholdSaveButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$courseGradeAbove' threshold is saved as '99%'.")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_HIGH, "99%")
+    }
+
 }
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/CalendarE2ETest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/CalendarE2ETest.kt
index 8fc0ce2347..9f533eef91 100644
--- a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/CalendarE2ETest.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/CalendarE2ETest.kt
@@ -181,12 +181,12 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the student selector is displayed and the selected student is that the one is the first ordered by 'sortableName'.")
         dashboardPage.assertSelectedStudent(selectedShortName)
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo Title"
         val testTodoDescription = "Details of ToDo"
@@ -196,26 +196,26 @@ class CalendarE2ETest : ParentComposeTest() {
         calendarToDoCreateUpdatePage.clickSave()
 
         val currentDate = getDateInCanvasCalendarFormat()
-        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously created To Do item is displayed with the corresponding title, context and date.")
-        calendarScreenPage.assertItemDetails(testTodoTitle, "To Do", "$currentDate at 12:00 PM")
+        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously created To-do item is displayed with the corresponding title, context and date.")
+        calendarScreenPage.assertItemDetails(testTodoTitle, "To-do", "$currentDate at 12:00 PM")
 
-        Log.d(STEP_TAG, "Clicks on the '$testTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Clicks on the '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle', the context is 'To Do', the date is the current day with 12:00 PM time and the description is '$testTodoDescription'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle', the context is 'To-do', the date is the current day with 12:00 PM time and the description is '$testTodoDescription'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
         calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
         calendarToDoDetailsPage.assertDescription(testTodoDescription)
 
-        Log.d(STEP_TAG, "Click on the 'Edit To Do' within the toolbar more menu and confirm the editing.")
+        Log.d(STEP_TAG, "Click on the 'Edit To-do' within the toolbar more menu and confirm the editing.")
         calendarToDoDetailsPage.clickToolbarMenu()
         calendarToDoDetailsPage.clickEditMenu()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'Edit To Do' as we are editing an existing To Do item.")
-        calendarToDoCreateUpdatePage.assertPageTitle("Edit To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'Edit To-do' as we are editing an existing To-do item.")
+        calendarToDoCreateUpdatePage.assertPageTitle("Edit To-do")
 
-        Log.d(ASSERTION_TAG, "Assert that the 'original' To Do Title and details has been filled into the input fields as we on the edit screen.")
+        Log.d(ASSERTION_TAG, "Assert that the 'original' To-do Title and details has been filled into the input fields as we on the edit screen.")
         calendarToDoCreateUpdatePage.assertTodoTitle(testTodoTitle)
         calendarToDoCreateUpdatePage.assertDetails(testTodoDescription)
 
@@ -226,19 +226,19 @@ class CalendarE2ETest : ParentComposeTest() {
         calendarToDoCreateUpdatePage.typeDetails(modifiedTestTodoDescription)
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously modified To Do item is displayed with the corresponding title, context and with the same date as we haven't changed it.")
-        calendarScreenPage.assertItemDetails(modifiedTestTodoTitle, "To Do", "$currentDate at 12:00 PM")
+        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously modified To-do item is displayed with the corresponding title, context and with the same date as we haven't changed it.")
+        calendarScreenPage.assertItemDetails(modifiedTestTodoTitle, "To-do", "$currentDate at 12:00 PM")
 
-        Log.d(STEP_TAG, "Clicks on the '$modifiedTestTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Clicks on the '$modifiedTestTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(modifiedTestTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do title is '$modifiedTestTodoTitle', the page title is 'To Do', the date remained current day with 12:00 PM time (as we haven't modified it) and the description is '$modifiedTestTodoDescription'.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do title is '$modifiedTestTodoTitle', the page title is 'To-do', the date remained current day with 12:00 PM time (as we haven't modified it) and the description is '$modifiedTestTodoDescription'.")
         calendarToDoDetailsPage.assertTitle(modifiedTestTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
         calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
         calendarToDoDetailsPage.assertDescription(modifiedTestTodoDescription)
 
-        Log.d(STEP_TAG, "Click on the 'Delete To Do' within the toolbar more menu and confirm the deletion.")
+        Log.d(STEP_TAG, "Click on the 'Delete To-do' within the toolbar more menu and confirm the deletion.")
         calendarToDoDetailsPage.clickToolbarMenu()
         calendarToDoDetailsPage.clickDeleteMenu()
         calendarToDoDetailsPage.confirmDeletion()
@@ -246,7 +246,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the deleted item does not exist anymore on the Calendar Screen Page.")
         calendarScreenPage.assertItemNotExist(modifiedTestTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any To Do items on the current day.")
+        Log.d(ASSERTION_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any To-do items on the current day.")
         calendarScreenPage.assertEmptyView()
     }
 
@@ -297,12 +297,12 @@ class CalendarE2ETest : ParentComposeTest() {
         calendarScreenPage.assertItemDetails(newEventTitle, parent.name, currentDate)
         Thread.sleep(2000)
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo Title"
         val testTodoDescription = "Details of ToDo"
@@ -318,7 +318,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To Do item is displayed because we created it to this particular day. " +
+        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To-do item is displayed because we created it to this particular day. " +
                 "Assert that '$newEventTitle' calendar event is NOT displayed because it's created for today.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
         calendarScreenPage.assertItemNotExist(newEventTitle)
@@ -330,7 +330,7 @@ class CalendarE2ETest : ParentComposeTest() {
         calendarFilterPage.clickOnFilterItem(course.name)
         calendarFilterPage.closeFilterPage()
 
-        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To Do item is NOT displayed because we filtered out from the calendar. " +
+        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To-do item is NOT displayed because we filtered out from the calendar. " +
                 "Assert that the empty view is displayed because there are no items for today.")
         calendarScreenPage.assertItemNotExist(testTodoTitle)
         calendarScreenPage.assertEmptyView()
@@ -690,12 +690,12 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page.")
         dashboardPage.clickCalendarBottomMenu()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo With Reminder"
         val testTodoDescription = "Details of ToDo"
@@ -710,15 +710,15 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
 
-        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To Do'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To-do'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
 
         Log.d(ASSERTION_TAG, "Assert that the reminder section is displayed.")
         calendarToDoDetailsPage.assertReminderSectionDisplayed()
@@ -732,7 +732,7 @@ class CalendarE2ETest : ParentComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneHour)
         calendarToDoDetailsPage.selectTime(reminderDateOneHour)
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneHour.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -762,7 +762,7 @@ class CalendarE2ETest : ParentComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneWeek)
         calendarToDoDetailsPage.selectTime(reminderDateOneWeek)
 
-        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To Do which is due in 2 days).")
+        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To-do which is due in 2 days).")
         calendarToDoDetailsPage.assertReminderNotDisplayedWithText(reminderDateOneWeek.time.toFormattedString())
         checkToastText(R.string.reminderInPast, activityRule.activity)
         futureDate.apply { add(Calendar.WEEK_OF_YEAR, 1) }
@@ -776,7 +776,7 @@ class CalendarE2ETest : ParentComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneDay)
         calendarToDoDetailsPage.selectTime(reminderDateOneDay)
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneDay.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -794,7 +794,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Navigate back to Calendar Screen Page.")
         Espresso.pressBack()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
     }
 
@@ -818,12 +818,12 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page.")
         dashboardPage.clickCalendarBottomMenu()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo With Reminder"
         val testTodoDescription = "Details of ToDo"
@@ -838,15 +838,15 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
 
-        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To Do'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To-do'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
 
         Log.d(ASSERTION_TAG, "Assert that the reminder section is displayed.")
         calendarToDoDetailsPage.assertReminderSectionDisplayed()
@@ -858,7 +858,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Select '1 Hour Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Hour Before")
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneHour.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -884,7 +884,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Select '1 Week Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Week Before")
 
-        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To Do which is due in 2 days).")
+        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To-do which is due in 2 days).")
         calendarToDoDetailsPage.assertReminderNotDisplayedWithText(reminderDateOneWeek.time.toFormattedString())
         checkToastText(R.string.reminderInPast, activityRule.activity)
         futureDate.apply { add(Calendar.WEEK_OF_YEAR, 1) }
@@ -896,7 +896,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Select '1 Day Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Day Before")
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneDay.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -912,7 +912,7 @@ class CalendarE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Navigate back to Calendar Screen Page.")
         Espresso.pressBack()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
     }
 }
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/DiscussionCheckpointsE2ETest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/DiscussionCheckpointsE2ETest.kt
new file mode 100644
index 0000000000..0263cf2287
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/DiscussionCheckpointsE2ETest.kt
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.parentapp.ui.e2e.compose
+
+import android.util.Log
+import androidx.test.espresso.Espresso
+import com.instructure.canvas.espresso.FeatureCategory
+import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.SecondaryFeatureCategory
+import com.instructure.canvas.espresso.TestCategory
+import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.dataseeding.api.DiscussionTopicsApi
+import com.instructure.espresso.getCustomDateCalendar
+import com.instructure.pandautils.features.calendar.CalendarPrefs
+import com.instructure.parentapp.utils.ParentComposeTest
+import com.instructure.parentapp.utils.extensions.seedData
+import com.instructure.parentapp.utils.extensions.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Before
+import org.junit.Test
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.TimeZone
+
+@HiltAndroidTest
+class DiscussionCheckpointsE2ETest : ParentComposeTest() {
+
+    override fun displaysPageObjects() = Unit
+
+    override fun enableAndConfigureAccessibilityChecks() = Unit
+
+    @Before
+    fun clearPreferences() {
+        CalendarPrefs.clearPrefs()
+    }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)
+    fun testDiscussionCheckpointsCalendarE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, parents = 1, teachers = 1, courses = 1)
+        val teacher = data.teachersList[0]
+        val parent = data.parentsList[0]
+        val course = data.coursesList[0]
+
+        val discussionWithCheckpointsTitle = "Test Discussion with Checkpoints"
+        val assignmentName = "Test Assignment with Checkpoints"
+
+        Log.d(PREPARATION_TAG, "Convert dates to match with different formats in different screens (Calendar, Assignment Details)")
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
+            timeZone = TimeZone.getTimeZone("UTC")
+        }
+        val calendarDisplayFormat = SimpleDateFormat(" MMM d 'at' h:mm a", Locale.US)
+        val assignmentDetailsDisplayFormat = SimpleDateFormat("MMM d, yyyy h:mm a", Locale.US)
+        val replyToTopicCalendar = getCustomDateCalendar(2)
+        val replyToEntryCalendar = getCustomDateCalendar(4)
+        val replyToTopicDueDate = dateFormat.format(replyToTopicCalendar.time)
+        val replyToEntryDueDate = dateFormat.format(replyToEntryCalendar.time)
+        val assignmentDetailsReplyToTopicDueDate = assignmentDetailsDisplayFormat.format(replyToTopicCalendar.time)
+        val assignmentDetailsReplyToEntryDueDate = assignmentDetailsDisplayFormat.format(replyToEntryCalendar.time)
+        val convertedReplyToTopicDueDate = calendarDisplayFormat.format(replyToTopicCalendar.time)
+        val convertedReplyToEntryDueDate = calendarDisplayFormat.format(replyToEntryCalendar.time)
+
+        Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints for '${course.name}' course.")
+        DiscussionTopicsApi.createDiscussionTopicWithCheckpoints(course.id, teacher.token, discussionWithCheckpointsTitle, assignmentName, replyToTopicDueDate, replyToEntryDueDate)
+
+        Log.d(STEP_TAG, "Login with user: '${parent.name}', login id: '${parent.loginId}'.")
+        tokenLogin(parent)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page.")
+        dashboardPage.clickCalendarBottomMenu()
+        composeTestRule.waitForIdle()
+
+        Log.d(STEP_TAG , "Swipe 2 days to the future to find the 'Reply to Topic' Discussion Checkpoint calendar item.")
+        calendarScreenPage.swipeEventsLeft(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the '$discussionWithCheckpointsTitle Reply to Topic' checkpoint is displayed on its due date on the Calendar Page.")
+        calendarScreenPage.assertItemDetails("$discussionWithCheckpointsTitle Reply to Topic", course.name, "Due$convertedReplyToTopicDueDate")
+
+        Log.d(STEP_TAG, "Select the '$discussionWithCheckpointsTitle Reply to Topic' event and navigate back to the Calendar Page.")
+        calendarScreenPage.clickOnItem("$discussionWithCheckpointsTitle Reply to Topic")
+
+        Log.d(ASSERTION_TAG, "Assert that the Assignment Details Page is displayed properly with the correct toolbar title and subtitle.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertDisplayToolbarSubtitle(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the checkpoints are displayed properly on the Assignment Details Page.")
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", assignmentDetailsReplyToTopicDueDate)
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due", assignmentDetailsReplyToEntryDueDate)
+
+        Log.d(STEP_TAG, "Navigate back to the Calendar Page.")
+        Espresso.pressBack()
+
+        Log.d(STEP_TAG , "Swipe 2 additional days to the future to find the 'Additional replies' Discussion Checkpoint calendar item.")
+        calendarScreenPage.swipeEventsLeft(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the '$discussionWithCheckpointsTitle Required Replies (2)' checkpoint is displayed on its due date on the Calendar Page.")
+        calendarScreenPage.assertItemDetails("$discussionWithCheckpointsTitle Required Replies (2)", course.name, "Due$convertedReplyToEntryDueDate")
+
+        Log.d(STEP_TAG, "Select the '$discussionWithCheckpointsTitle Required Replies (2)' event and navigate back to the Calendar Page.")
+        calendarScreenPage.clickOnItem("$discussionWithCheckpointsTitle Required Replies (2)")
+
+        Log.d(ASSERTION_TAG, "Assert that the Assignment Details Page is displayed properly with the correct toolbar title and subtitle.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertDisplayToolbarSubtitle(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the checkpoints are displayed properly on the Assignment Details Page.")
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", assignmentDetailsReplyToTopicDueDate)
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due", assignmentDetailsReplyToEntryDueDate)
+
+        Log.d(STEP_TAG, "Navigate back to the Calendar Page.")
+        Espresso.pressBack()
+
+        Log.d(STEP_TAG, "Navigate back 2 days to the 'Reply to Topic' checkpoint due date.")
+        calendarScreenPage.swipeEventsRight(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the '$discussionWithCheckpointsTitle Reply to Topic' checkpoint is displayed on its due date on the Calendar Page.")
+        calendarScreenPage.assertItemDetails("$discussionWithCheckpointsTitle Reply to Topic", course.name, "Due$convertedReplyToTopicDueDate")
+
+        Log.d(STEP_TAG, "Select the '$discussionWithCheckpointsTitle Reply to Topic' event and navigate back to the Calendar Page.")
+        calendarScreenPage.clickOnItem("$discussionWithCheckpointsTitle Reply to Topic")
+
+        Log.d(ASSERTION_TAG, "Assert that the Assignment Details Page is displayed properly with the correct toolbar title and subtitle.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertDisplayToolbarSubtitle(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the checkpoints are displayed properly on the Assignment Details Page.")
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", assignmentDetailsReplyToTopicDueDate)
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due", assignmentDetailsReplyToEntryDueDate)
+    }
+
+}
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/DiscussionsE2ETest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/DiscussionsE2ETest.kt
new file mode 100644
index 0000000000..42c47cfcf3
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/DiscussionsE2ETest.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *
+ */
+package com.instructure.parentapp.ui.e2e.compose
+
+import android.os.SystemClock.sleep
+import android.util.Log
+import androidx.test.espresso.Espresso
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiSelector
+import com.instructure.canvas.espresso.FeatureCategory
+import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.SecondaryFeatureCategory
+import com.instructure.canvas.espresso.TestCategory
+import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.dataseeding.api.DiscussionTopicsApi
+import com.instructure.dataseeding.api.FileFolderApi
+import com.instructure.dataseeding.api.FileUploadsApi
+import com.instructure.dataseeding.model.FileUploadType
+import com.instructure.espresso.convertIso8601ToCanvasFormat
+import com.instructure.espresso.retryWithIncreasingDelay
+import com.instructure.parentapp.utils.ParentComposeTest
+import com.instructure.parentapp.utils.extensions.seedData
+import com.instructure.parentapp.utils.extensions.tokenLogin
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Test
+
+@HiltAndroidTest
+class DiscussionsE2ETest: ParentComposeTest() {
+
+    override fun displaysPageObjects() = Unit
+
+    override fun enableAndConfigureAccessibilityChecks() = Unit
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)
+    fun testDiscussionCheckpointWithPdfAttachmentE2E() {
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1, parents = 1)
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val parent = data.parentsList[0]
+        val course = data.coursesList[0]
+
+        Log.d(PREPARATION_TAG, "Get course root folder to upload the PDF file.")
+        val courseRootFolder = FileFolderApi.getCourseRootFolder(course.id, teacher.token)
+
+        Log.d(PREPARATION_TAG, "Read PDF file from assets.")
+        val pdfFileName = "samplepdf.pdf"
+        val context = InstrumentationRegistry.getInstrumentation().context
+        val pdfBytes = context.assets.open(pdfFileName).use { it.readBytes() }
+
+        Log.d(PREPARATION_TAG, "Upload PDF file to course root folder using teacher token.")
+        val uploadedFile = FileUploadsApi.uploadFile(courseId = courseRootFolder.id, assignmentId = null, file = pdfBytes, fileName = pdfFileName, token = teacher.token, fileUploadType = FileUploadType.COURSE_FILE)
+
+        Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints and PDF attachment for '${course.name}' course.")
+        val discussionWithCheckpointsTitle = "Discussion with PDF Attachment"
+        val assignmentName = "Assignment with Checkpoints and PDF"
+        val replyToTopicDueDate = "2029-11-12T22:59:00Z"
+        val replyToEntryDueDate = "2029-11-19T22:59:00Z"
+        DiscussionTopicsApi.createDiscussionTopicWithCheckpoints(courseId = course.id, token = teacher.token, discussionTitle = discussionWithCheckpointsTitle, assignmentName = assignmentName, replyToTopicDueDate = replyToTopicDueDate, replyToEntryDueDate = replyToEntryDueDate, fileId = uploadedFile.id.toString())
+
+        val convertedReplyToTopicDueDate = "Due " + convertIso8601ToCanvasFormat("2029-11-12T22:59:00Z") + " 2:59 PM"
+        val convertedReplyToEntryDueDate = "Due " + convertIso8601ToCanvasFormat("2029-11-19T22:59:00Z") + " 2:59 PM"
+        Log.d(STEP_TAG, "Login with user: '${parent.name}', login id: '${parent.loginId}'.")
+        tokenLogin(parent)
+
+        Log.d(ASSERTION_TAG, "Assert that the Dashboard Page is the landing page and it is loaded successfully.")
+        dashboardPage.waitForRender()
+        dashboardPage.assertPageObjects()
+
+        Log.d(STEP_TAG, "Open the student selector and select '${student.shortName}'.")
+        dashboardPage.openStudentSelector()
+        dashboardPage.selectStudent(student.shortName)
+
+        Log.d(STEP_TAG, "Click on the '${course.name}' course.")
+        coursesPage.clickCourseItem(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the details of the course has opened.")
+        courseDetailsPage.assertCourseNameDisplayed(course)
+
+        Log.d(ASSERTION_TAG, "Assert that the '${discussionWithCheckpointsTitle}' discussion is present along with 2 date info (For the 2 checkpoints).")
+        courseDetailsPage.assertHasAssignmentWithCheckpoints(discussionWithCheckpointsTitle, dueAtString = convertedReplyToTopicDueDate, dueAtStringSecondCheckpoint = convertedReplyToEntryDueDate, expectedGrade = "-/15")
+
+        Log.d(STEP_TAG, "Click on '$discussionWithCheckpointsTitle' assignment to open its details.")
+        courseDetailsPage.clickAssignment(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that Assignment Details Page is displayed with correct title.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertAssignmentTitle(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that attachment icon is displayed.")
+        assignmentDetailsPage.assertAttachmentIconDisplayed()
+
+        Log.d(STEP_TAG, "Click on attachment icon to download it.")
+        assignmentDetailsPage.clickAttachmentIcon()
+
+        Log.d(STEP_TAG, "Wait for download to complete.")
+        sleep(5000)
+
+        Log.d(STEP_TAG, "Open the Notification bar.")
+        val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        device.openNotification()
+
+        retryWithIncreasingDelay(times = 10, maxDelay = 3000) {
+            Log.d(STEP_TAG, "Find download notification.")
+            val downloadNotification = device.findObject(UiSelector().textContains(pdfFileName).className("android.widget.TextView"))
+
+            Log.d(ASSERTION_TAG, "Assert that 'Download complete' text is displayed in notification.")
+            val downloadCompleteText = device.findObject(UiSelector().textContains("Download complete"))
+            assert(downloadCompleteText.exists()) { "Download complete text not found in notification" }
+
+            Log.d(ASSERTION_TAG, "Assert that file name '$pdfFileName' is displayed in notification.")
+            assert(downloadNotification.exists()) { "File name '$pdfFileName' not found in notification" }
+        }
+
+        Log.d(STEP_TAG, "Close notification shade.")
+        device.pressBack()
+
+        Log.d(STEP_TAG, "Navigate back from the Assignment details page.")
+        Espresso.pressBack()
+
+        Log.d(ASSERTION_TAG, "Assert that we are back to the course details page.")
+        courseDetailsPage.assertCourseNameDisplayed(course)
+    }
+
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/InboxE2ETest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/InboxE2ETest.kt
index d4cbd79e91..a3861bc3b4 100644
--- a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/InboxE2ETest.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/InboxE2ETest.kt
@@ -30,6 +30,7 @@ import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.ReleaseExclude
 import com.instructure.canvas.espresso.refresh
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.utils.toApiString
@@ -59,6 +60,7 @@ class InboxE2ETest: ParentComposeTest() {
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.INBOX, TestCategory.E2E)
+    @ReleaseExclude
     fun testInboxSelectedButtonActionsE2E() {
 
         Log.d(PREPARATION_TAG, "Seeding data.")
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/LoginE2ETest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/LoginE2ETest.kt
index 09c1be3df3..9c7bfb61fe 100644
--- a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/LoginE2ETest.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/LoginE2ETest.kt
@@ -16,8 +16,11 @@
  */
 package com.instructure.parentapp.ui.e2e.compose
 
+import android.app.Instrumentation
 import android.util.Log
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -240,13 +243,15 @@ class LoginE2ETest : ParentComposeTest() {
 
     @E2E
     @Test
+    @Stub("MBL-19866")
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.E2E)
     fun testInvalidAndEmptyLoginCredentialsE2E() {
 
         val INVALID_USERNAME = "invalidusercred@test.com"
         val INVALID_PASSWORD = "invalidpw"
-        val INVALID_CREDENTIALS_ERROR_MESSAGE = "Please verify your username or password and try again. Trouble logging in? Check out our Login FAQs."
-        val NO_PASSWORD_GIVEN_ERROR_MESSAGE = "No password was given"
+        val INVALID_CREDENTIALS_ERROR_MESSAGE = "Please verify your username or password and try again."
+        val NO_EMAIL_GIVEN_ERROR_MESSAGE = "Please enter your email."
+        val NO_PASSWORD_GIVEN_ERROR_MESSAGE = "Please enter your password."
         val DOMAIN = "mobileqa.beta"
 
         Log.d(STEP_TAG, "Click 'Find My School' button.")
@@ -258,29 +263,31 @@ class LoginE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Click on 'Next' button on the Toolbar.")
         loginFindSchoolPage.clickToolbarNextMenuItem()
 
+        /* Somehow React does not recognize the invalid credentials, need to be fixed in follow-up ticket
         Log.d(STEP_TAG, "Try to login with invalid, non-existing credentials ('$INVALID_USERNAME', '$INVALID_PASSWORD').")
         loginSignInPage.loginAs(INVALID_USERNAME, INVALID_PASSWORD)
 
         Log.d(ASSERTION_TAG, "Assert that the invalid credentials error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE)
-
+        loginSignInPage.assertLoginEmailErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE) // Invalid credentials error message will be displayed within the email error message holder on the login page.
+        */
         Log.d(STEP_TAG, "Try to login with no credentials typed in either of the username and password field.")
         loginSignInPage.loginAs(EMPTY_STRING, EMPTY_STRING)
 
-        Log.d(ASSERTION_TAG, "Assert that the no password was given error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
+        Log.d(ASSERTION_TAG, "Assert that the no email and no password error messages are displayed.")
+        loginSignInPage.assertLoginEmailErrorMessage(NO_EMAIL_GIVEN_ERROR_MESSAGE)
+        loginSignInPage.assertLoginPasswordErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
 
         Log.d(STEP_TAG, "Try to login with leaving only the password field empty.")
         loginSignInPage.loginAs(INVALID_USERNAME, EMPTY_STRING)
 
         Log.d(ASSERTION_TAG, "Assert that the no password was given error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
+        loginSignInPage.assertLoginEmailErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
 
         Log.d(STEP_TAG, "Try to login with leaving only the username field empty.")
         loginSignInPage.loginAs(EMPTY_STRING, INVALID_PASSWORD)
 
-        Log.d(ASSERTION_TAG, "Assert that the invalid credentials error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE)
+        Log.d(ASSERTION_TAG, "Assert that the no email error message is displayed.")
+        loginSignInPage.assertLoginEmailErrorMessage(NO_EMAIL_GIVEN_ERROR_MESSAGE) // Invalid credentials error message will be displayed within the email error message holder on the login page.
     }
 
     private fun loginWithUser(user: CanvasUserApiModel, lastSchoolSaved: Boolean = false) {
@@ -449,4 +456,34 @@ class LoginE2ETest : ParentComposeTest() {
         loginSignInPage.assertPageObjects()
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginHowDoIFindMySchoolE2E() {
+
+        Log.d(STEP_TAG, "Click 'Find My School' button.")
+        loginLandingPage.clickFindMySchoolButton()
+
+        Log.d(STEP_TAG, "Enter and invalid domain to trigger the 'Tap here for login help.' link to be displayed.")
+        loginFindSchoolPage.enterDomain("invalid-domain")
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Tap here for login help.' link is displayed.")
+        loginFindSchoolPage.assertHowDoIFindMySchoolLinkDisplayed()
+
+        val expectedUrl = "https://community.instructure.com/en/kb/articles/662717-where-do-i-find-my-institutions-url-to-access-canvas"
+        val expectedIntent = IntentMatchers.hasData(expectedUrl)
+        Intents.init()
+        try {
+            Intents.intending(expectedIntent).respondWith(Instrumentation.ActivityResult(0, null))
+
+            Log.d(STEP_TAG, "Click on the 'Tap here for login help.' link.")
+            loginFindSchoolPage.clickOnHowDoIFindMySchoolLink()
+
+            Log.d(ASSERTION_TAG, "Assert that an intent with the correct URL was fired.")
+            Intents.intended(expectedIntent)
+        } finally {
+            Intents.release()
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/compose/CourseDetailsPage.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/compose/CourseDetailsPage.kt
index 6fb621b08a..31d32d4e8e 100644
--- a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/compose/CourseDetailsPage.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/compose/CourseDetailsPage.kt
@@ -18,19 +18,26 @@
 package com.instructure.parentapp.ui.pages.compose
 
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsSelected
 import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasAnyChild
+import androidx.compose.ui.test.hasAnyDescendant
+import androidx.compose.ui.test.hasParent
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.ComposeTestRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import com.instructure.canvas.espresso.refresh
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.utils.toDate
 import com.instructure.dataseeding.model.CourseApiModel
 import com.instructure.espresso.assertTextColor
+import com.instructure.espresso.retryWithIncreasingDelay
+import com.instructure.pandautils.utils.toFormattedString
 
 
 class CourseDetailsPage(private val composeTestRule: ComposeTestRule) {
@@ -76,4 +83,97 @@ class CourseDetailsPage(private val composeTestRule: ComposeTestRule) {
     fun clickComposeMessageFAB() {
         composeTestRule.onNodeWithContentDescription("Send a message about this course").performClick()
     }
+
+    fun assertHasAssignmentWithCheckpoints(assignmentName: String, dueAtString: String = "No due date", dueAtStringSecondCheckpoint: String? = null, expectedGrade: String? = null) {
+        assertHasAssignmentCommon(assignmentName, dueAtString, dueAtStringSecondCheckpoint, expectedGrade, hasCheckPoints = true)
+    }
+
+    private fun assertHasAssignmentCommon(assignmentName: String, assignmentDueAt: String?, secondCheckpointDueAt: String? = null, expectedGradeLabel: String? = null, assignmentStatus: String? = null, hasCheckPoints : Boolean = false) {
+
+        // Check if the assignment is a discussion with checkpoints, if yes, we are expecting 2 due dates for the 2 checkpoints.
+        if(hasCheckPoints) {
+            if (assignmentDueAt == null || assignmentDueAt == "No due date") {
+                composeTestRule.onAllNodes(
+                    hasText("No due date").and(
+                        hasParent(hasAnyDescendant(hasText(assignmentName)))
+                    ),
+                    true
+                ).assertCountEquals(2)
+            }
+            else {
+                if(secondCheckpointDueAt != null) {
+                    composeTestRule.onAllNodes(
+                        hasText(assignmentDueAt).and(
+                            hasParent(hasAnyDescendant(hasText(assignmentName)))
+                        ),
+                        true
+                    ).assertCountEquals(1)
+                    composeTestRule.onAllNodes(
+                        hasText(secondCheckpointDueAt).and(
+                            hasParent(hasAnyDescendant(hasText(assignmentName)))
+                        ),
+                        true
+                    ).assertCountEquals(1)
+                }
+                else {
+                    composeTestRule.onAllNodes(
+                        hasText(assignmentDueAt).and(
+                            hasParent(hasAnyDescendant(hasText(assignmentName)))
+                        ),
+                        true
+                    ).assertCountEquals(2)
+                }
+            }
+        }
+        else {
+            // Check that either the assignment due date is present, or "No Due Date" is displayed
+            if (assignmentDueAt != null) {
+                composeTestRule.onNode(
+                    hasText(assignmentName).and(
+                        hasParent(
+                            hasAnyDescendant(
+                                hasText(
+                                    "Due ${
+                                        assignmentDueAt.toDate()!!.toFormattedString()
+                                    }"
+                                )
+                            )
+                        )
+                    )
+                )
+                    .assertIsDisplayed()
+            } else {
+                composeTestRule.onNode(
+                    hasText(assignmentName).and(
+                        hasParent(hasAnyDescendant(hasText("No due date")))
+                    )
+                )
+                    .assertIsDisplayed()
+            }
+        }
+
+        retryWithIncreasingDelay(times = 10, maxDelay = 4000, catchBlock = { refresh() }) {
+            // Check that grade is present, if that is specified
+            if (expectedGradeLabel != null) {
+                composeTestRule.onNode(
+                    hasText(assignmentName).and(
+                        hasParent(hasAnyDescendant(hasText(expectedGradeLabel, substring = true)))
+                    )
+                )
+                    .assertIsDisplayed()
+            }
+        }
+
+        retryWithIncreasingDelay(times = 10, maxDelay = 4000, catchBlock = { refresh() }) {
+            if(assignmentStatus != null) {
+                composeTestRule.onNode(
+                    hasText(assignmentStatus).and(
+                        hasAnyAncestor(hasAnyChild(hasText(assignmentName)))
+                    ),
+                    useUnmergedTree = true
+                )
+                    .assertIsDisplayed()
+            }
+        }
+    }
 }
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/compose/ParentAssignmentDetailsPage.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/compose/ParentAssignmentDetailsPage.kt
new file mode 100644
index 0000000000..5183ae565b
--- /dev/null
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/compose/ParentAssignmentDetailsPage.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.parentapp.ui.pages.compose
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.hasAnyDescendant
+import androidx.compose.ui.test.hasTestTag
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import com.instructure.canvas.espresso.common.pages.AssignmentDetailsPage
+import com.instructure.espresso.ModuleItemInteractions
+import com.instructure.espresso.page.withId
+import com.instructure.parentapp.R
+
+class ParentAssignmentDetailsPage(moduleItemInteractions: ModuleItemInteractions, composeTestRule: ComposeTestRule): AssignmentDetailsPage(moduleItemInteractions, composeTestRule) {
+
+    fun assertDiscussionCheckpointDetailsOnDetailsPage(checkpointText: String, dueAt: String)
+    {
+        composeTestRule.waitForIdle()
+        try {
+            composeTestRule.onNode(hasText(dueAt) and hasAnyAncestor(hasTestTag("dueDateColumn-$checkpointText") and hasAnyDescendant(hasTestTag("dueDateHeaderText-$checkpointText")))).assertIsDisplayed()
+        } catch (e: AssertionError) {
+            Espresso.onView(withId(R.id.dueComposeView)).perform(ViewActions.scrollTo())
+            composeTestRule.waitForIdle()
+        }
+
+        composeTestRule.onNode(hasTestTag("dueDateHeaderText-$checkpointText"), useUnmergedTree = true).assertIsDisplayed()
+        composeTestRule.onNode(hasText(dueAt) and hasAnyAncestor(hasTestTag("dueDateColumn-$checkpointText") and hasAnyDescendant(hasTestTag("dueDateHeaderText-$checkpointText")))).assertIsDisplayed()
+    }
+
+}
\ No newline at end of file
diff --git a/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt
index 81beeda7f9..decbb367bf 100644
--- a/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt
+++ b/apps/parent/src/androidTest/java/com/instructure/parentapp/utils/ParentComposeTest.kt
@@ -18,7 +18,6 @@
 package com.instructure.parentapp.utils
 
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import com.instructure.canvas.espresso.common.pages.AssignmentDetailsPage
 import com.instructure.canvas.espresso.common.pages.AssignmentReminderPage
 import com.instructure.canvas.espresso.common.pages.compose.CalendarEventCreateEditPage
 import com.instructure.canvas.espresso.common.pages.compose.CalendarEventDetailsPage
@@ -43,6 +42,7 @@ import com.instructure.parentapp.ui.pages.compose.CreateAccountPage
 import com.instructure.parentapp.ui.pages.compose.ManageStudentsPage
 import com.instructure.parentapp.ui.pages.compose.NotAParentPage
 import com.instructure.parentapp.ui.pages.compose.PairingCodePage
+import com.instructure.parentapp.ui.pages.compose.ParentAssignmentDetailsPage
 import com.instructure.parentapp.ui.pages.compose.ParentInboxCoursePickerPage
 import com.instructure.parentapp.ui.pages.compose.QrPairingPage
 import com.instructure.parentapp.ui.pages.compose.StudentAlertSettingsPage
@@ -83,7 +83,7 @@ abstract class ParentComposeTest : ParentTest() {
     protected val calendarFilterPage = CalendarFilterPage(composeTestRule)
     protected val assignmentReminderPage = AssignmentReminderPage(composeTestRule)
     protected val inboxSignatureSettingsPage = InboxSignatureSettingsPage(composeTestRule)
-    protected val assignmentDetailsPage = AssignmentDetailsPage(ModuleItemInteractions(), composeTestRule)
+    protected val assignmentDetailsPage = ParentAssignmentDetailsPage(ModuleItemInteractions(), composeTestRule)
 
     override fun displaysPageObjects() = Unit
 }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CourseDetailsModule.kt b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CourseDetailsModule.kt
index 5ce103c209..9e9391cb76 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CourseDetailsModule.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/di/feature/CourseDetailsModule.kt
@@ -18,6 +18,7 @@
 package com.instructure.parentapp.di.feature
 
 import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PageAPI
 import com.instructure.canvasapi2.apis.TabAPI
 import com.instructure.parentapp.features.courses.details.CourseDetailsRepository
 import dagger.Module
@@ -33,8 +34,9 @@ class CourseDetailsModule {
     @Provides
     fun provideCourseDetailsRepository(
         courseApi: CourseAPI.CoursesInterface,
-        tabsInterface: TabAPI.TabsInterface
+        tabsInterface: TabAPI.TabsInterface,
+        pageApi: PageAPI.PagesInterface
     ): CourseDetailsRepository {
-        return CourseDetailsRepository(courseApi, tabsInterface)
+        return CourseDetailsRepository(courseApi, tabsInterface, pageApi)
     }
 }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/addstudent/qr/QrPairingScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/addstudent/qr/QrPairingScreen.kt
index e8029a7796..a2214172a7 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/addstudent/qr/QrPairingScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/addstudent/qr/QrPairingScreen.kt
@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.OutlinedButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
@@ -43,6 +42,7 @@ import androidx.compose.ui.unit.sp
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.CanvasAppBar
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.Loading
 import com.instructure.parentapp.R
 import com.instructure.parentapp.features.addstudent.AddStudentAction
@@ -55,7 +55,7 @@ fun QrPairingScreen(
     onBackClicked: () -> Unit
 ) {
     CanvasTheme {
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 CanvasAppBar(
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/details/AnnouncementDetailsScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/details/AnnouncementDetailsScreen.kt
index 3df92ae074..c850163513 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/details/AnnouncementDetailsScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/details/AnnouncementDetailsScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Divider
 import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
 import androidx.compose.material.SnackbarResult
@@ -55,6 +54,7 @@ import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.canvasapi2.utils.DateHelper
 import com.instructure.pandares.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.ComposeCanvasWebViewWrapper
 import com.instructure.pandautils.compose.composables.ErrorContent
@@ -86,7 +86,7 @@ fun AnnouncementDetailsScreen(
             }
         }
 
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 CanvasThemedAppBar(
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/settings/AlertSettingsScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/settings/AlertSettingsScreen.kt
index 66af9ed9e6..af4b88550b 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/settings/AlertSettingsScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/alerts/settings/AlertSettingsScreen.kt
@@ -37,7 +37,6 @@ import androidx.compose.material.AlertDialog
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.DropdownMenuItem
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.material.TextField
@@ -77,8 +76,9 @@ import com.instructure.canvasapi2.models.ThresholdWorkflowState
 import com.instructure.canvasapi2.models.User
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.compose.CanvasTheme
-import com.instructure.pandautils.compose.composables.CanvasAppBar
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasSwitch
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.Loading
 import com.instructure.pandautils.compose.composables.OverflowMenu
@@ -100,16 +100,16 @@ fun AlertSettingsScreen(
     navigationActionClick: () -> Unit
 ) {
     CanvasTheme {
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
-                CanvasAppBar(
+                CanvasThemedAppBar(
                     title = stringResource(id = R.string.alertSettingsTitle),
                     navIconRes = R.drawable.ic_back_arrow,
                     navIconContentDescription = stringResource(id = R.string.back),
                     navigationActionClick = navigationActionClick,
                     backgroundColor = Color(uiState.userColor),
-                    textColor = colorResource(id = R.color.textLightest),
+                    contentColor = colorResource(id = R.color.textLightest),
                     actions = {
                         var showMenu by rememberSaveable { mutableStateOf(false) }
                         var showConfirmationDialog by rememberSaveable { mutableStateOf(false) }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/assignment/details/ParentAssignmentDetailsBehaviour.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/assignment/details/ParentAssignmentDetailsBehaviour.kt
index 3372d7d9d8..d9727a78c6 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/assignment/details/ParentAssignmentDetailsBehaviour.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/assignment/details/ParentAssignmentDetailsBehaviour.kt
@@ -35,6 +35,7 @@ import com.instructure.pandautils.features.assignments.details.AssignmentDetails
 import com.instructure.pandautils.features.inbox.utils.InboxComposeOptions
 import com.instructure.pandautils.utils.DP
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
 import com.instructure.pandautils.utils.onClick
 import com.instructure.pandautils.utils.orDefault
 import com.instructure.pandautils.utils.studentColor
@@ -96,6 +97,7 @@ class ParentAssignmentDetailsBehaviour @Inject constructor(
                 marginEnd = context.DP(16).toInt()
                 bottomMargin = context.DP(16).toInt()
             }
+            applyBottomSystemBarMargin()
             onClick {
                 routeToCompose?.invoke(getInboxComposeOptions(context, course, assignment))
             }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepository.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepository.kt
index 16618fc9cc..ee5accb7eb 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepository.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepository.kt
@@ -18,16 +18,19 @@
 package com.instructure.parentapp.features.courses.details
 
 import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PageAPI
 import com.instructure.canvasapi2.apis.TabAPI
 import com.instructure.canvasapi2.builders.RestParams
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Page
 import com.instructure.canvasapi2.models.Tab
 
 
 class CourseDetailsRepository(
     private val courseApi: CourseAPI.CoursesInterface,
-    private val tabApi: TabAPI.TabsInterface
+    private val tabApi: TabAPI.TabsInterface,
+    private val pageApi: PageAPI.PagesInterface
 ) {
 
     suspend fun getCourse(id: Long, forceRefresh: Boolean): Course {
@@ -39,4 +42,9 @@ class CourseDetailsRepository(
         val params = RestParams(isForceReadFromNetwork = forceRefresh)
         return tabApi.getTabs(id, CanvasContext.Type.COURSE.apiString, params).dataOrThrow
     }
+
+    suspend fun getFrontPage(courseId: Long, forceRefresh: Boolean): Page? {
+        val params = RestParams(isForceReadFromNetwork = forceRefresh)
+        return pageApi.getFrontPage(CanvasContext.Type.COURSE.apiString, courseId, params).dataOrNull
+    }
 }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsScreen.kt
index f4f4196014..ef98d80518 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsScreen.kt
@@ -24,7 +24,6 @@ import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
-import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
 import androidx.compose.material.SnackbarResult
@@ -51,6 +50,7 @@ import androidx.compose.ui.unit.dp
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.Loading
@@ -197,7 +197,7 @@ private fun CourseDetailsScreenContent(
         }
     }
 
-    Scaffold(
+    CanvasScaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
         snackbarHost = {
             SnackbarHost(
@@ -261,7 +261,7 @@ private fun CourseDetailsScreenContent(
                 backgroundColor = Color(uiState.studentColor),
                 onClick = {
                     actionHandler(CourseDetailsAction.SendAMessage)
-                }
+                },
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_chat),
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModel.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModel.kt
index abaa64438e..e5db26af35 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModel.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModel.kt
@@ -79,18 +79,18 @@ class CourseDetailsViewModel @Inject constructor(
 
             val course = repository.getCourse(courseId, forceRefresh)
             val tabs = repository.getCourseTabs(courseId, forceRefresh)
+            val frontPage = repository.getFrontPage(courseId, forceRefresh)
 
-            val hasHomePageAsFrontPage = course.homePage == Course.HomePage.HOME_WIKI
+            val showFrontPageTab = !frontPage?.body.isNullOrEmpty()
 
             val showSyllabusTab = !course.syllabusBody.isNullOrEmpty() &&
-                    (course.homePage == Course.HomePage.HOME_SYLLABUS ||
-                            (!hasHomePageAsFrontPage && tabs.any { it.tabId == Tab.SYLLABUS_ID }))
+                    (course.homePage == Course.HomePage.HOME_SYLLABUS || tabs.any { it.tabId == Tab.SYLLABUS_ID })
 
             val showSummary = showSyllabusTab && course.settings?.courseSummary.orDefault()
 
             val tabTypes = buildList {
                 add(TabType.GRADES)
-                if (hasHomePageAsFrontPage) add(TabType.FRONT_PAGE)
+                if (showFrontPageTab) add(TabType.FRONT_PAGE)
                 if (showSyllabusTab) add(TabType.SYLLABUS)
                 if (showSummary) add(TabType.SUMMARY)
             }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/grades/ParentGradesScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/grades/ParentGradesScreen.kt
index e0686eb85f..68a7d6f97b 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/grades/ParentGradesScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/grades/ParentGradesScreen.kt
@@ -47,5 +47,5 @@ internal fun ParentGradesScreen(
         }
     }
 
-    GradesScreen(gradesUiState, gradesViewModel::handleAction, ParentPrefs.currentStudent.studentColor)
+    GradesScreen(gradesUiState, gradesViewModel::handleAction, ParentPrefs.currentStudent.studentColor, applyInsets = false)
 }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt
index 00b5948c8b..90530c3809 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt
@@ -18,6 +18,7 @@
 package com.instructure.parentapp.features.dashboard
 
 import android.content.res.ColorStateList
+import android.content.res.Configuration
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.view.Gravity
@@ -29,6 +30,8 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.GravityCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
@@ -56,11 +59,13 @@ import com.instructure.pandautils.features.calendar.SharedCalendarAction
 import com.instructure.pandautils.features.help.HelpDialogFragment
 import com.instructure.pandautils.features.reminder.AlarmScheduler
 import com.instructure.pandautils.interfaces.NavigationCallbacks
+import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.animateCircularBackgroundColorChange
 import com.instructure.pandautils.utils.announceAccessibilityText
 import com.instructure.pandautils.utils.applyTheme
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.collectDistinctUntilChanged
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.getDrawableCompat
@@ -218,6 +223,34 @@ class DashboardFragment : BaseCanvasFragment(), NavigationCallbacks {
         navController.removeOnDestinationChangedListener(onDestinationChangedListener)
     }
 
+    override fun onResume() {
+        super.onResume()
+        updateStatusBarAppearanceForDrawer()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        updateStatusBarAppearanceForDrawer()
+    }
+
+    private fun updateStatusBarAppearanceForDrawer() {
+        // Check if drawer is open and update status bar appearance accordingly (handles config changes)
+        // Post to ensure drawer state is checked after current layout pass
+        binding.drawerLayout.post {
+            if (binding.drawerLayout.isDrawerOpen(GravityCompat.START) && !ColorKeeper.darkTheme) {
+                activity?.window?.let { window ->
+                    val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                    controller?.isAppearanceLightStatusBars = true
+                }
+            } else if (!ColorKeeper.darkTheme) {
+                activity?.window?.let { window ->
+                    val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                    controller?.isAppearanceLightStatusBars = false
+                }
+            }
+        }
+    }
+
     private fun handleAction(action: DashboardViewModelAction) {
         when (action) {
             is DashboardViewModelAction.AddStudent -> {
@@ -275,6 +308,7 @@ class DashboardFragment : BaseCanvasFragment(), NavigationCallbacks {
     }
 
     private fun setupToolbar() {
+        binding.toolbar.applyTopSystemBarInsets()
         binding.navigationButtonHolder.contentDescription = getString(R.string.navigation_drawer_open)
         binding.navigationButtonHolder.onClick {
             openNavigationDrawer()
@@ -287,6 +321,32 @@ class DashboardFragment : BaseCanvasFragment(), NavigationCallbacks {
 
     private fun setupNavigationDrawer() {
         val navView = binding.navView
+        ViewCompat.setOnApplyWindowInsetsListener(navView) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            val isLandscape = resources.configuration.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
+
+            if (isLandscape) {
+                // In landscape, navigation buttons are on the sides - remove left/right padding
+                view.setPadding(
+                    0,  // Remove left padding in landscape
+                    insets.top,
+                    0,  // Remove right padding in landscape
+                    0
+                )
+            } else {
+                // In portrait, apply normal insets
+                view.setPadding(
+                    insets.left,
+                    insets.top,
+                    insets.right,
+                    insets.bottom
+                )
+            }
+
+            windowInsets
+        }
 
         headerLayoutBinding = NavigationDrawerHeaderLayoutBinding.bind(navView.getHeaderView(0))
 
@@ -333,6 +393,24 @@ class DashboardFragment : BaseCanvasFragment(), NavigationCallbacks {
             override fun onDrawerOpened(drawerView: View) {
                 closeNavigationDrawerItem.isVisible = isAccessibilityEnabled(requireContext())
                 super.onDrawerOpened(drawerView)
+                // Set status bar icons to dark only in light mode (for visibility on white drawer background)
+                if (!ColorKeeper.darkTheme) {
+                    activity?.window?.let { window ->
+                        val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                        controller?.isAppearanceLightStatusBars = true
+                    }
+                }
+            }
+
+            override fun onDrawerClosed(drawerView: View) {
+                super.onDrawerClosed(drawerView)
+                // Restore status bar icons to light only in light mode (for dark toolbar)
+                if (!ColorKeeper.darkTheme) {
+                    activity?.window?.let { window ->
+                        val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                        controller?.isAppearanceLightStatusBars = false
+                    }
+                }
             }
         })
     }
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt
index ec3d946646..6e58aa5199 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/inbox/list/ParentInboxRouter.kt
@@ -37,7 +37,7 @@ class ParentInboxRouter(
 ) : InboxRouter {
 
     override fun openConversation(conversation: Conversation, scope: InboxApi.Scope) {
-        navigation.navigate(activity, navigation.inboxDetailsRoute(conversation.id, conversation.workflowState == Conversation.WorkflowState.UNREAD))
+        navigation.navigate(activity, navigation.inboxDetailsRoute(conversation.id, conversation.workflowState == Conversation.WorkflowState.UNREAD, scope))
     }
 
     override fun attachNavigationIcon(toolbar: Toolbar) {
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountActivity.kt
index 6c3e731621..502aa303bf 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountActivity.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountActivity.kt
@@ -17,11 +17,14 @@
 package com.instructure.parentapp.features.login.createaccount
 
 import android.os.Bundle
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import com.instructure.pandautils.base.BaseCanvasActivity
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.interfaces.NavigationCallbacks
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.parentapp.R
 import com.instructure.parentapp.databinding.ActivityCreateAccountBinding
 import com.instructure.parentapp.util.navigation.Navigation
@@ -40,10 +43,32 @@ class CreateAccountActivity : BaseCanvasActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         setContentView(binding.root)
+        setupWindowInsets()
         setupNavigation()
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+            // Apply both navigation bar and display cutout insets
+            // This ensures content is not hidden behind the navigation bar OR the hole punch camera
+            val leftPadding = maxOf(navigationBars.left, displayCutout.left)
+            val rightPadding = maxOf(navigationBars.right, displayCutout.right)
+
+            view.setPadding(
+                leftPadding,
+                0,
+                rightPadding,
+                0
+            )
+            insets
+        }
+    }
+
     private fun setupNavigation() {
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountScreen.kt
index 9c61d69476..98aaa97996 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountScreen.kt
@@ -37,7 +37,6 @@ import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
 import androidx.compose.material.SnackbarResult
@@ -77,6 +76,7 @@ import androidx.compose.ui.unit.sp
 import com.instructure.canvasapi2.models.TermsOfService
 import com.instructure.pandares.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.Loading
 
 @Composable
@@ -96,7 +96,7 @@ internal fun CreateAccountScreen(
             }
         }
 
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
             content = { padding ->
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt
index 02550a9980..d20d94e442 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/main/MainActivity.kt
@@ -27,6 +27,9 @@ import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
@@ -44,6 +47,7 @@ import com.instructure.pandautils.interfaces.NavigationCallbacks
 import com.instructure.pandautils.utils.AppType
 import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.WebViewAuthenticator
 import com.instructure.pandautils.utils.toast
@@ -83,7 +87,9 @@ class MainActivity : BaseCanvasActivity(), OnUnreadCountInvalidated, Masqueradin
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         setContentView(binding.root)
+        setupWindowInsets()
         setupTheme()
         setupNavigation()
         handleQrMasquerading()
@@ -93,6 +99,47 @@ class MainActivity : BaseCanvasActivity(), OnUnreadCountInvalidated, Masqueradin
         RatingDialog.showRatingDialog(this, AppType.PARENT)
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+            // Apply both navigation bar and display cutout insets
+            // This ensures content is not hidden behind the navigation bar OR the hole punch camera
+            val leftPadding = maxOf(navigationBars.left, displayCutout.left)
+            val rightPadding = maxOf(navigationBars.right, displayCutout.right)
+
+            view.setPadding(
+                leftPadding,
+                0,
+                rightPadding,
+                0
+            )
+
+            // Consume horizontal insets so child ComposeViews don't apply them again
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.navigationBars(),
+                    Insets.of(
+                        0, // Consume left
+                        navigationBars.top,
+                        0, // Consume right
+                        navigationBars.bottom
+                    )
+                )
+                .setInsets(
+                    WindowInsetsCompat.Type.displayCutout(),
+                    Insets.of(
+                        0, // Consume left
+                        displayCutout.top,
+                        0, // Consume right
+                        displayCutout.bottom
+                    )
+                )
+                .build()
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         webViewAuthenticator.authenticateWebViews(lifecycleScope, this)
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt
index 2e43b4627a..21c7acd5c8 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -36,7 +37,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
@@ -67,6 +67,7 @@ import androidx.compose.ui.unit.sp
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.EmptyContent
 import com.instructure.pandautils.compose.composables.ErrorContent
@@ -82,7 +83,7 @@ internal fun ManageStudentsScreen(
     modifier: Modifier = Modifier
 ) {
     CanvasTheme {
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 CanvasThemedAppBar(
@@ -117,9 +118,8 @@ internal fun ManageStudentsScreen(
                     StudentListContent(
                         uiState = uiState,
                         actionHandler = actionHandler,
-                        modifier = Modifier
-                            .padding(padding)
-                            .fillMaxSize()
+                        scaffoldPadding = padding,
+                        modifier = Modifier.fillMaxSize()
                     )
                 }
             },
@@ -148,7 +148,8 @@ internal fun ManageStudentsScreen(
 private fun StudentListContent(
     uiState: ManageStudentsUiState,
     actionHandler: (ManageStudentsAction) -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    scaffoldPadding: PaddingValues = PaddingValues(0.dp)
 ) {
     val pullRefreshState = rememberPullRefreshState(
         refreshing = uiState.isLoading,
@@ -177,7 +178,8 @@ private fun StudentListContent(
         modifier = modifier.pullRefresh(pullRefreshState)
     ) {
         LazyColumn(
-            modifier = Modifier.fillMaxSize()
+            modifier = Modifier.fillMaxSize(),
+            contentPadding = scaffoldPadding
         ) {
             items(uiState.studentListItems) {
                 StudentListItem(it, actionHandler)
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentScreen.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentScreen.kt
index d21303e7a3..54354eb5a5 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentScreen.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/notaparent/NotAParentScreen.kt
@@ -17,6 +17,7 @@
 
 package com.instructure.parentapp.features.notaparent
 
+import android.content.res.Configuration
 import androidx.annotation.DrawableRes
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.clickable
@@ -24,8 +25,11 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -43,6 +47,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
@@ -64,6 +69,10 @@ internal fun NotAParentScreen(
     onTeacherClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
+    val configuration = LocalConfiguration.current
+    val isPortrait = configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+    val navigationBarPadding = WindowInsets.navigationBars.asPaddingValues()
+
     Surface(
         color = colorResource(id = R.color.backgroundLightest),
         modifier = modifier
@@ -75,7 +84,11 @@ internal fun NotAParentScreen(
 
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.padding(horizontal = 16.dp)
+            modifier = Modifier.padding(
+                start = 16.dp,
+                end = 16.dp,
+                bottom = if (isPortrait) navigationBarPadding.calculateBottomPadding() else 0.dp
+            )
         ) {
             Spacer(modifier = Modifier.weight(1f))
             EmptyContent(
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/webview/HtmlContentActivity.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/webview/HtmlContentActivity.kt
index 78109c437b..31ea0e0073 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/webview/HtmlContentActivity.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/webview/HtmlContentActivity.kt
@@ -20,10 +20,14 @@ package com.instructure.parentapp.features.webview
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.pandautils.base.BaseCanvasActivity
 import com.instructure.pandautils.fragments.HtmlContentFragment
 import com.instructure.pandautils.fragments.HtmlContentFragment.Companion.DARK_TOOLBAR
 import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.parentapp.R
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -33,8 +37,11 @@ class HtmlContentActivity : BaseCanvasActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         setContentView(R.layout.activity_html_content)
 
+        setupWindowInsets()
+
         if (savedInstanceState == null) {
             val title = intent.getStringExtra(Const.TITLE).orEmpty()
             val html = intent.getStringExtra(Const.HTML).orEmpty()
@@ -50,6 +57,20 @@ class HtmlContentActivity : BaseCanvasActivity() {
         }
     }
 
+    private fun setupWindowInsets() {
+        val root = findViewById<android.view.View>(R.id.fragmentContainer)
+        ViewCompat.setOnApplyWindowInsetsListener(root) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            view.updatePadding(
+                left = insets.left,
+                right = insets.right
+            )
+            windowInsets
+        }
+    }
+
     companion object {
         fun createIntent(context: Context, title: String, html: String, darkToolbar: Boolean): Intent {
             return Intent(context, HtmlContentActivity::class.java).apply {
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/features/webview/SimpleWebViewFragment.kt b/apps/parent/src/main/java/com/instructure/parentapp/features/webview/SimpleWebViewFragment.kt
index c0835c923e..861a69e8f1 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/features/webview/SimpleWebViewFragment.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/features/webview/SimpleWebViewFragment.kt
@@ -19,8 +19,6 @@ package com.instructure.parentapp.features.webview
 
 import android.content.res.ColorStateList
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -38,6 +36,7 @@ import com.instructure.pandautils.mvvm.ViewState
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.NullableStringArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
 import com.instructure.pandautils.utils.launchCustomTab
@@ -69,6 +68,8 @@ class SimpleWebViewFragment : BaseCanvasFragment(), NavigationCallbacks {
 
     private var title: String? by NullableStringArg(key = Const.TITLE)
 
+    private var customTabLaunched = false
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_simple_webview, container, false)
     }
@@ -87,13 +88,23 @@ class SimpleWebViewFragment : BaseCanvasFragment(), NavigationCallbacks {
         }
 
         savedInstanceState?.let {
+            customTabLaunched = it.getBoolean(KEY_CUSTOM_TAB_LAUNCHED, false)
             binding.webView.restoreState(it)
             binding.webView.enableAlgorithmicDarkening()
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (customTabLaunched) {
+            customTabLaunched = false
+            activity?.supportFragmentManager?.popBackStack()
+        }
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
+        outState.putBoolean(KEY_CUSTOM_TAB_LAUNCHED, customTabLaunched)
         binding.webView.saveState(outState)
     }
 
@@ -111,12 +122,16 @@ class SimpleWebViewFragment : BaseCanvasFragment(), NavigationCallbacks {
 
             is SimpleWebViewAction.ShowError -> {
                 toast(com.instructure.pandautils.R.string.errorOccurred)
-                activity?.onBackPressed()
+                if (isAdded && !parentFragmentManager.isStateSaved) {
+                    activity?.supportFragmentManager?.popBackStack()
+                }
             }
         }
     }
 
     private fun applyTheme() = with(binding) {
+        webView.setPadding(0, 0, 0, 0)
+        toolbar.applyTopSystemBarInsets()
         toolbar.title = title.orEmpty()
         toolbar.setupAsBackButton(this@SimpleWebViewFragment)
         ViewStyler.themeToolbarColored(
@@ -159,18 +174,34 @@ class SimpleWebViewFragment : BaseCanvasFragment(), NavigationCallbacks {
             }
         }
 
+        webView.setMediaDownloadCallback(object : CanvasWebView.MediaDownloadCallback {
+            override fun downloadMedia(mime: String?, url: String?, filename: String?) {
+                if (!limitWebAccess) {
+                    viewModel.downloadFile(mime.orEmpty(), url.orEmpty(), filename.orEmpty())
+                }
+            }
+
+            override fun downloadInternalMedia(mime: String?, url: String?, filename: String?) {
+                if (!limitWebAccess) {
+                    viewModel.downloadFile(mime.orEmpty(), url.orEmpty(), filename.orEmpty())
+                }
+            }
+        })
+
         webView.loadUrl(mainUrl)
     }
 
     private fun launchCustomTab(url: String) {
         activity?.let {
+            customTabLaunched = true
             it.launchCustomTab(url, parentPrefs.currentStudent.studentColor)
-            Handler(Looper.getMainLooper()).postDelayed({
-                it.onBackPressed()
-            }, 500)
         }
     }
 
+    companion object {
+        private const val KEY_CUSTOM_TAB_LAUNCHED = "key_custom_tab_launched"
+    }
+
     private fun showAlertJavascript(webView: WebView, infoText: String = getString(R.string.webAccessLimitedMessage)) {
         val showAlertJavaScrip = """
             const floatNode = `<div id="flash_message_holder_mobile" style="z-index: 10000; position: fixed; bottom: 0; left: 0; right: 0; margin: 16px; width: auto;">
diff --git a/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/Navigation.kt b/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/Navigation.kt
index 421e54877b..48429754f4 100644
--- a/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/Navigation.kt
+++ b/apps/parent/src/main/java/com/instructure/parentapp/util/navigation/Navigation.kt
@@ -21,6 +21,7 @@ import com.instructure.pandautils.features.calendarevent.details.EventFragment
 import com.instructure.pandautils.features.calendartodo.createupdate.CreateUpdateToDoFragment
 import com.instructure.pandautils.features.calendartodo.details.ToDoFragment
 import com.instructure.pandautils.features.inbox.compose.InboxComposeFragment
+import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.pandautils.features.inbox.details.InboxDetailsFragment
 import com.instructure.pandautils.features.inbox.list.InboxFragment
 import com.instructure.pandautils.features.inbox.utils.InboxComposeOptions
@@ -56,7 +57,7 @@ class Navigation(apiPrefs: ApiPrefs) {
     private val globalAnnouncementDetails = "$baseUrl/account_notifications/{$announcementId}"
     private val assignmentDetails = "$baseUrl/courses/{${Const.COURSE_ID}}/assignments/{${Const.ASSIGNMENT_ID}}"
     private val inboxCompose = "$baseUrl/conversations/compose/{${InboxComposeOptions.COMPOSE_PARAMETERS}}"
-    private val inboxDetails = "$baseUrl/conversations/{${InboxDetailsFragment.CONVERSATION_ID}}?unread={${InboxDetailsFragment.UNREAD}}"
+    private val inboxDetails = "$baseUrl/conversations/{${InboxDetailsFragment.CONVERSATION_ID}}?unread={${InboxDetailsFragment.UNREAD}}&scope={${InboxDetailsFragment.SCOPE}}"
     private val calendarEvent = "$baseUrl/{${EventFragment.CONTEXT_TYPE}}/{${EventFragment.CONTEXT_ID}}/calendar_events/{${EventFragment.SCHEDULE_ITEM_ID}}"
     private val createEvent = "$baseUrl/create-event/{${CreateUpdateEventFragment.INITIAL_DATE}}"
     private val updateEvent = "$baseUrl/update-event/{${CreateUpdateEventFragment.SCHEDULE_ITEM}}"
@@ -83,7 +84,7 @@ class Navigation(apiPrefs: ApiPrefs) {
     private fun splashRoute(qrCodeMasqueradeId: Long) = "$baseUrl/splash/$qrCodeMasqueradeId"
     fun assignmentDetailsRoute(courseId: Long, assignmentId: Long) = "$baseUrl/courses/${courseId}/assignments/${assignmentId}"
     fun inboxComposeRoute(options: InboxComposeOptions) = "$baseUrl/conversations/compose/${InboxComposeOptionsParametersType.serializeAsValue(options)}"
-    fun inboxDetailsRoute(conversationId: Long, unread: Boolean) = "$baseUrl/conversations/$conversationId?unread=$unread"
+    fun inboxDetailsRoute(conversationId: Long, unread: Boolean, scope: InboxApi.Scope = InboxApi.Scope.INBOX) = "$baseUrl/conversations/$conversationId?unread=$unread&scope=${scope.name}"
     fun createAccount(domain: String, accountId: String, pairingCode: String) = "$baseUrl/account_creation?pairing_code=$pairingCode&domain=$domain&accountId=$accountId"
     fun courseDetailsRoute(id: Long) = "$baseUrl/courses/$id"
     fun calendarEventRoute(contextTypeString: String, contextId: Long, eventId: Long) = "$baseUrl/$contextTypeString/$contextId/calendar_events/$eventId"
@@ -140,6 +141,11 @@ class Navigation(apiPrefs: ApiPrefs) {
                     nullable = false
                     defaultValue = false
                 }
+                argument(InboxDetailsFragment.SCOPE) {
+                    type = NavType.StringType
+                    nullable = true
+                    defaultValue = null
+                }
             }
             fragment<ManageStudentsFragment>(manageStudents)
             fragment<QrPairingFragment>(qrPairing)
diff --git a/apps/parent/src/main/res/layout/fragment_dashboard.xml b/apps/parent/src/main/res/layout/fragment_dashboard.xml
index 340e036fd0..5286ae3761 100644
--- a/apps/parent/src/main/res/layout/fragment_dashboard.xml
+++ b/apps/parent/src/main/res/layout/fragment_dashboard.xml
@@ -34,6 +34,7 @@
         android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/main_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
@@ -58,6 +59,7 @@
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:minHeight="?android:attr/actionBarSize"
                     app:contentInsetStart="0dp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
diff --git a/apps/parent/src/main/res/layout/fragment_simple_webview.xml b/apps/parent/src/main/res/layout/fragment_simple_webview.xml
index 869b13aa97..1a3bceec93 100644
--- a/apps/parent/src/main/res/layout/fragment_simple_webview.xml
+++ b/apps/parent/src/main/res/layout/fragment_simple_webview.xml
@@ -24,7 +24,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/apps/parent/src/main/res/values/themes.xml b/apps/parent/src/main/res/values/themes.xml
index 46dc5f7017..dd0a67a964 100644
--- a/apps/parent/src/main/res/values/themes.xml
+++ b/apps/parent/src/main/res/values/themes.xml
@@ -33,6 +33,5 @@
         <item name="android:editTextStyle">@style/NoGifEditText</item>
         <item name="editTextStyle">@style/NoGifEditText</item>
         <item name="fontFamily">@font/lato_font_family</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepositoryTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepositoryTest.kt
index f81a8268ed..4b8c47cbf0 100644
--- a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepositoryTest.kt
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsRepositoryTest.kt
@@ -18,10 +18,12 @@
 package com.instructure.parentapp.features.courses.details
 
 import com.instructure.canvasapi2.apis.CourseAPI
+import com.instructure.canvasapi2.apis.PageAPI
 import com.instructure.canvasapi2.apis.TabAPI
 import com.instructure.canvasapi2.builders.RestParams
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Page
 import com.instructure.canvasapi2.models.Tab
 import com.instructure.canvasapi2.utils.DataResult
 import io.mockk.coEvery
@@ -35,8 +37,9 @@ class CourseDetailsRepositoryTest {
 
     private val courseApi: CourseAPI.CoursesInterface = mockk(relaxed = true)
     private val tabApi: TabAPI.TabsInterface = mockk(relaxed = true)
+    private val pageApi: PageAPI.PagesInterface = mockk(relaxed = true)
 
-    private val repository = CourseDetailsRepository(courseApi, tabApi)
+    private val repository = CourseDetailsRepository(courseApi, tabApi, pageApi)
 
     @Test
     fun `Get course details successfully returns data`() = runTest {
@@ -85,4 +88,34 @@ class CourseDetailsRepositoryTest {
 
         repository.getCourseTabs(1L, true)
     }
+
+    @Test
+    fun `Get front page successfully returns page`() = runTest {
+        val expected = Page(body = "Front page content")
+
+        coEvery {
+            pageApi.getFrontPage(
+                CanvasContext.Type.COURSE.apiString,
+                1L,
+                RestParams(isForceReadFromNetwork = false)
+            )
+        } returns DataResult.Success(expected)
+
+        val result = repository.getFrontPage(1L, false)
+        Assert.assertEquals(expected, result)
+    }
+
+    @Test
+    fun `Get front page returns null when fails`() = runTest {
+        coEvery {
+            pageApi.getFrontPage(
+                CanvasContext.Type.COURSE.apiString,
+                1L,
+                RestParams(isForceReadFromNetwork = false)
+            )
+        } returns DataResult.Fail()
+
+        val result = repository.getFrontPage(1L, false)
+        Assert.assertNull(result)
+    }
 }
diff --git a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModelTest.kt b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModelTest.kt
index 2075a2bc6f..0984ada5ee 100644
--- a/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModelTest.kt
+++ b/apps/parent/src/test/java/com/instructure/parentapp/features/courses/details/CourseDetailsViewModelTest.kt
@@ -25,6 +25,7 @@ import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.SavedStateHandle
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.CourseSettings
+import com.instructure.canvasapi2.models.Page
 import com.instructure.canvasapi2.models.Tab
 import com.instructure.canvasapi2.models.User
 import com.instructure.canvasapi2.type.EnrollmentType
@@ -98,8 +99,9 @@ class CourseDetailsViewModelTest {
 
     @Test
     fun `Load course details with front page tab`() = runTest {
-        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1", homePage = Course.HomePage.HOME_WIKI)
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1")
         coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "Front page content")
 
         createViewModel()
 
@@ -115,6 +117,92 @@ class CourseDetailsViewModelTest {
         Assert.assertEquals(expected, viewModel.uiState.value)
     }
 
+    @Test
+    fun `Front page tab not shown when front page body is empty`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1")
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "")
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES),
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
+    @Test
+    fun `Front page tab not shown when no front page`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1")
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns null
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES),
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
+    @Test
+    fun `Front page tab shown when default view is not front page`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(id = 1, name = "Course 1", homePage = Course.HomePage.HOME_ASSIGNMENTS)
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab("tab1"))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "Front page content")
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES, TabType.FRONT_PAGE),
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
+    @Test
+    fun `Front page tab shown alongside syllabus tab`() = runTest {
+        coEvery { repository.getCourse(1, any()) } returns Course(
+            id = 1,
+            name = "Course 1",
+            homePage = Course.HomePage.HOME_SYLLABUS,
+            syllabusBody = "Syllabus body"
+        )
+        coEvery { repository.getCourseTabs(1, any()) } returns listOf(Tab(Tab.SYLLABUS_ID))
+        coEvery { repository.getFrontPage(1, any()) } returns Page(body = "Front page content")
+
+        createViewModel()
+
+        val expected = CourseDetailsUiState(
+            courseName = "Course 1",
+            studentColor = 1,
+            isLoading = false,
+            isError = false,
+            tabs = listOf(TabType.GRADES, TabType.FRONT_PAGE, TabType.SYLLABUS),
+            syllabus = "Syllabus body",
+            baseUrl = "domain/courses/1"
+        )
+
+        Assert.assertEquals(expected, viewModel.uiState.value)
+    }
+
     @Test
     fun `Load course details with syllabus tab`() = runTest {
         coEvery { repository.getCourse(1, any()) } returns Course(
diff --git a/apps/student/build.gradle b/apps/student/build.gradle
index ca660cb254..27bd9e9bf2 100644
--- a/apps/student/build.gradle
+++ b/apps/student/build.gradle
@@ -38,8 +38,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 287
-        versionName = '8.5.0'
+        versionCode = 289
+        versionName = '8.6.1'
 
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'com.instructure.student.espresso.StudentHiltTestRunner'
@@ -318,8 +318,6 @@ dependencies {
     implementation Libs.ANDROIDX_WORK_MANAGER
     implementation Libs.ANDROIDX_WORK_MANAGER_KTX
 
-    implementation Libs.PENDO
-
     /* ROOM */
     implementation Libs.ROOM
     ksp Libs.ROOM_COMPILER
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DashboardE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DashboardE2ETest.kt
index aab20d2faf..3c28993d7f 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DashboardE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DashboardE2ETest.kt
@@ -23,6 +23,7 @@ import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.annotations.Stub
 import com.instructure.dataseeding.api.ConversationsApi
 import com.instructure.dataseeding.api.GroupsApi
 import com.instructure.student.ui.utils.StudentTest
@@ -39,6 +40,7 @@ class DashboardE2ETest : StudentTest() {
 
     @E2E
     @Test
+    @Stub("MBL-19868")
     @TestMetaData(Priority.MANDATORY, FeatureCategory.DASHBOARD, TestCategory.E2E)
     fun testDashboardE2E() {
 
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DiscussionsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DiscussionsE2ETest.kt
index 2a12228bf0..e82d90f94f 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DiscussionsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/DiscussionsE2ETest.kt
@@ -19,6 +19,7 @@ package com.instructure.student.ui.e2e.classic
 import android.os.SystemClock.sleep
 import android.util.Log
 import androidx.test.espresso.Espresso
+import androidx.test.platform.app.InstrumentationRegistry
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -27,16 +28,20 @@ import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
 import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.dataseeding.api.DiscussionTopicsApi
-import com.instructure.dataseeding.api.EnrollmentsApi
-import com.instructure.dataseeding.model.EnrollmentTypes.STUDENT_ENROLLMENT
-import com.instructure.dataseeding.model.EnrollmentTypes.TEACHER_ENROLLMENT
+import com.instructure.dataseeding.api.FileFolderApi
+import com.instructure.dataseeding.api.FileUploadsApi
+import com.instructure.dataseeding.model.FileUploadType
 import com.instructure.espresso.convertIso8601ToCanvasFormat
+import com.instructure.espresso.getCustomDateCalendar
 import com.instructure.espresso.getDateInCanvasFormat
 import com.instructure.student.ui.utils.StudentComposeTest
 import com.instructure.student.ui.utils.extensions.seedData
 import com.instructure.student.ui.utils.extensions.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.TimeZone
 
 @HiltAndroidTest
 class DiscussionsE2ETest: StudentComposeTest() {
@@ -179,12 +184,6 @@ class DiscussionsE2ETest: StudentComposeTest() {
         val teacher = data.teachersList[0]
         val course = data.coursesList[0]
 
-        Log.d(PREPARATION_TAG, "Enroll '${student.name}' student to the dedicated course (${course.name}) with '${course.id}' id.")
-        EnrollmentsApi.enrollUser(course.id, student.id, STUDENT_ENROLLMENT)
-
-        Log.d(PREPARATION_TAG, "Enroll '${teacher.name}' teacher to the dedicated course (${course.name}) with '${course.id}' id.")
-        EnrollmentsApi.enrollUser(course.id, teacher.id, TEACHER_ENROLLMENT)
-
         Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints for '${course.name}' course.")
         val discussionWithCheckpointsWithoutDueDatesTitle = "Test Discussion with Checkpoints"
         val assignmentName = "Test Assignment with Checkpoints"
@@ -249,14 +248,11 @@ class DiscussionsE2ETest: StudentComposeTest() {
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)
     fun testDiscussionCheckpointsSyllabusE2E() {
         Log.d(PREPARATION_TAG, "Seeding data.")
-        val data = seedData(students = 1, teachers = 1, courses = 1, syllabusBody = "this is the syllabus body") // This course and syllabus will be used once the seeding will be fixed
+        val data = seedData(students = 1, teachers = 1, courses = 1, syllabusBody = "this is the syllabus body")
         val student = data.studentsList[0]
         val teacher = data.teachersList[0]
         val course = data.coursesList[0]
 
-        Log.d(PREPARATION_TAG, "Enroll '${student.name}' student to the dedicated course (${course.name}) with '$course.id' id.")
-        EnrollmentsApi.enrollUser(course.id, student.id, STUDENT_ENROLLMENT)
-
         Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints for '${course.name}' course.")
         val discussionWithCheckpointsTitle = "Test Discussion with Checkpoints"
         val replyToTopicDueDate = "2029-11-12T22:59:00Z"
@@ -300,4 +296,159 @@ class DiscussionsE2ETest: StudentComposeTest() {
         assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", convertedReplyToTopicDueDate)
         assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due",convertedReplyToEntryDueDate)
     }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)
+    fun testDiscussionCheckpointWithPdfAttachmentE2E() {
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        Log.d(PREPARATION_TAG, "Get course root folder to upload the PDF file.")
+        val courseRootFolder = FileFolderApi.getCourseRootFolder(course.id, teacher.token)
+
+        Log.d(PREPARATION_TAG, "Read PDF file from assets.")
+        val pdfFileName = "samplepdf.pdf"
+        val context = InstrumentationRegistry.getInstrumentation().context
+        val pdfBytes = context.assets.open(pdfFileName).use { it.readBytes() }
+
+        Log.d(PREPARATION_TAG, "Upload PDF file to course root folder using teacher token.")
+        val uploadedFile = FileUploadsApi.uploadFile(courseId = courseRootFolder.id, assignmentId = null, file = pdfBytes, fileName = pdfFileName, token = teacher.token, fileUploadType = FileUploadType.COURSE_FILE)
+
+        Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints and PDF attachment for '${course.name}' course.")
+        val discussionWithCheckpointsTitle = "Discussion with PDF Attachment"
+        val assignmentName = "Assignment with Checkpoints and PDF"
+        val replyToTopicDueDate = "2029-11-12T22:59:00Z"
+        val replyToEntryDueDate = "2029-11-19T22:59:00Z"
+        DiscussionTopicsApi.createDiscussionTopicWithCheckpoints(courseId = course.id, token = teacher.token, discussionTitle = discussionWithCheckpointsTitle, assignmentName = assignmentName, replyToTopicDueDate = replyToTopicDueDate, replyToEntryDueDate = replyToEntryDueDate, fileId = uploadedFile.id.toString())
+
+        val convertedReplyToTopicDueDate = "Due " + convertIso8601ToCanvasFormat("2029-11-12T22:59:00Z") + " 2:59 PM"
+        val convertedReplyToEntryDueDate = "Due " + convertIso8601ToCanvasFormat("2029-11-19T22:59:00Z") + " 2:59 PM"
+        Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+        tokenLogin(student)
+
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Select course: '${course.name}'.")
+        dashboardPage.waitForRender()
+        dashboardPage.selectCourse(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Discussions' Tab is displayed on the CourseBrowser Page.")
+        courseBrowserPage.assertTabDisplayed("Discussions")
+
+        Log.d(STEP_TAG, "Navigate to Assignments Page.")
+        courseBrowserPage.selectAssignments()
+
+        Log.d(ASSERTION_TAG, "Assert that the '${discussionWithCheckpointsTitle}' discussion is present along with 2 date info (For the 2 checkpoints).")
+        assignmentListPage.assertHasAssignmentWithCheckpoints(discussionWithCheckpointsTitle, dueAtString = convertedReplyToTopicDueDate, dueAtStringSecondCheckpoint = convertedReplyToEntryDueDate, expectedGrade = "-/15")
+
+        Log.d(STEP_TAG, "Click on '$discussionWithCheckpointsTitle' assignment.")
+        assignmentListPage.clickAssignment(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that Assignment Details Page is displayed with correct title.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertAssignmentTitle(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that attachment icon is displayed.")
+        assignmentDetailsPage.assertAttachmentIconDisplayed()
+
+        Log.d(STEP_TAG, "Click on attachment icon to view attachments.")
+        assignmentDetailsPage.clickAttachmentIcon()
+
+        Log.d(ASSERTION_TAG, "Verify PDF viewer toolbar is displayed.")
+        assignmentDetailsPage.assertPdfViewerToolbarDisplayed()
+
+        Log.d(STEP_TAG, "Navigate back from PDF viewer to assignment details.")
+        Espresso.pressBack()
+
+        Log.d(ASSERTION_TAG, "Assert that we're back on the assignment details page.")
+        assignmentDetailsPage.assertAssignmentTitle(discussionWithCheckpointsTitle)
+    }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)
+    fun testDiscussionCheckpointsCalendarE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1, syllabusBody = "this is the syllabus body")
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        val discussionWithCheckpointsTitle = "Test Discussion with Checkpoints"
+        val assignmentName = "Test Assignment with Checkpoints"
+
+        Log.d(PREPARATION_TAG, "Convert dates to match with different formats in different screens (Calendar, Assignment Details)")
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
+            timeZone = TimeZone.getTimeZone("UTC")
+        }
+        val calendarDisplayFormat = SimpleDateFormat(" MMM d 'at' h:mm a", Locale.US)
+        val assignmentDetailsDisplayFormat = SimpleDateFormat("MMM d, yyyy h:mm a", Locale.US)
+        val replyToTopicCalendar = getCustomDateCalendar(2)
+        val replyToEntryCalendar = getCustomDateCalendar(4)
+        val replyToTopicDueTime = dateFormat.format(replyToTopicCalendar.time)
+        val replyToEntryDueTime = dateFormat.format(replyToEntryCalendar.time)
+        val convertedReplyToTopicDueDate = calendarDisplayFormat.format(replyToTopicCalendar.time)
+        val convertedReplyToEntryDueDate = calendarDisplayFormat.format(replyToEntryCalendar.time)
+        val assignmentDetailsReplyToTopicDueDate = assignmentDetailsDisplayFormat.format(replyToTopicCalendar.time)
+        val assignmentDetailsReplyToEntryDueDate = assignmentDetailsDisplayFormat.format(replyToEntryCalendar.time)
+
+        Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints for '${course.name}' course.")
+        DiscussionTopicsApi.createDiscussionTopicWithCheckpoints(course.id, teacher.token, discussionWithCheckpointsTitle, assignmentName, replyToTopicDueTime, replyToEntryDueTime)
+
+        Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+        tokenLogin(student)
+
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered.")
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page.")
+        dashboardPage.clickCalendarTab()
+
+        Log.d(STEP_TAG , "Swipe 2 days to the future to find the 'Reply to Topic' Discussion Checkpoint calendar item.")
+        calendarScreenPage.swipeEventsLeft(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Reply to Topic' checkpoint is displayed on the Calendar Page with the correct title, course name, and due date.")
+        calendarScreenPage.assertItemDetails(discussionWithCheckpointsTitle, course.name, "Due$convertedReplyToTopicDueDate")
+
+        Log.d(STEP_TAG , "Swipe 2 additional days to the future to find the 'Additional replies' Discussion Checkpoint calendar item.")
+        calendarScreenPage.swipeEventsLeft(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Additional replies' checkpoint is displayed on the Calendar Page with the correct title, course name, and due date.")
+        calendarScreenPage.assertItemDetails(discussionWithCheckpointsTitle, course.name,"Due$convertedReplyToEntryDueDate")
+
+        Log.d(STEP_TAG, "Click on the '$discussionWithCheckpointsTitle' discussion's 'Additional replies' checkpoint calendar item to open it's details.")
+        calendarScreenPage.clickOnItem(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that the Assignment Details Page is displayed properly with the correct toolbar title and subtitle.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertDisplayToolbarSubtitle(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the checkpoints are displayed properly on the Assignment Details Page.")
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", assignmentDetailsReplyToTopicDueDate)
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due", assignmentDetailsReplyToEntryDueDate)
+
+        Log.d(STEP_TAG, "Navigate back to Calendar Page.")
+        Espresso.pressBack()
+
+        Log.d(STEP_TAG , "Swipe 2 days BACK to find the 'Reply to Topic' Discussion Checkpoint calendar item again.")
+        calendarScreenPage.swipeEventsRight(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Reply to Topic' checkpoint is displayed on the Calendar Page with the correct title, course name, and due date.")
+        calendarScreenPage.assertItemDetails(discussionWithCheckpointsTitle, course.name, "Due$convertedReplyToTopicDueDate")
+
+        Log.d(STEP_TAG, "Click on the '$discussionWithCheckpointsTitle' discussion's 'Reply to Topic' checkpoint calendar item to open it's details.")
+        calendarScreenPage.clickOnItem(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that the Assignment Details Page is displayed properly with the correct toolbar title and subtitle.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertDisplayToolbarSubtitle(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the checkpoints are displayed properly on the Assignment Details Page.")
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", assignmentDetailsReplyToTopicDueDate)
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due", assignmentDetailsReplyToEntryDueDate)
+    }
+
 }
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/FilesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/FilesE2ETest.kt
index 03fd6afebe..b679ab3742 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/FilesE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/FilesE2ETest.kt
@@ -17,7 +17,9 @@
 package com.instructure.student.ui.e2e.classic
 
 import android.os.Environment
+import android.os.SystemClock.sleep
 import android.util.Log
+import androidx.media3.ui.R
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.intent.Intents
 import androidx.test.platform.app.InstrumentationRegistry
@@ -26,7 +28,6 @@ import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
-import com.instructure.canvas.espresso.common.pages.compose.AssignmentListPage
 import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.canvasapi2.managers.DiscussionManager
 import com.instructure.canvasapi2.models.CanvasContext
@@ -35,6 +36,8 @@ import com.instructure.canvasapi2.utils.weave.catch
 import com.instructure.canvasapi2.utils.weave.tryWeave
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.DiscussionTopicsApi
+import com.instructure.dataseeding.api.FileFolderApi
+import com.instructure.dataseeding.api.FileUploadsApi
 import com.instructure.dataseeding.api.SubmissionsApi
 import com.instructure.dataseeding.model.FileUploadType
 import com.instructure.dataseeding.model.GradingType
@@ -43,6 +46,9 @@ import com.instructure.dataseeding.util.Randomizer
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
+import com.instructure.espresso.getVideoPosition
+import com.instructure.espresso.retryWithIncreasingDelay
+import com.instructure.espresso.triggerWorkManagerJobs
 import com.instructure.student.ui.utils.StudentComposeTest
 import com.instructure.student.ui.utils.extensions.seedData
 import com.instructure.student.ui.utils.extensions.tokenLogin
@@ -310,4 +316,129 @@ class FilesE2ETest: StudentComposeTest() {
         fileListPage.assertItemDisplayed(testFile)
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.E2E)
+    fun testVideoFileUploadE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+        val videoFileName = "test_video.mp4"
+
+        Log.d(PREPARATION_TAG, "Setup the '$videoFileName' file on the device.")
+        setupFileOnDevice(videoFileName)
+
+        Log.d(PREPARATION_TAG, "Seed '$videoFileName' to the course root folder via the teacher so the Files tab is visible and the video can be opened by the student.")
+        val courseRootFolder = FileFolderApi.getCourseRootFolder(course.id, teacher.token)
+        val videoFileBytes = InstrumentationRegistry.getInstrumentation().context.assets.open(videoFileName).readBytes()
+        FileUploadsApi.uploadFile(courseId = courseRootFolder.id, assignmentId = null, file = videoFileBytes, fileName = videoFileName, token = teacher.token, fileUploadType = FileUploadType.COURSE_FILE)
+
+        Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+        tokenLogin(student)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Navigate to the global 'Files' Page from the left side menu.")
+        leftSideNavigationDrawerPage.clickFilesMenu()
+
+        Log.d(STEP_TAG, "Click on the 'Add' (+) icon and after that on the 'Upload File' icon.")
+        fileListPage.clickAddButton()
+        fileListPage.clickUploadFileButton()
+
+        Log.d(ASSERTION_TAG, "Assert that the File Chooser Page title is 'Upload To My Files'.")
+        fileChooserPage.assertDialogTitle("Upload To My Files")
+
+        Log.d(PREPARATION_TAG, "Simulate file picker intent for '$videoFileName'.")
+        Intents.init()
+        try {
+            stubFilePickerIntent(videoFileName)
+            fileChooserPage.chooseDevice()
+        } finally {
+            Intents.release()
+        }
+
+        Log.d(STEP_TAG, "Click on the 'Upload' button.")
+        fileChooserPage.clickUpload()
+
+        Log.d(ASSERTION_TAG, "Assert that '$videoFileName' is displayed in My Files after the upload.")
+        retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = {
+            triggerWorkManagerJobs("FileUploadWorker", 20000)
+        }) {
+            fileListPage.assertItemDisplayed(videoFileName)
+        }
+
+        Log.d(STEP_TAG, "Click on '$videoFileName' to open it.")
+        fileListPage.selectItem(videoFileName)
+
+        Log.d(ASSERTION_TAG, "Assert that the video player is displayed.")
+        videoPlayerPage.waitForPlayerViewAndTapToShowControls(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        var firstVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        var secondVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+
+        Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
+        pressBackButton(2)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Select '${course.name}' course and navigate to the course files.")
+        dashboardPage.selectCourse(course)
+        courseBrowserPage.selectFiles()
+
+        Log.d(ASSERTION_TAG, "Assert that '$videoFileName' is displayed in the course files.")
+        fileListPage.assertItemDisplayed(videoFileName)
+
+        Log.d(STEP_TAG, "Click on '$videoFileName' to open it.")
+        fileListPage.selectItem(videoFileName)
+
+        Log.d(ASSERTION_TAG, "Assert that the video player is displayed.")
+        videoPlayerPage.waitForPlayerViewAndTapToShowControls(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        firstVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        secondVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/LoginE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/LoginE2ETest.kt
index 5680ac92aa..d083081081 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/LoginE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/LoginE2ETest.kt
@@ -16,8 +16,11 @@
  */
 package com.instructure.student.ui.e2e.classic
 
+import android.app.Instrumentation
 import android.util.Log
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -37,6 +40,7 @@ import com.instructure.dataseeding.model.EnrollmentTypes.STUDENT_ENROLLMENT
 import com.instructure.dataseeding.model.EnrollmentTypes.TEACHER_ENROLLMENT
 import com.instructure.dataseeding.util.CanvasNetworkAdapter
 import com.instructure.espresso.withIdlingResourceDisabled
+import com.instructure.student.R
 import com.instructure.student.ui.utils.StudentTest
 import com.instructure.student.ui.utils.extensions.enterDomain
 import com.instructure.student.ui.utils.extensions.seedData
@@ -251,13 +255,15 @@ class LoginE2ETest : StudentTest() {
 
     @E2E
     @Test
+    @Stub("MBL-19866")
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.E2E)
     fun testInvalidAndEmptyLoginCredentialsE2E() {
 
         val INVALID_USERNAME = "invalidusercred@test.com"
         val INVALID_PASSWORD = "invalidpw"
-        val INVALID_CREDENTIALS_ERROR_MESSAGE = "Please verify your username or password and try again. Trouble logging in? Check out our Login FAQs."
-        val NO_PASSWORD_GIVEN_ERROR_MESSAGE = "No password was given"
+        val INVALID_CREDENTIALS_ERROR_MESSAGE = "Please verify your username or password and try again."
+        val NO_EMAIL_GIVEN_ERROR_MESSAGE = "Please enter your email."
+        val NO_PASSWORD_GIVEN_ERROR_MESSAGE = "Please enter your password."
         val DOMAIN = "mobileqa.beta"
 
         Log.d(STEP_TAG, "Click 'Find My School' button.")
@@ -269,29 +275,32 @@ class LoginE2ETest : StudentTest() {
         Log.d(STEP_TAG, "Click on 'Next' button on the Toolbar.")
         loginFindSchoolPage.clickToolbarNextMenuItem()
 
+        /* Somehow React does not recognize the invalid credentials, need to be fixed in follow-up ticket
         Log.d(STEP_TAG, "Try to login with invalid, non-existing credentials ('$INVALID_USERNAME', '$INVALID_PASSWORD').")
         loginSignInPage.loginAs(INVALID_USERNAME, INVALID_PASSWORD)
 
         Log.d(ASSERTION_TAG, "Assert that the invalid credentials error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE)
+        loginSignInPage.assertLoginEmailErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE) // Invalid credentials error message will be displayed within the email error message holder on the login page.
+        */
 
         Log.d(STEP_TAG, "Try to login with no credentials typed in either of the username and password field.")
         loginSignInPage.loginAs(EMPTY_STRING, EMPTY_STRING)
 
-        Log.d(ASSERTION_TAG, "Assert that the no password was given error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
+        Log.d(ASSERTION_TAG, "Assert that the no email and no password error messages are displayed.")
+        loginSignInPage.assertLoginEmailErrorMessage(NO_EMAIL_GIVEN_ERROR_MESSAGE)
+        loginSignInPage.assertLoginPasswordErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
 
         Log.d(STEP_TAG, "Try to login with leaving only the password field empty.")
         loginSignInPage.loginAs(INVALID_USERNAME, EMPTY_STRING)
 
         Log.d(ASSERTION_TAG, "Assert that the no password was given error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
+        loginSignInPage.assertLoginEmailErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
 
         Log.d(STEP_TAG, "Try to login with leaving only the username field empty.")
         loginSignInPage.loginAs(EMPTY_STRING, INVALID_PASSWORD)
 
-        Log.d(ASSERTION_TAG, "Assert that the invalid credentials error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE)
+        Log.d(ASSERTION_TAG, "Assert that the no email error message is displayed.")
+        loginSignInPage.assertLoginEmailErrorMessage(NO_EMAIL_GIVEN_ERROR_MESSAGE) // Invalid credentials error message will be displayed within the email error message holder on the login page.
     }
 
     // Verify that students can sign into vanity domain
@@ -416,6 +425,58 @@ class LoginE2ETest : StudentTest() {
         loginSignInPage.assertPageObjects()
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginHowDoIFindMySchoolE2E() {
+
+        Log.d(STEP_TAG, "Click 'Find My School' button.")
+        loginLandingPage.clickFindMySchoolButton()
+
+        Log.d(STEP_TAG, "Enter and invalid domain to trigger the 'Tap here for login help.' link to be displayed.")
+        loginFindSchoolPage.enterDomain("invalid-domain")
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Tap here for login help.' link is displayed.")
+        loginFindSchoolPage.assertHowDoIFindMySchoolLinkDisplayed()
+
+        val expectedUrl = "https://community.instructure.com/en/kb/articles/662717-where-do-i-find-my-institutions-url-to-access-canvas"
+        val expectedIntent = IntentMatchers.hasData(expectedUrl)
+        Intents.init()
+        try {
+            Intents.intending(expectedIntent).respondWith(Instrumentation.ActivityResult(0, null))
+
+            Log.d(STEP_TAG, "Click on the 'Tap here for login help.' link.")
+            loginFindSchoolPage.clickOnHowDoIFindMySchoolLink()
+
+            Log.d(ASSERTION_TAG, "Assert that an intent with the correct URL was fired.")
+            Intents.intended(expectedIntent)
+        } finally {
+            Intents.release()
+        }
+    }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginCanFindSchoolE2E() {
+
+        Log.d(STEP_TAG, "Click 'Find My School' button.")
+        loginLandingPage.clickFindMySchoolButton()
+
+        Log.d(ASSERTION_TAG, "Assert that the Find School Page has been displayed properly.")
+        loginFindSchoolPage.assertPageObjects()
+
+        Log.d(ASSERTION_TAG, "Assert that the hint text is correct based on the device type.")
+        if(isTabletDevice()) loginFindSchoolPage.assertHintText(R.string.schoolInstructureCom)
+        else loginFindSchoolPage.assertHintText(R.string.loginHint)
+
+        Log.d(STEP_TAG, "Enter domain: 'harvest'.")
+        loginFindSchoolPage.enterDomain("harvest")
+
+        Log.d(ASSERTION_TAG, "Assert that the 'City Harvest Church (Singapore)' school is displayed among the search results.")
+        loginFindSchoolPage.assertSchoolSearchResults("City Harvest Church (Singapore)")
+    }
+
     private fun loginWithUser(user: CanvasUserApiModel, lastSchoolSaved: Boolean = false) {
 
         Thread.sleep(5100) //Need to wait > 5 seconds before each login attempt because of new 'too many attempts' login policy on web.
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/TodoE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/TodoE2ETest.kt
index b8c8fd29a0..e572c10749 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/TodoE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/TodoE2ETest.kt
@@ -5,6 +5,7 @@ import androidx.test.espresso.Espresso
 import androidx.test.espresso.web.webdriver.Locator
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
@@ -12,6 +13,7 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.utils.toApiString
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.CalendarEventApi
+import com.instructure.dataseeding.api.DiscussionTopicsApi
 import com.instructure.dataseeding.api.PlannerAPI
 import com.instructure.dataseeding.api.QuizzesApi
 import com.instructure.dataseeding.model.GradingType
@@ -20,6 +22,8 @@ import com.instructure.dataseeding.util.ago
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
+import com.instructure.espresso.getCustomDateCalendar
+import com.instructure.espresso.retryWithIncreasingDelay
 import com.instructure.pandautils.R
 import com.instructure.student.ui.pages.classic.WebViewTextCheck
 import com.instructure.student.ui.utils.StudentComposeTest
@@ -27,8 +31,11 @@ import com.instructure.student.ui.utils.extensions.seedData
 import com.instructure.student.ui.utils.extensions.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
+import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
 
 @HiltAndroidTest
 class TodoE2ETest : StudentComposeTest() {
@@ -104,7 +111,7 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
         tokenLogin(student)
 
-        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Navigate to 'To Do' Page via bottom-menu.")
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Navigate to 'To-do' Page via bottom-menu.")
         dashboardPage.waitForRender()
         dashboardPage.clickTodoTab()
 
@@ -119,17 +126,17 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(threeWeeksAwayQuiz.title)
         toDoListPage.assertItemNotDisplayed(fourWeeksAwayAssignment.name)
 
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do Filter Page is displayed with the correct title.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do Filter Page is displayed with the correct title.")
         toDoFilterPage.assertFilterScreenTitle()
 
         Log.d(ASSERTION_TAG, "Assert that all filter options (and their 'group labels') are displayed correctly on the ToDo Filter Page.")
         toDoFilterPage.assertToDoFilterScreenDetails()
 
         Log.d(ASSERTION_TAG, "Assert that all 'Visible items' filter options are disabled by default on the ToDo Filter Page.")
-        toDoFilterPage.assertVisibleItemOptionCheckedState(R.string.todoFilterShowPersonalToDos, false)
+        toDoFilterPage.assertVisibleItemOptionCheckedState(R.string.todoFilterShowPersonalToDosNew, false)
         toDoFilterPage.assertVisibleItemOptionCheckedState(R.string.todoFilterShowCalendarEvents, false)
         toDoFilterPage.assertVisibleItemOptionCheckedState(R.string.todoFilterShowCompleted, false)
         toDoFilterPage.assertVisibleItemOptionCheckedState(R.string.todoFilterFavoriteCoursesOnly, false)
@@ -161,7 +168,7 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Mark the '${todayQuiz.title}' quiz as done.")
         toDoListPage.clickMarkToDoItemAsDone(todayQuiz.id)
 
-        Log.d(ASSERTION_TAG, "Assert that the snack bar is displayed with the correct quiz title. Wait until the item disappears from the To Do List.")
+        Log.d(ASSERTION_TAG, "Assert that the snack bar is displayed with the correct quiz title. Wait until the item disappears from the To-do List.")
         toDoListPage.waitForSnackbar(todayQuiz.title)
         toDoListPage.assertSnackbarDisplayed(todayQuiz.title)
         toDoListPage.waitForItemToDisappear(todayQuiz.title)
@@ -169,18 +176,18 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Click on 'Undo' button on the snack bar.")
         toDoListPage.clickSnackbarUndo()
 
-        Log.d(ASSERTION_TAG, "Assert that the '${todayQuiz.title}' quiz is back on the To Do List as we reverted the marking as done activity by clicked on the 'Undo' on the snack bar.")
+        Log.d(ASSERTION_TAG, "Assert that the '${todayQuiz.title}' quiz is back on the To-do List as we reverted the marking as done activity by clicked on the 'Undo' on the snack bar.")
         toDoListPage.waitForItemToAppear(todayQuiz.title)
         toDoListPage.assertItemDisplayed(todayQuiz.title)
 
         Log.d(STEP_TAG, "Mark the '${todayQuiz.title}' quiz as done.")
         toDoListPage.clickMarkToDoItemAsDone(todayQuiz.id)
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do List Page is empty because of the (default) filters.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do List Page is empty because of the (default) filters.")
         toDoListPage.waitForItemToDisappear(todayQuiz.title)
         toDoListPage.assertEmptyState()
 
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(ASSERTION_TAG, "Assert that the 'Show tasks until' filter has the 'Today' option selected.")
@@ -190,10 +197,10 @@ class TodoE2ETest : StudentComposeTest() {
         toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowCompleted)
         toDoFilterPage.clickClose()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do List Page is still empty because we did not save the 'Completed' filter by clicking on the 'Done' button, rather we clicked on the Close (X) button so the changes won't be applied.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do List Page is still empty because we did not save the 'Completed' filter by clicking on the 'Done' button, rather we clicked on the Close (X) button so the changes won't be applied.")
         toDoListPage.assertEmptyState()
 
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Select the 'Completed' visible items filter and click on 'Done' button.")
@@ -205,7 +212,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(favoriteCourseAssignment.name)
         toDoListPage.assertItemNotDisplayed(thisWeekAssignment.name)
 
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "UNselect the 'Completed' visible items filter and set back the 'Show tasks until' filter to 'This Week' (default) option and click on 'Done' button.")
@@ -238,10 +245,10 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the unfavorited course, '${course.name}' is NOT displayed on the Dashboard Page.")
         dashboardPage.assertCourseNotDisplayed(course)
 
-        Log.d(STEP_TAG, "Navigate to 'To Do' Page via bottom-menu.")
+        Log.d(STEP_TAG, "Navigate to 'To-do' Page via bottom-menu.")
         dashboardPage.clickTodoTab()
 
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Select the 'Favorite Courses Only' visible items filter and click on 'Done' button.")
@@ -256,7 +263,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(nextWeekQuiz.title)
 
         //Check next week in future
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Unselect the 'Favorite Courses Only' visible items filter and change the 'Show tasks until' filter to 'Next Week' option and click on 'Done' button")
@@ -276,7 +283,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(todayQuiz.title) // Not displayed as it's completed.
 
         //Check 2 weeks in future
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Change the 'Show tasks until' filter to 'In Two Weeks' option and click on 'Done' button.")
@@ -295,7 +302,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(todayQuiz.title) // Not displayed as it's completed.
 
         //Check 3 weeks in future
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Change the 'Show tasks until' filter to 'In Three Weeks' option and click on 'Done' button.")
@@ -314,7 +321,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(todayQuiz.title) // Not displayed as it's completed.
 
         //Check 4 weeks in future
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Change the 'Show tasks until' filter to 'In Four Weeks' option and click on 'Done' button.")
@@ -338,7 +345,7 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the '${thisWeekAssignment.name}' assignment details page is displayed with the correct assignment details.")
         assignmentDetailsPage.assertAssignmentDetails(thisWeekAssignment)
 
-        Log.d(STEP_TAG, "Navigate back to the To Do List Page.")
+        Log.d(STEP_TAG, "Navigate back to the To-do List Page.")
         Espresso.pressBack()
 
         Log.d(STEP_TAG, "Click on '${nextWeekQuiz.title}' quiz to open its details page.")
@@ -405,7 +412,7 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
         tokenLogin(student)
 
-        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Navigate to 'To Do' Page via bottom-menu.")
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Navigate to 'To-do' Page via bottom-menu.")
         dashboardPage.waitForRender()
         dashboardPage.clickTodoTab()
 
@@ -419,10 +426,10 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemDisplayed(fourWeeksAgoAssignment.name)
 
         //Check 3 weeks in past
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do Filter Page is displayed with the correct title.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do Filter Page is displayed with the correct title.")
         toDoFilterPage.assertFilterScreenTitle()
 
         Log.d(ASSERTION_TAG, "Assert that the 'Show tasks from' filter has the '4 Weeks Ago' option selected as default.")
@@ -443,7 +450,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(fourWeeksAgoAssignment.name)
 
         //Check 2 weeks in past
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Change the 'Show tasks from' filter to '2 Weeks Ago' option and click on 'Done' button.")
@@ -461,7 +468,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(threeWeeksAgoQuiz.title)
 
         //Check 1 week in past (Last Week)
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Change the 'Show tasks from' filter to 'Last Week' option and click on 'Done' button.")
@@ -479,7 +486,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(twoWeeksAgoAssignment.name)
 
         //Check this week in past (This Week)
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Change the 'Show tasks from' filter to 'This Week' option and click on 'Done' button.")
@@ -497,7 +504,7 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.assertItemNotDisplayed(lastWeekQuiz.title)
 
         //Check Today in past filters (Today)
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Change the 'Show tasks from' filter to 'Today' option and click on 'Done' button.")
@@ -534,7 +541,7 @@ class TodoE2ETest : StudentComposeTest() {
             Date().toApiString()
         )
 
-        Log.d(PREPARATION_TAG, "Seed a personal To Do for '${student.name}' student.")
+        Log.d(PREPARATION_TAG, "Seed a personal To-do for '${student.name}' student.")
         val testCalendarPersonalToDo = PlannerAPI.createPlannerNote(
             student.token,
             "Student Test Personal ToDo",
@@ -545,23 +552,23 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
         tokenLogin(student)
 
-        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Navigate to 'To Do' Page via bottom-menu.")
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Navigate to 'To-do' Page via bottom-menu.")
         dashboardPage.waitForRender()
         dashboardPage.clickTodoTab()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do List Page is empty because of the (default) filters.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do List Page is empty because of the (default) filters.")
         toDoListPage.assertEmptyState()
 
-        //Show both types: Calendar Events and Personal To Dos
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        //Show both types: Calendar Events and Personal To-dos
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
-        Log.d(STEP_TAG, "Select the 'Show Personal To Dos' and 'Show Calendar Events' visible items filter and click on 'Done' button.")
-        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDos)
+        Log.d(STEP_TAG, "Select the 'Show Personal To-dos' and 'Show Calendar Events' visible items filter and click on 'Done' button.")
+        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDosNew)
         toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowCalendarEvents)
         toDoFilterPage.clickDone()
 
-        Log.d(ASSERTION_TAG, "Assert that '${testCalendarEvent.title}' calendar event and '${testCalendarPersonalToDo.title}' personal To Do are displayed because we filtered to Personal To Dos and calendar events.")
+        Log.d(ASSERTION_TAG, "Assert that '${testCalendarEvent.title}' calendar event and '${testCalendarPersonalToDo.title}' personal To-do are displayed because we filtered to Personal To-dos and calendar events.")
         toDoListPage.assertItemDisplayed(testCalendarEvent.title)
         toDoListPage.assertItemDisplayed(testCalendarPersonalToDo.title)
 
@@ -571,40 +578,40 @@ class TodoE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the '${testCalendarEvent.title}' calendar event details page is displayed with the correct event title.")
         calendarEventDetailsPage.assertEventTitle(testCalendarEvent.title)
 
-        Log.d(STEP_TAG, "Navigate back to the To Do List Page.")
+        Log.d(STEP_TAG, "Navigate back to the To-do List Page.")
         Espresso.pressBack()
 
-        Log.d(STEP_TAG, "Click on the '${testCalendarPersonalToDo.title}' personal To Do item to open its details page.")
+        Log.d(STEP_TAG, "Click on the '${testCalendarPersonalToDo.title}' personal To-do item to open its details page.")
         toDoListPage.clickOnItem(testCalendarPersonalToDo.title)
 
-        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarPersonalToDo.title}' personal To Do details page is displayed with the correct event title.")
+        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarPersonalToDo.title}' personal To-do details page is displayed with the correct event title.")
         calendarToDoDetailsPage.assertTitle(testCalendarPersonalToDo.title)
 
-        Log.d(STEP_TAG, "Navigate back to the To Do List Page.")
+        Log.d(STEP_TAG, "Navigate back to the To-do List Page.")
         Espresso.pressBack()
 
-        //Show only Personal To Dos
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        //Show only Personal To-dos
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
-        Log.d(STEP_TAG, "Select the 'Show Personal To Dos' visible item filter and click on 'Done' button.")
-        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowCalendarEvents) // Toggle off Calendar Events to show only Personal To Dos
+        Log.d(STEP_TAG, "Select the 'Show Personal To-dos' visible item filter and click on 'Done' button.")
+        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowCalendarEvents) // Toggle off Calendar Events to show only Personal To-dos
         toDoFilterPage.clickDone()
 
-        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarPersonalToDo.title}' personal To Do is displayed, BUT the '${testCalendarEvent.title}' calendar event is not according to current filters.")
+        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarPersonalToDo.title}' personal To-do is displayed, BUT the '${testCalendarEvent.title}' calendar event is not according to current filters.")
         toDoListPage.assertItemDisplayed(testCalendarPersonalToDo.title)
         toDoListPage.assertItemNotDisplayed(testCalendarEvent.title)
 
         //Show only Calendar Events
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Select the 'Show Calendar Events' visible item filter and click on 'Done' button.")
-        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDos) // Toggle off Personal To Dos
+        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDosNew) // Toggle off Personal To-dos
         toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowCalendarEvents) // Toggle on Calendar Events
         toDoFilterPage.clickDone()
 
-        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarEvent.title}' calendar event is displayed, BUT the '${testCalendarPersonalToDo.title}' personal To Do is not according to current filters.")
+        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarEvent.title}' calendar event is displayed, BUT the '${testCalendarPersonalToDo.title}' personal To-do is not according to current filters.")
         toDoListPage.assertItemDisplayed(testCalendarEvent.title)
         toDoListPage.assertItemNotDisplayed(testCalendarPersonalToDo.title)
 
@@ -612,22 +619,22 @@ class TodoE2ETest : StudentComposeTest() {
         val todayDayOfMonth = Calendar.getInstance().get(Calendar.DAY_OF_MONTH)
         toDoListPage.clickDateBadge(todayDayOfMonth)
 
-        Log.d(ASSERTION_TAG, "Assert that the Calendar Page is displayed with the correct title. Assert that both the previously created calendar event '${testCalendarEvent.title}' and personal To Do '${testCalendarPersonalToDo.title}' are displayed on the calendar for today.")
+        Log.d(ASSERTION_TAG, "Assert that the Calendar Page is displayed with the correct title. Assert that both the previously created calendar event '${testCalendarEvent.title}' and personal To-do '${testCalendarPersonalToDo.title}' are displayed on the calendar for today.")
         calendarScreenPage.assertCalendarPageTitle()
         calendarScreenPage.assertItemDisplayed(testCalendarPersonalToDo.title)
         calendarScreenPage.assertItemDisplayed(testCalendarEvent.title)
 
-        Log.d(STEP_TAG, "Navigate back to the To Do List Page.")
+        Log.d(STEP_TAG, "Navigate back to the To-do List Page.")
         Espresso.pressBack()
 
-        Log.d(STEP_TAG, "Open the To Do Filter Page.")
+        Log.d(STEP_TAG, "Open the To-do Filter Page.")
         toDoListPage.clickFilterButton()
 
         Log.d(STEP_TAG, "Select the 'Show Calendar Events' visible item filter and click on 'Done' button.")
-        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDos) // Toggle off Personal To Dos
+        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDosNew) // Toggle off Personal To-dos
         toDoFilterPage.clickDone()
 
-        Log.d(ASSERTION_TAG, "Assert that '${testCalendarEvent.title}' calendar event and '${testCalendarPersonalToDo.title}' personal To Do are displayed because we filtered to Personal To Dos and calendar events.")
+        Log.d(ASSERTION_TAG, "Assert that '${testCalendarEvent.title}' calendar event and '${testCalendarPersonalToDo.title}' personal To-do are displayed because we filtered to Personal To-dos and calendar events.")
         toDoListPage.assertItemDisplayed(testCalendarEvent.title)
         toDoListPage.assertItemDisplayed(testCalendarPersonalToDo.title)
 
@@ -638,32 +645,126 @@ class TodoE2ETest : StudentComposeTest() {
         toDoListPage.waitForSnackbar(testCalendarEvent.title)
         toDoListPage.assertSnackbarDisplayed(testCalendarEvent.title)
 
-        Log.d(ASSERTION_TAG, "Assert that '${testCalendarEvent.title}' calendar event IS NOT displayed anymore, but the '${testCalendarPersonalToDo.title}' personal To Do is displayed.")
+        Log.d(ASSERTION_TAG, "Assert that '${testCalendarEvent.title}' calendar event IS NOT displayed anymore, but the '${testCalendarPersonalToDo.title}' personal To-do is displayed.")
         toDoListPage.assertItemNotDisplayed(testCalendarEvent.title)
         toDoListPage.assertItemDisplayed(testCalendarPersonalToDo.title)
 
-        Log.d(STEP_TAG, "Swipe left on the '${testCalendarPersonalToDo.title}' personal To Do to mark it as done.")
+        Log.d(STEP_TAG, "Swipe left on the '${testCalendarPersonalToDo.title}' personal To-do to mark it as done.")
         toDoListPage.swipeItemLeft(testCalendarPersonalToDo.id!!.toLong())
 
-        Log.d(ASSERTION_TAG, "Assert that the snack bar is displayed with the correct personal To Do title.")
+        Log.d(ASSERTION_TAG, "Assert that the snack bar is displayed with the correct personal To-do title.")
         toDoListPage.waitForSnackbar(testCalendarPersonalToDo.title)
         toDoListPage.assertSnackbarDisplayed(testCalendarPersonalToDo.title)
 
         Log.d(STEP_TAG, "Click on 'Undo' button on the snack bar to 'revert' the swipe action.")
         toDoListPage.clickSnackbarUndo()
 
-        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarPersonalToDo.title}' personal To Do is back on the To Do List as we reverted the marking as done activity by clicked on the 'Undo' on the snack bar.")
+        Log.d(ASSERTION_TAG, "Assert that the '${testCalendarPersonalToDo.title}' personal To-do is back on the To-do List as we reverted the marking as done activity by clicked on the 'Undo' on the snack bar.")
         toDoListPage.waitForItemToAppear(testCalendarPersonalToDo.title)
         toDoListPage.assertItemDisplayed(testCalendarPersonalToDo.title)
 
-        Log.d(STEP_TAG, "Swipe left on the '${testCalendarPersonalToDo.title}' personal To Do to mark it as done.")
+        Log.d(STEP_TAG, "Swipe left on the '${testCalendarPersonalToDo.title}' personal To-do to mark it as done.")
         toDoListPage.swipeItemLeft(testCalendarPersonalToDo.id!!.toLong())
 
-        Log.d(ASSERTION_TAG, "Assert that the snack bar is displayed with the correct personal To Do title.")
+        Log.d(ASSERTION_TAG, "Assert that the snack bar is displayed with the correct personal To-do title.")
         toDoListPage.waitForSnackbar(testCalendarPersonalToDo.title)
         toDoListPage.assertSnackbarDisplayed(testCalendarPersonalToDo.title)
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do List Page is empty because of the (default) filters.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do List Page is empty because of the (default) filters.")
         toDoListPage.assertEmptyState()
     }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.TODOS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)
+    fun testDiscussionCheckpointsToDoE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1, syllabusBody = "this is the syllabus body")
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        val discussionWithCheckpointsTitle = "Test Discussion with Checkpoints"
+        val assignmentName = "Test Assignment with Checkpoints"
+
+        Log.d(PREPARATION_TAG, "Convert dates to match with different formats in different screens (Calendar, Assignment Details)")
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
+            timeZone = TimeZone.getTimeZone("UTC")
+        }
+        val assignmentDetailsDisplayFormat = SimpleDateFormat("MMM d, yyyy h:mm a", Locale.US)
+        val replyToTopicCalendar = getCustomDateCalendar(2)
+        val replyToEntryCalendar = getCustomDateCalendar(4)
+        val replyToTopicDueTime = dateFormat.format(replyToTopicCalendar.time)
+        val replyToEntryDueTime = dateFormat.format(replyToEntryCalendar.time)
+        val assignmentDetailsReplyToTopicDueDate = assignmentDetailsDisplayFormat.format(replyToTopicCalendar.time)
+        val assignmentDetailsReplyToEntryDueDate = assignmentDetailsDisplayFormat.format(replyToEntryCalendar.time)
+        val monthFormat = SimpleDateFormat("MMM", Locale.US)
+        val dayOfWeekFormat = SimpleDateFormat("EEE", Locale.US)
+        val dayFormat = SimpleDateFormat("d", Locale.US)
+        val dueTimeDisplayFormat = SimpleDateFormat("h:mm a", Locale.US)
+        val replyToTopicMonth = monthFormat.format(replyToTopicCalendar.time)
+        val replyToTopicDayOfWeek = dayOfWeekFormat.format(replyToTopicCalendar.time)
+        val replyToTopicDay = dayFormat.format(replyToTopicCalendar.time)
+        val replyToEntryMonth = monthFormat.format(replyToEntryCalendar.time)
+        val replyToEntryDayOfWeek = dayOfWeekFormat.format(replyToEntryCalendar.time)
+        val replyToEntryDay = dayFormat.format(replyToEntryCalendar.time)
+        val replyToTopicDueTimeDisplay = dueTimeDisplayFormat.format(replyToTopicCalendar.time)
+        val replyToEntryDueTimeDisplay = dueTimeDisplayFormat.format(replyToEntryCalendar.time)
+
+        Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints for '${course.name}' course.")
+        DiscussionTopicsApi.createDiscussionTopicWithCheckpoints(course.id, teacher.token, discussionWithCheckpointsTitle, assignmentName, replyToTopicDueTime, replyToEntryDueTime)
+
+        Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+        tokenLogin(student)
+
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered.")
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Click on the 'To Do' bottom menu to navigate to the To Do list page.")
+        dashboardPage.clickTodoTab()
+
+        Log.d(ASSERTION_TAG, "Assert that both checkpoints for the '$discussionWithCheckpointsTitle' discussion are displayed on the To Do List Page with the correct titles and due dates.")
+        retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = {
+            Log.d(STEP_TAG, "If some of the checkpoints won't displayed at start, open the To-do Filter Page as they're probably 'out of range' of the filter interval.")
+            toDoListPage.clickFilterButton()
+
+            Log.d(STEP_TAG, "Change the 'Show tasks until' filter to 'In Four Weeks' option and click on 'Done' button.")
+            toDoFilterPage.selectShowTasksUntilOption(R.string.todoFilterInFourWeeks)
+            toDoFilterPage.clickDone()
+        }) {
+            toDoListPage.assertDiscussionCheckpointItemDisplayed(discussionWithCheckpointsTitle, "Reply to topic")
+            toDoListPage.assertDiscussionCheckpointItemDisplayed(discussionWithCheckpointsTitle, "Additional replies (2)")
+        }
+
+        toDoListPage.assertItemDateDay(discussionWithCheckpointsTitle, replyToTopicMonth, replyToTopicDayOfWeek, replyToTopicDay)
+        toDoListPage.assertItemDateDay(discussionWithCheckpointsTitle, replyToEntryMonth, replyToEntryDayOfWeek, replyToEntryDay)
+        toDoListPage.assertItemDueTime(discussionWithCheckpointsTitle, "Reply to topic", replyToTopicDueTimeDisplay)
+        toDoListPage.assertItemDueTime(discussionWithCheckpointsTitle, "Additional replies (2)", replyToEntryDueTimeDisplay)
+
+        Log.d(STEP_TAG, "Click on the '$discussionWithCheckpointsTitle' discussion's 'Reply to topic' checkpoint To Do item to open it's details.")
+        toDoListPage.clickOnItem(discussionWithCheckpointsTitle, "Reply to topic")
+
+        Log.d(ASSERTION_TAG, "Assert that the Assignment Details Page is displayed properly with the correct toolbar title and subtitle.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertDisplayToolbarSubtitle(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the checkpoints are displayed properly on the Assignment Details Page.")
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", assignmentDetailsReplyToTopicDueDate)
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due", assignmentDetailsReplyToEntryDueDate)
+
+        Log.d(STEP_TAG, "Navigate back to To Do list Page.")
+        Espresso.pressBack()
+
+        Log.d(STEP_TAG, "Click on the '$discussionWithCheckpointsTitle' discussion's 'Additional replies' checkpoint To Do item to open it's details.")
+        toDoListPage.clickOnItem(discussionWithCheckpointsTitle, "Additional replies (2)")
+
+        Log.d(ASSERTION_TAG, "Assert that the Assignment Details Page is displayed properly with the correct toolbar title and subtitle.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertDisplayToolbarSubtitle(course.name)
+
+        Log.d(ASSERTION_TAG, "Assert that the checkpoints are displayed properly on the Assignment Details Page.")
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Reply to topic due", assignmentDetailsReplyToTopicDueDate)
+        assignmentDetailsPage.assertDiscussionCheckpointDetailsOnDetailsPage("Additional replies (2) due", assignmentDetailsReplyToEntryDueDate)
+    }
 }
\ No newline at end of file
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineAnnouncementsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineAnnouncementsE2ETest.kt
index fa6e4c2775..adfa998225 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineAnnouncementsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineAnnouncementsE2ETest.kt
@@ -16,8 +16,11 @@
  */
 package com.instructure.student.ui.e2e.classic.offline
 
+import android.os.SystemClock
 import android.util.Log
+import androidx.media3.ui.R
 import androidx.test.espresso.Espresso
+import androidx.test.platform.app.InstrumentationRegistry
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -26,7 +29,8 @@ import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.OfflineE2E
 import com.instructure.canvas.espresso.refresh
 import com.instructure.dataseeding.api.DiscussionTopicsApi
-import com.instructure.student.ui.utils.StudentTest
+import com.instructure.espresso.getVideoPosition
+import com.instructure.student.ui.utils.StudentComposeTest
 import com.instructure.student.ui.utils.extensions.seedData
 import com.instructure.student.ui.utils.extensions.tokenLogin
 import com.instructure.student.ui.utils.offline.OfflineTestUtils
@@ -36,7 +40,7 @@ import org.junit.Test
 import java.lang.Thread.sleep
 
 @HiltAndroidTest
-class OfflineAnnouncementsE2ETest : StudentTest() {
+class OfflineAnnouncementsE2ETest : StudentComposeTest() {
 
     override fun displaysPageObjects() = Unit
 
@@ -156,6 +160,106 @@ class OfflineAnnouncementsE2ETest : StudentTest() {
         announcementListPage.assertTopicDisplayed(announcement.title)
       }
 
+    @OfflineE2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ANNOUNCEMENTS, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE)
+    fun testOfflineAnnouncementWithVideoAttachmentE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        Log.d(PREPARATION_TAG, "Read video file from assets.")
+        val videoFileName = "test_video.mp4"
+        val context = InstrumentationRegistry.getInstrumentation().context
+        val videoBytes = context.assets.open(videoFileName).use { it.readBytes() }
+
+        Log.d(PREPARATION_TAG, "Seed an announcement with video attachment for '${course.name}' course.")
+        val announcementTitle = "Announcement with Video Attachment"
+        val announcementWithVideo = DiscussionTopicsApi.createAnnouncement(courseId = course.id, token = teacher.token, announcementTitle = announcementTitle, fileBytes = videoBytes, fileName = videoFileName)
+
+        Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+        tokenLogin(student)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.")
+        dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content")
+
+        Log.d(STEP_TAG, "Expand '${course.name}' course.")
+        manageOfflineContentPage.expandCollapseItem(course.name)
+
+        Log.d(STEP_TAG, "Select the 'Announcements' of '${course.name}' course for sync. Click on the 'Sync' button.")
+        manageOfflineContentPage.changeItemSelectionState("Announcements")
+        manageOfflineContentPage.clickOnSyncButtonAndConfirm()
+
+        Log.d(ASSERTION_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.")
+        dashboardPage.assertCourseOfflineSyncIconVisible(course.name)
+        device.waitForIdle()
+
+        Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.")
+        turnOffConnectionViaADB()
+        OfflineTestUtils.waitForNetworkToGoOffline(device)
+
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.")
+        dashboardPage.waitForRender()
+        refresh()
+
+        Log.d(ASSERTION_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.")
+        OfflineTestUtils.assertOfflineIndicator()
+
+        Log.d(STEP_TAG, "Select '${course.name}' course and navigate to Announcements page.")
+        dashboardPage.selectCourse(course)
+        courseBrowserPage.selectAnnouncements()
+
+        Log.d(ASSERTION_TAG, "Assert that '${announcementWithVideo.title}' announcement is displayed.")
+        announcementListPage.assertTopicDisplayed(announcementWithVideo.title)
+
+        Log.d(STEP_TAG, "Select '${announcementWithVideo.title}' announcement.")
+        announcementListPage.selectTopic(announcementWithVideo.title)
+
+        Log.d(ASSERTION_TAG, "Assert that we are on the Discussion Details Page with the correct title.")
+        nativeDiscussionDetailsPage.assertTitleText(announcementWithVideo.title)
+
+        Log.d(ASSERTION_TAG, "Assert that the attachment icon is displayed on the announcement details page.")
+        nativeDiscussionDetailsPage.assertMainAttachmentDisplayed()
+
+        Log.d(STEP_TAG, "Click on the attachment icon to view the video attachment.")
+        nativeDiscussionDetailsPage.clickAttachmentIcon()
+
+        Log.d(ASSERTION_TAG, "Wait for the video to start and assert that the video player controls are displayed.")
+        videoPlayerPage.waitForVideoToStart(device)
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        val firstVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        SystemClock.sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        val secondVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+
+        Log.d(STEP_TAG, "Navigate back to the announcement details page.")
+        Espresso.pressBack()
+
+        Log.d(ASSERTION_TAG, "Assert that we are back on the announcement details page.")
+        nativeDiscussionDetailsPage.assertTitleText(announcementWithVideo.title)
+    }
+
     @After
     fun tearDown() {
         Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.")
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineDiscussionsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineDiscussionsE2ETest.kt
index e867c439de..0242c70521 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineDiscussionsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/offline/OfflineDiscussionsE2ETest.kt
@@ -18,6 +18,7 @@ package com.instructure.student.ui.e2e.classic.offline
 
 import android.util.Log
 import androidx.test.espresso.Espresso
+import androidx.test.platform.app.InstrumentationRegistry
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -28,9 +29,13 @@ import com.instructure.canvas.espresso.checkToastText
 import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.canvas.espresso.refresh
 import com.instructure.dataseeding.api.DiscussionTopicsApi
+import com.instructure.dataseeding.api.FileFolderApi
+import com.instructure.dataseeding.api.FileUploadsApi
+import com.instructure.dataseeding.model.FileUploadType
+import com.instructure.espresso.convertIso8601ToCanvasFormat
 import com.instructure.espresso.getDateInCanvasFormat
 import com.instructure.student.R
-import com.instructure.student.ui.utils.StudentTest
+import com.instructure.student.ui.utils.StudentComposeTest
 import com.instructure.student.ui.utils.extensions.openOverflowMenu
 import com.instructure.student.ui.utils.extensions.seedData
 import com.instructure.student.ui.utils.extensions.tokenLogin
@@ -40,7 +45,7 @@ import org.junit.After
 import org.junit.Test
 
 @HiltAndroidTest
-class OfflineDiscussionsE2ETest : StudentTest() {
+class OfflineDiscussionsE2ETest : StudentComposeTest() {
 
     override fun displaysPageObjects() = Unit
 
@@ -189,6 +194,121 @@ class OfflineDiscussionsE2ETest : StudentTest() {
         checkToastText(R.string.notAvailableOffline, activityRule.activity)
     }
 
+    @OfflineE2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.OFFLINE_MODE)
+    fun testOfflineDiscussionCheckpointWithPdfAttachmentE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        Log.d(PREPARATION_TAG, "Get course root folder to upload the PDF file.")
+        val courseRootFolder = FileFolderApi.getCourseRootFolder(course.id, teacher.token)
+
+        Log.d(PREPARATION_TAG, "Read PDF file from assets.")
+        val pdfFileName = "samplepdf.pdf"
+        val context = InstrumentationRegistry.getInstrumentation().context
+        val inputStream = context.assets.open(pdfFileName)
+        val pdfBytes = inputStream.readBytes()
+        inputStream.close()
+
+        Log.d(PREPARATION_TAG, "Upload PDF file to course root folder using teacher token.")
+        val uploadedFile = FileUploadsApi.uploadFile(courseId = courseRootFolder.id, assignmentId = null, file = pdfBytes, fileName = pdfFileName, token = teacher.token, fileUploadType = FileUploadType.COURSE_FILE)
+
+        Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints and PDF attachment for '${course.name}' course.")
+        val discussionWithCheckpointsTitle = "Discussion with PDF Attachment"
+        val assignmentName = "Assignment with Checkpoints and PDF"
+        val replyToTopicDueDate = "2029-11-12T22:59:00Z"
+        val replyToEntryDueDate = "2029-11-19T22:59:00Z"
+        DiscussionTopicsApi.createDiscussionTopicWithCheckpoints(courseId = course.id, token = teacher.token, discussionTitle = discussionWithCheckpointsTitle, assignmentName = assignmentName, replyToTopicDueDate = replyToTopicDueDate, replyToEntryDueDate = replyToEntryDueDate, fileId = uploadedFile.id.toString())
+
+        val convertedReplyToTopicDueDate = "Due " + convertIso8601ToCanvasFormat("2029-11-12T22:59:00Z") + " 2:59 PM"
+        val convertedReplyToEntryDueDate = "Due " + convertIso8601ToCanvasFormat("2029-11-19T22:59:00Z") + " 2:59 PM"
+
+        Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+        tokenLogin(student)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open the '${course.name}' course's 'Manage Offline Content' page via the more menu of the Dashboard Page.")
+        dashboardPage.clickCourseOverflowMenu(course.name, "Manage Offline Content")
+
+        Log.d(STEP_TAG, "Expand '${course.name}' course.")
+        manageOfflineContentPage.expandCollapseItem(course.name)
+
+        Log.d(STEP_TAG, "Select the 'Assignments' and 'Discussions' of '${course.name}' course for sync. Click on the 'Sync' button.")
+        manageOfflineContentPage.changeItemSelectionState("Assignments")
+        manageOfflineContentPage.changeItemSelectionState("Discussions")
+        manageOfflineContentPage.clickOnSyncButtonAndConfirm()
+
+        Log.d(ASSERTION_TAG, "Assert that the offline sync icon only displayed on the synced course's course card.")
+        dashboardPage.assertCourseOfflineSyncIconVisible(course.name)
+        device.waitForIdle()
+
+        Log.d(PREPARATION_TAG, "Turn off the Wi-Fi and Mobile Data on the device, so it will go offline.")
+        turnOffConnectionViaADB()
+        OfflineTestUtils.waitForNetworkToGoOffline(device)
+
+        Log.d(STEP_TAG, "Wait for the Dashboard Page to be rendered. Refresh the page.")
+        dashboardPage.waitForRender()
+        refresh()
+
+        Log.d(ASSERTION_TAG, "Assert that the Offline Indicator (bottom banner) is displayed on the Dashboard Page.")
+        OfflineTestUtils.assertOfflineIndicator()
+
+        Log.d(STEP_TAG, "Select course: '${course.name}' and navigate to Assignments Page.")
+        dashboardPage.selectCourse(course)
+        courseBrowserPage.selectAssignments()
+
+        Log.d(ASSERTION_TAG, "Assert that the '${discussionWithCheckpointsTitle}' discussion is present along with 2 date info (for the 2 checkpoints).")
+        assignmentListPage.assertHasAssignmentWithCheckpoints(discussionWithCheckpointsTitle, dueAtString = convertedReplyToTopicDueDate, dueAtStringSecondCheckpoint = convertedReplyToEntryDueDate, expectedGrade = "-/15")
+
+        Log.d(STEP_TAG, "Click on '$discussionWithCheckpointsTitle' assignment.")
+        assignmentListPage.clickAssignment(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that Assignment Details Page is displayed with correct title.")
+        assignmentDetailsPage.assertDisplayToolbarTitle()
+        assignmentDetailsPage.assertAssignmentTitle(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that attachment icon is displayed.")
+        assignmentDetailsPage.assertAttachmentIconDisplayed()
+
+        Log.d(STEP_TAG, "Click on attachment icon to attempt to view the PDF attachment while offline.")
+        assignmentDetailsPage.clickAttachmentIcon()
+
+        Log.d(ASSERTION_TAG, "Verify PDF viewer toolbar is displayed.")
+        assignmentDetailsPage.assertPdfViewerToolbarDisplayed()
+
+        Log.d(STEP_TAG, "Navigate back from PDF viewer to Assignment Details page.")
+        Espresso.pressBack()
+
+        Log.d(ASSERTION_TAG, "Assert that we're back on the Assignment Details page.")
+        assignmentDetailsPage.assertAssignmentTitle(discussionWithCheckpointsTitle)
+
+        Log.d(STEP_TAG, "Click on 'View Discussion' button to navigate to the Discussion Details page.")
+        assignmentDetailsPage.clickSubmit()
+
+        Log.d(ASSERTION_TAG, "Assert that the Discussion Details page is displayed with the correct title.")
+        nativeDiscussionDetailsPage.assertTitleText(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that the attachment icon is displayed on the Discussion Details page.")
+        nativeDiscussionDetailsPage.assertMainAttachmentDisplayed()
+
+        Log.d(STEP_TAG, "Click on the attachment icon to view the PDF attachment from the Discussion Details page.")
+        nativeDiscussionDetailsPage.clickAttachmentIcon()
+
+        Log.d(ASSERTION_TAG, "Verify PDF viewer toolbar is displayed.")
+        assignmentDetailsPage.assertPdfViewerToolbarDisplayed()
+
+        Log.d(STEP_TAG, "Navigate back from PDF viewer to Discussion Details page.")
+        Espresso.pressBack()
+
+        Log.d(ASSERTION_TAG, "Assert that we're back on the Discussion Details page.")
+        nativeDiscussionDetailsPage.assertTitleText(discussionWithCheckpointsTitle)
+    }
+
     @After
     fun tearDown() {
         Log.d(PREPARATION_TAG, "Turn back on the Wi-Fi and Mobile Data on the device, so it will come back online.")
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/AssignmentsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/AssignmentsE2ETest.kt
index 160b018426..3d8408657c 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/AssignmentsE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/AssignmentsE2ETest.kt
@@ -20,6 +20,7 @@ import android.os.SystemClock.sleep
 import android.util.Log
 import android.view.KeyEvent
 import androidx.test.espresso.Espresso
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
@@ -33,6 +34,7 @@ import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.dataseeding.api.AssignmentGroupsApi
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.CoursesApi
+import com.instructure.dataseeding.api.FileUploadsApi
 import com.instructure.dataseeding.api.SubmissionsApi
 import com.instructure.dataseeding.model.FileUploadType
 import com.instructure.dataseeding.model.GradingType
@@ -41,6 +43,7 @@ import com.instructure.dataseeding.util.ago
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
+import com.instructure.espresso.getVideoPosition
 import com.instructure.espresso.retryWithIncreasingDelay
 import com.instructure.espresso.triggerWorkManagerJobs
 import com.instructure.pandautils.utils.toFormattedString
@@ -55,6 +58,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runners.MethodSorters
 import java.util.Calendar
+import androidx.media3.ui.R as Media3R
 
 @HiltAndroidTest
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -873,6 +877,43 @@ class AssignmentsE2ETest: StudentComposeTest() {
             submissionDetailsPage.assertVideoCommentDisplayed()
         }
 
+        Log.d(STEP_TAG, "Click on the video comment to open it.")
+        submissionDetailsPage.clickVideoComment()
+
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
+
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        val firstVideoPositionText = getVideoPosition(Media3R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        val secondVideoPositionText = getVideoPosition(Media3R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+
+        Log.d(STEP_TAG, "Navigate back to submission comments.")
+        Espresso.pressBack()
+
         Log.d(STEP_TAG, "Send an audio comment.")
         submissionDetailsPage.addAndSendAudioComment()
 
@@ -881,6 +922,44 @@ class AssignmentsE2ETest: StudentComposeTest() {
             triggerWorkManagerJobs("SubmissionWorker")
             submissionDetailsPage.assertAudioCommentDisplayed()
         }
+
+        Log.d(STEP_TAG, "Click on the audio comment to open it.")
+        submissionDetailsPage.clickAudioComment()
+
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
+
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the audio.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current audio position.")
+        val firstAudioPositionText = getVideoPosition(Media3R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First audio position: $firstAudioPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume audio playback, wait for audio to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the audio position again.")
+        val secondAudioPositionText = getVideoPosition(Media3R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second audio position: $secondAudioPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the audio position has changed, confirming audio is playing.")
+        assert(firstAudioPositionText != secondAudioPositionText) {
+            "Audio position did not change. First: $firstAudioPositionText, Second: $secondAudioPositionText"
+        }
+
+        Log.d(STEP_TAG, "Navigate back to submission comments and assert that the audio comment still displayed.")
+        Espresso.pressBack()
+        submissionDetailsPage.assertAudioCommentDisplayed()
     }
 
     @E2E
@@ -1280,6 +1359,101 @@ class AssignmentsE2ETest: StudentComposeTest() {
         dashboardPage.assertCourseGrade(course.name, "49.47%")
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.E2E)
+    fun testVideoFileUploadSubmissionE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(teachers = 1, courses = 1, students = 1)
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        Log.d(PREPARATION_TAG, "Seeding 'File Upload' assignment for '${course.name}' course.")
+        val videoUploadAssignment = AssignmentsApi.createAssignment(
+            courseId = course.id,
+            teacherToken = teacher.token,
+            gradingType = GradingType.POINTS,
+            pointsPossible = 15.0,
+            dueAt = 1.days.fromNow.iso8601,
+            submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD)
+        )
+
+        Log.d(PREPARATION_TAG, "Upload the mp4 file from assets as an assignment submission file.")
+        val videoFileName = "test_video.mp4"
+        val videoFileBytes = InstrumentationRegistry.getInstrumentation().context.assets.open(videoFileName).readBytes()
+        val uploadInfo = FileUploadsApi.uploadFile(
+            courseId = course.id,
+            assignmentId = videoUploadAssignment.id,
+            file = videoFileBytes,
+            fileName = videoFileName,
+            token = student.token,
+            fileUploadType = FileUploadType.ASSIGNMENT_SUBMISSION
+        )
+
+        Log.d(PREPARATION_TAG, "Submit '${videoUploadAssignment.name}' assignment for '${student.name}' student with the uploaded mp4 file.")
+        SubmissionsApi.submitCourseAssignment(course.id, student.token, videoUploadAssignment.id, SubmissionType.ONLINE_UPLOAD, fileIds = mutableListOf(uploadInfo.id))
+
+        Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
+        tokenLogin(student)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Select '${course.name}' course and navigate to its Assignments Page.")
+        dashboardPage.selectCourse(course)
+        courseBrowserPage.selectAssignments()
+
+        Log.d(ASSERTION_TAG, "Assert that '${videoUploadAssignment.name}' assignment is displayed.")
+        assignmentListPage.assertHasAssignment(videoUploadAssignment)
+
+        Log.d(STEP_TAG, "Click on '${videoUploadAssignment.name}' assignment.")
+        assignmentListPage.clickAssignment(videoUploadAssignment)
+
+        Log.d(ASSERTION_TAG, "Assert that the assignment has been submitted.")
+        assignmentDetailsPage.assertAssignmentSubmittedStatus()
+
+        Log.d(STEP_TAG, "Navigate to submission details and open Files Tab.")
+        assignmentDetailsPage.goToSubmissionDetails()
+        submissionDetailsPage.openFiles()
+
+        Log.d(ASSERTION_TAG, "Assert that '$videoFileName' file has been displayed in the Files tab.")
+        submissionDetailsPage.assertFileDisplayed(videoFileName)
+
+        Log.d(STEP_TAG, "Collapse the sliding panel to show the video player.")
+        submissionDetailsPage.collapseSlidingPanel()
+
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
+
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        val firstVideoPositionText = getVideoPosition(Media3R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        val secondVideoPositionText = getVideoPosition(Media3R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+    }
+
     @E2E
     @Test
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.E2E)
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt
index a7ede1d4cb..3413e11d85 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt
@@ -154,12 +154,12 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the page title is 'Calendar'.")
         calendarScreenPage.assertCalendarPageTitle()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo Title"
         val testTodoDescription = "Details of ToDo"
@@ -169,26 +169,26 @@ class CalendarE2ETest : StudentComposeTest() {
         calendarToDoCreateUpdatePage.clickSave()
 
         val currentDate = getDateInCanvasCalendarFormat()
-        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously created To Do item is displayed with the corresponding title, context and date.")
-        calendarScreenPage.assertItemDetails(testTodoTitle, "To Do", "$currentDate at 12:00 PM")
+        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously created To-do item is displayed with the corresponding title, context and date.")
+        calendarScreenPage.assertItemDetails(testTodoTitle, "To-do", "$currentDate at 12:00 PM")
 
-        Log.d(STEP_TAG, "Clicks on the '$testTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Clicks on the '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle', the context is 'To Do', the date is the current day with 12:00 PM time and the description is '$testTodoDescription'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle', the context is 'To-do', the date is the current day with 12:00 PM time and the description is '$testTodoDescription'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
         calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
         calendarToDoDetailsPage.assertDescription(testTodoDescription)
 
-        Log.d(STEP_TAG, "Click on the 'Edit To Do' within the toolbar more menu and confirm the editing.")
+        Log.d(STEP_TAG, "Click on the 'Edit To-do' within the toolbar more menu and confirm the editing.")
         calendarToDoDetailsPage.clickToolbarMenu()
         calendarToDoDetailsPage.clickEditMenu()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'Edit To Do' as we are editing an existing To Do item.")
-        calendarToDoCreateUpdatePage.assertPageTitle("Edit To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'Edit To-do' as we are editing an existing To-do item.")
+        calendarToDoCreateUpdatePage.assertPageTitle("Edit To-do")
 
-        Log.d(ASSERTION_TAG, "Assert that the 'original' To Do Title and details has been filled into the input fields as we on the edit screen.")
+        Log.d(ASSERTION_TAG, "Assert that the 'original' To-do Title and details has been filled into the input fields as we on the edit screen.")
         calendarToDoCreateUpdatePage.assertTodoTitle(testTodoTitle)
         calendarToDoCreateUpdatePage.assertDetails(testTodoDescription)
 
@@ -199,19 +199,19 @@ class CalendarE2ETest : StudentComposeTest() {
         calendarToDoCreateUpdatePage.typeDetails(modifiedTestTodoDescription)
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously modified To Do item is displayed with the corresponding title, context and with the same date as we haven't changed it.")
-        calendarScreenPage.assertItemDetails(modifiedTestTodoTitle, "To Do", "$currentDate at 12:00 PM")
+        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously modified To-do item is displayed with the corresponding title, context and with the same date as we haven't changed it.")
+        calendarScreenPage.assertItemDetails(modifiedTestTodoTitle, "To-do", "$currentDate at 12:00 PM")
 
-        Log.d(STEP_TAG, "Clicks on the '$modifiedTestTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Clicks on the '$modifiedTestTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(modifiedTestTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do title is '$modifiedTestTodoTitle', the page title is 'To Do', the date remained current day with 12:00 PM time (as we haven't modified it) and the description is '$modifiedTestTodoDescription'.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do title is '$modifiedTestTodoTitle', the page title is 'To-do', the date remained current day with 12:00 PM time (as we haven't modified it) and the description is '$modifiedTestTodoDescription'.")
         calendarToDoDetailsPage.assertTitle(modifiedTestTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
         calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
         calendarToDoDetailsPage.assertDescription(modifiedTestTodoDescription)
 
-        Log.d(STEP_TAG, "Click on the 'Delete To Do' within the toolbar more menu and confirm the deletion.")
+        Log.d(STEP_TAG, "Click on the 'Delete To-do' within the toolbar more menu and confirm the deletion.")
         calendarToDoDetailsPage.clickToolbarMenu()
         calendarToDoDetailsPage.clickDeleteMenu()
         calendarToDoDetailsPage.confirmDeletion()
@@ -219,7 +219,7 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the deleted item does not exist anymore on the Calendar Screen Page.")
         calendarScreenPage.assertItemNotExist(modifiedTestTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any To Do items on the current day.")
+        Log.d(ASSERTION_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any To-do items on the current day.")
         calendarScreenPage.assertEmptyView()
     }
 
@@ -269,12 +269,12 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the event is displayed with the corresponding details (title, context name, date, status) on the page.")
         calendarScreenPage.assertItemDetails(newEventTitle, student.name, currentDate)
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo Title"
         val testTodoDescription = "Details of ToDo"
@@ -290,7 +290,7 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To Do item is displayed because we created it to this particular day. Assert that '$newEventTitle' calendar event is not displayed because it's created for today.")
+        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To-do item is displayed because we created it to this particular day. Assert that '$newEventTitle' calendar event is not displayed because it's created for today.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
         calendarScreenPage.assertItemNotExist(newEventTitle)
 
@@ -301,7 +301,7 @@ class CalendarE2ETest : StudentComposeTest() {
         calendarFilterPage.clickOnFilterItem(course.name)
         calendarFilterPage.closeFilterPage()
 
-        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To Do item is not displayed because we filtered out from the calendar. " +
+        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To-do item is not displayed because we filtered out from the calendar. " +
                 "Assert that the empty view is displayed because there are no items for today.")
         calendarScreenPage.assertItemNotExist(testTodoTitle)
         calendarScreenPage.assertEmptyView()
@@ -588,12 +588,12 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the page title is 'Calendar'.")
         calendarScreenPage.assertCalendarPageTitle()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo With Reminder"
         val testTodoDescription = "Details of ToDo"
@@ -608,15 +608,15 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
 
-        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To Do'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To-do'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
 
         Log.d(ASSERTION_TAG, "Assert that the reminder section is displayed.")
         calendarToDoDetailsPage.assertReminderSectionDisplayed()
@@ -630,7 +630,7 @@ class CalendarE2ETest : StudentComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneHour)
         calendarToDoDetailsPage.selectTime(reminderDateOneHour)
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneHour.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -660,7 +660,7 @@ class CalendarE2ETest : StudentComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneWeek)
         calendarToDoDetailsPage.selectTime(reminderDateOneWeek)
 
-        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To Do which is due in 2 days).")
+        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To-do which is due in 2 days).")
         calendarToDoDetailsPage.assertReminderNotDisplayedWithText(reminderDateOneWeek.time.toFormattedString())
         checkToastText(R.string.reminderInPast, activityRule.activity)
         futureDate.apply { add(Calendar.WEEK_OF_YEAR, 1) }
@@ -674,7 +674,7 @@ class CalendarE2ETest : StudentComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneDay)
         calendarToDoDetailsPage.selectTime(reminderDateOneDay)
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneDay.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -692,7 +692,7 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Navigate back to Calendar Screen Page.")
         Espresso.pressBack()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
     }
 
@@ -719,12 +719,12 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the page title is 'Calendar'.")
         calendarScreenPage.assertCalendarPageTitle()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo With Reminder"
         val testTodoDescription = "Details of ToDo"
@@ -739,15 +739,15 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
 
-        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To Do'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To-do'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
 
         Log.d(ASSERTION_TAG, "Assert that the reminder section is displayed.")
         calendarToDoDetailsPage.assertReminderSectionDisplayed()
@@ -759,7 +759,7 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Select '1 Hour Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Hour Before")
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneHour.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -785,7 +785,7 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Select '1 Week Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Week Before")
 
-        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To Do which is due in 2 days).")
+        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To-do which is due in 2 days).")
         calendarToDoDetailsPage.assertReminderNotDisplayedWithText(reminderDateOneWeek.time.toFormattedString())
         checkToastText(R.string.reminderInPast, activityRule.activity)
         futureDate.apply { add(Calendar.WEEK_OF_YEAR, 1) }
@@ -797,7 +797,7 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Select '1 Day Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Day Before")
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneDay.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -813,7 +813,7 @@ class CalendarE2ETest : StudentComposeTest() {
         Log.d(STEP_TAG, "Navigate back to Calendar Screen Page.")
         Espresso.pressBack()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
     }
 
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/InboxE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/InboxE2ETest.kt
index 01918ff762..1f9626a536 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/InboxE2ETest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/InboxE2ETest.kt
@@ -14,7 +14,6 @@
  *     limitations under the License.
  *
  */
-
 package com.instructure.student.ui.e2e.compose
 
 import android.os.Environment
@@ -718,27 +717,26 @@ class InboxE2ETest: StudentComposeTest() {
         Log.d(STEP_TAG, "Click on the attachment to verify it can be opened.")
         inboxDetailsPage.clickAttachment(videoFileName)
 
-        Log.d(ASSERTION_TAG, "Wait for video to load and assert that the media play button is visible.")
-        inboxDetailsPage.assertPlayButtonDisplayed()
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
 
-        Log.d(STEP_TAG, "Click the play button to start the video and on the screen to show media controls.")
-        inboxDetailsPage.clickPlayButton()
-        inboxDetailsPage.clickScreenCenterToShowControls(device)
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
 
         Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
-        inboxDetailsPage.assertPlayPauseButtonDisplayed()
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
 
         Log.d(STEP_TAG, "Click play/pause button to pause the video.")
-        inboxDetailsPage.clickPlayPauseButton()
+        videoPlayerPage.clickPlayPauseButton()
 
         Log.d(STEP_TAG, "Get the current video position.")
         val firstPositionText = getVideoPosition(R.id.exo_position)
-        Log.d(ASSERTION_TAG, "First position: $firstPositionText")
 
         Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
-        inboxDetailsPage.clickPlayPauseButton()
+        videoPlayerPage.clickPlayPauseButton()
         sleep(2000)
-        inboxDetailsPage.clickPlayPauseButton()
+        videoPlayerPage.clickPlayPauseButton()
 
         Log.d(STEP_TAG, "Get the video position again.")
         val secondPositionText = getVideoPosition(R.id.exo_position)
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt
index beafbbc822..0253e07c23 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/LoginInteractionTest.kt
@@ -19,7 +19,6 @@ import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
-import com.instructure.student.R
 import com.instructure.student.ui.utils.StudentTest
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
@@ -29,19 +28,6 @@ class LoginInteractionTest : StudentTest() {
 
     override fun displaysPageObjects() = Unit // Not used for interaction tests
 
-    @Test
-    @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION)
-    fun testLogin_canFindSchool() {
-        loginLandingPage.clickFindMySchoolButton()
-        loginFindSchoolPage.assertPageObjects()
-
-        if(isTabletDevice()) loginFindSchoolPage.assertHintText(R.string.schoolInstructureCom)
-        else loginFindSchoolPage.assertHintText(R.string.loginHint)
-
-        loginFindSchoolPage.enterDomain("harvest")
-        loginFindSchoolPage.assertSchoolSearchResults("City Harvest Church (Singapore)")
-    }
-
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.INTERACTION)
     fun testLogin_qrTutorialPageLoads() {
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt
index bcddb0dca6..af5bc3801f 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/interaction/ScheduleInteractionTest.kt
@@ -130,7 +130,7 @@ class ScheduleInteractionTest : StudentComposeTest() {
 
         goToScheduleTab(data)
         schedulePage.scrollToPosition(8)
-        schedulePage.assertCourseHeaderDisplayed(schedulePage.getStringFromResource(R.string.schedule_todo_title))
+        schedulePage.assertCourseHeaderDisplayed(schedulePage.getStringFromResource(R.string.schedule_todo_title_new))
         schedulePage.assertScheduleItemDisplayed(todo.plannable.title)
         schedulePage.assertScheduleItemDisplayed(todo2.plannable.title)
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/LeftSideNavigationDrawerPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/LeftSideNavigationDrawerPage.kt
index c4bf6517f3..70745237d8 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/LeftSideNavigationDrawerPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/LeftSideNavigationDrawerPage.kt
@@ -75,7 +75,8 @@ class LeftSideNavigationDrawerPage : BasePage() {
 
     fun logout() {
         onView(hamburgerButtonMatcher).click()
-        logoutButton.scrollTo().click()
+        onView(withId(R.id.navigationDrawer)).swipeUp() // Swipe up to ensure the logout button is visible (since edge-to-edge the android navigation bar overlaps with Logout button).
+        logoutButton.click()
         onViewWithText(android.R.string.ok).click()
         // It can potentially take a long time for the sign-out to take effect, especially on
         // slow FTL devices.  So let's pause for a bit until we see the canvas logo.
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/StudentAssignmentDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/StudentAssignmentDetailsPage.kt
index dba4b5084b..a84e6f8708 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/StudentAssignmentDetailsPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/StudentAssignmentDetailsPage.kt
@@ -69,6 +69,7 @@ class StudentAssignmentDetailsPage(moduleItemInteractions: ModuleItemInteraction
 
     fun assertDiscussionCheckpointDetailsOnDetailsPage(checkpointText: String, dueAt: String)
     {
+        composeTestRule.waitForIdle()
         try {
             composeTestRule.onNode(hasText(dueAt) and hasAnyAncestor(hasTestTag("dueDateColumn-$checkpointText") and hasAnyDescendant(hasTestTag("dueDateHeaderText-$checkpointText")))).assertIsDisplayed()
         } catch (e: AssertionError) {
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/SubmissionDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/SubmissionDetailsPage.kt
index 48c7f51907..ca13645290 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/SubmissionDetailsPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/SubmissionDetailsPage.kt
@@ -16,7 +16,13 @@
  */
 package com.instructure.student.ui.pages.classic
 
+import android.view.View
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.CoordinatesProvider
+import androidx.test.espresso.action.GeneralLocation
+import androidx.test.espresso.action.GeneralSwipeAction
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Swipe
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -157,6 +163,13 @@ open class SubmissionDetailsPage : BasePage(R.id.submissionDetails) {
         submissionCommentsRenderPage.scrollAndAssertDisplayed(commentMatcher)
     }
 
+    /**
+     * Click on the video comment to open it
+     */
+    fun clickVideoComment() {
+        onView(allOf(withId(R.id.attachmentNameTextView), containsTextCaseInsensitive("video"))).click()
+    }
+
     /**
      * Assert that the comment stream contains an audio comment
      */
@@ -169,6 +182,13 @@ open class SubmissionDetailsPage : BasePage(R.id.submissionDetails) {
         submissionCommentsRenderPage.scrollAndAssertDisplayed(commentMatcher)
     }
 
+    /**
+     * Click on the audio comment to open it
+     */
+    fun clickAudioComment() {
+        onView(allOf(withId(R.id.attachmentNameTextView), containsTextCaseInsensitive("audio"))).click()
+    }
+
     /**
      * Assert that a comment is displayed
      * [fileName] is the name of the attached file
@@ -220,6 +240,25 @@ open class SubmissionDetailsPage : BasePage(R.id.submissionDetails) {
         onView(matcher).assertDisplayed()
     }
 
+    /* Grabs the current coordinates of the center of drawerTabLayout */
+    private val tabLayoutCoordinates = CoordinatesProvider { view ->
+        val tabs = view.findViewById<View>(R.id.drawerTabLayout)
+        val xy = IntArray(2).apply { tabs.getLocationOnScreen(this) }
+        val x = xy[0] + (tabs.width / 2f)
+        val y = xy[1] + (tabs.height / 2f)
+        floatArrayOf(x, y)
+    }
+
+    fun swipeDrawerTo(location: GeneralLocation) {
+        onView(withId(R.id.slidingUpPanelLayout)).perform(
+            GeneralSwipeAction(Swipe.FAST, tabLayoutCoordinates, location, Press.FINGER)
+        )
+    }
+
+    fun collapseSlidingPanel() {
+        swipeDrawerTo(GeneralLocation.BOTTOM_CENTER)
+    }
+
     fun addAndSendComment(comment: String) {
         submissionCommentsRenderPage.addAndSendComment(comment)
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/offline/NativeDiscussionDetailsPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/offline/NativeDiscussionDetailsPage.kt
index 073580ce53..ee17271db8 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/offline/NativeDiscussionDetailsPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/offline/NativeDiscussionDetailsPage.kt
@@ -278,7 +278,11 @@ class NativeDiscussionDetailsPage(val moduleItemInteractions: ModuleItemInteract
     }
 
     fun assertMainAttachmentDisplayed() {
-        onView(withId(R.id.attachmentIcon)).assertDisplayed()
+        onView(withId(R.id.attachmentIcon) + withAncestor(R.id.discussionDetailsPage)).assertDisplayed()
+    }
+
+    fun clickAttachmentIcon() {
+        onView(withId(R.id.attachmentIcon) + withAncestor(R.id.discussionDetailsPage)).click()
     }
 
     /**
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionCommentsRenderPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionCommentsRenderPage.kt
index c6ece490cc..bca33cea82 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionCommentsRenderPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionCommentsRenderPage.kt
@@ -153,7 +153,7 @@ class SubmissionCommentsRenderPage: BasePage(R.id.submissionCommentsPage) {
         clickOnAddAttachmentButton()
         onView(withId(R.id.videoComment)).click()
         onView(allOf(withId(R.id.startRecordingButton), isDisplayed())).click()
-        sleep(3000)
+        sleep(4000)
         onView(allOf(withId(R.id.endRecordingButton), isDisplayed())).click()
         onView(allOf(withId(R.id.sendButton), isDisplayed())).click()
     }
@@ -162,7 +162,7 @@ class SubmissionCommentsRenderPage: BasePage(R.id.submissionCommentsPage) {
         clickOnAddAttachmentButton()
         onView(withId(R.id.audioComment)).click()
         onView(allOf(withId(R.id.recordAudioButton), isDisplayed())).click()
-        sleep(3000)
+        sleep(4000)
         onView(allOf(withId(R.id.stopButton), isDisplayed())).click()
         onView(allOf(withId(R.id.sendAudioButton), isDisplayed())).click()
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionDetailsRenderPage.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionDetailsRenderPage.kt
index b07b53c8f7..d65406e6bf 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionDetailsRenderPage.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/rendertests/renderpages/SubmissionDetailsRenderPage.kt
@@ -18,11 +18,6 @@ package com.instructure.student.ui.rendertests.renderpages
 
 import android.view.View
 import androidx.test.espresso.Espresso.onData
-import androidx.test.espresso.action.CoordinatesProvider
-import androidx.test.espresso.action.GeneralLocation
-import androidx.test.espresso.action.GeneralSwipeAction
-import androidx.test.espresso.action.Press
-import androidx.test.espresso.action.Swipe
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.BoundedMatcher
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -59,17 +54,6 @@ class SubmissionDetailsRenderPage : SubmissionDetailsPage() {
     val slidingPanel by OnViewWithId(R.id.slidingUpPanelLayout)
     val versionSpinner by OnViewWithId(R.id.submissionVersionsSpinner)
 
-    /* Grabs the current coordinates of the center of drawerTabLayout */
-    private val tabLayoutCoordinates = object : CoordinatesProvider {
-        override fun calculateCoordinates(view: View): FloatArray {
-            val tabs = view.findViewById<View>(R.id.drawerTabLayout)
-            val xy = IntArray(2).apply { tabs.getLocationOnScreen(this) }
-            val x = xy[0] + (tabs.width / 2f)
-            val y = xy[1] + (tabs.height / 2f)
-            return floatArrayOf(x, y)
-        }
-    }
-
     fun assertDisplaysToolbarTitle(text: String) {
         onViewWithText(text).assertDisplayed()
     }
@@ -120,10 +104,6 @@ class SubmissionDetailsRenderPage : SubmissionDetailsPage() {
         onView(allOf(withAncestor(R.id.drawerTabLayout), withText(name))).click()
     }
 
-    fun swipeDrawerTo(location: GeneralLocation) {
-        slidingPanel.perform(GeneralSwipeAction(Swipe.FAST, tabLayoutCoordinates, location, Press.FINGER))
-    }
-
     fun assertSpinnerMatchesText(text: String) {
         onView(allOf(withId(R.id.attemptDate), withText(text))).assertDisplayed()
     }
diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt
index 4926c93072..50e9c884b0 100644
--- a/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt
+++ b/apps/student/src/androidTest/java/com/instructure/student/ui/utils/StudentComposeTest.kt
@@ -20,6 +20,7 @@ package com.instructure.student.ui.utils
 
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.instructure.canvas.espresso.common.pages.AssignmentReminderPage
+import com.instructure.canvas.espresso.common.pages.VideoPlayerPage
 import com.instructure.canvas.espresso.common.pages.compose.AssignmentListPage
 import com.instructure.canvas.espresso.common.pages.compose.CalendarEventCreateEditPage
 import com.instructure.canvas.espresso.common.pages.compose.CalendarEventDetailsPage
@@ -69,6 +70,7 @@ abstract class StudentComposeTest : StudentTest() {
     val inboxSignatureSettingsPage = InboxSignatureSettingsPage(composeTestRule)
     val toDoListPage = ToDoListPage(composeTestRule)
     val toDoFilterPage = ToDoFilterPage(composeTestRule)
+    val videoPlayerPage = VideoPlayerPage()
     val assignmentDetailsPage = StudentAssignmentDetailsPage(
         ModuleItemInteractions(
             R.id.moduleName,
diff --git a/apps/student/src/main/AndroidManifest.xml b/apps/student/src/main/AndroidManifest.xml
index af986c7a9d..eb4b93f739 100644
--- a/apps/student/src/main/AndroidManifest.xml
+++ b/apps/student/src/main/AndroidManifest.xml
@@ -75,6 +75,10 @@
         tools:replace="android:supportsRtl"
         tools:overrideLibrary="com.instructure.canvasapi">
 
+        <meta-data
+            android:name="nutrient_automatic_initialize"
+            android:value="false" />
+
         <activity android:name="sdk.pendo.io.activities.PendoGateActivity" android:launchMode="singleInstance" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -314,7 +318,7 @@
         <receiver
             android:name=".widget.todo.ToDoWidgetReceiver"
             android:exported="true"
-            android:label="@string/todoWidgetTitleLong">
+            android:label="@string/todoWidgetTitleLongNew">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
                 <action android:name="android.appwidget.action.APPWIDGET_ENABLED" />
diff --git a/apps/student/src/main/java/com/instructure/student/AnnotationComments/AnnotationCommentListFragment.kt b/apps/student/src/main/java/com/instructure/student/AnnotationComments/AnnotationCommentListFragment.kt
index e9eaaac3c0..bc92d70101 100644
--- a/apps/student/src/main/java/com/instructure/student/AnnotationComments/AnnotationCommentListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/AnnotationComments/AnnotationCommentListFragment.kt
@@ -15,6 +15,7 @@
  *
  */    package com.instructure.student.AnnotationComments
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -41,7 +42,23 @@ import com.instructure.interactions.router.Route
 import com.instructure.pandautils.analytics.SCREEN_VIEW_ANNOTATION_COMMENT_LIST
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ParcelableArrayListArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.hideKeyboard
+import com.instructure.pandautils.utils.onClickWithRequireNetwork
+import com.instructure.pandautils.utils.onTextChanged
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setInvisible
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsCloseButton
+import com.instructure.pandautils.utils.withArgs
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentAnnotationCommentListBinding
 import com.instructure.student.fragment.ParentFragment
@@ -49,7 +66,7 @@ import com.instructure.student.mobius.assignmentDetails.submissionDetails.conten
 import kotlinx.coroutines.Job
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
-import java.util.*
+import java.util.Locale
 
 @ScreenView(SCREEN_VIEW_ANNOTATION_COMMENT_LIST)
 class AnnotationCommentListFragment : ParentFragment() {
@@ -75,6 +92,7 @@ class AnnotationCommentListFragment : ParentFragment() {
         with (binding) {
             toolbar.title = title()
             toolbar.setupAsCloseButton(this@AnnotationCommentListFragment)
+            toolbar.applyTopSystemBarInsets()
             ViewStyler.themeToolbarLight(requireActivity(), toolbar)
         }
     }
@@ -111,6 +129,7 @@ class AnnotationCommentListFragment : ParentFragment() {
         configureRecyclerView()
         applyTheme()
         setupCommentInput()
+        setupWindowInsets()
 
         if(recyclerAdapter?.size() == 0) {
             recyclerAdapter?.addAll(annotations)
@@ -128,6 +147,11 @@ class AnnotationCommentListFragment : ParentFragment() {
                 assigneeId))
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ViewStyler.setStatusBarLightDelayed(requireActivity())
+    }
+
     fun configureRecyclerView() {
         val layoutManager = LinearLayoutManager(requireContext())
         layoutManager.orientation = RecyclerView.VERTICAL
@@ -156,6 +180,12 @@ class AnnotationCommentListFragment : ParentFragment() {
         }
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
+        annotationCommentsRecyclerView.applyImeAndSystemBarInsets()
+        commentInputContainer.applyImeAndSystemBarInsets()
+    }
+
     private fun showSendingStatus() = with(binding) {
         sendCommentButton.setInvisible()
         sendingProgressBar.setVisible()
diff --git a/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt
index f29384eb1f..12c30c2567 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/CandroidPSPDFActivity.kt
@@ -49,6 +49,8 @@ import com.pspdfkit.ui.toolbar.ContextualToolbar
 import com.pspdfkit.ui.toolbar.ContextualToolbarMenuItem
 import com.pspdfkit.ui.toolbar.ToolbarCoordinatorLayout
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import java.io.File
 import java.util.EnumSet
 import java.util.Locale
@@ -100,13 +102,15 @@ class CandroidPSPDFActivity : PdfActivity(), ToolbarCoordinatorLayout.OnContextu
     override fun onDestroy() {
         val path = filesDir.path + intent.data?.path?.replace("/files", "")
         document?.let {
-            val annotations = it.annotationProvider.getAllAnnotationsOfType(
-                EnumSet.allOf(AnnotationType::class.java)
-            )
-            if (annotations.isEmpty() && networkStateProvider.isOnline()) {
-                val file = File(path)
-                if (file.exists()) {
-                    file.delete()
+            GlobalScope.launch {
+                val annotations = it.annotationProvider.getAllAnnotationsOfType(
+                    EnumSet.allOf(AnnotationType::class.java)
+                )
+                if (annotations.isEmpty() && networkStateProvider.isOnline()) {
+                    val file = File(path)
+                    if (file.exists()) {
+                        file.delete()
+                    }
                 }
             }
         }
diff --git a/apps/student/src/main/java/com/instructure/student/activity/InternalWebViewActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/InternalWebViewActivity.kt
index f149a51e60..3f79362663 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/InternalWebViewActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/InternalWebViewActivity.kt
@@ -20,10 +20,13 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.CanvasContext.Companion.emptyCourseContext
 import com.instructure.pandautils.activities.BaseActionBarActivity
 import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.toast
@@ -35,7 +38,9 @@ import com.instructure.student.fragment.InternalWebviewFragment.Companion.newIns
 class InternalWebViewActivity : BaseActionBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         toolbar?.let { ViewStyler.themeToolbarLight(this, it) }
+        setupWindowInsets()
         if (savedInstanceState == null) {
             val bundle = intent.getBundleExtra(Const.EXTRAS)
             bundle?.getString(Const.ACTION_BAR_TITLE)?.let { toolbar?.title = it }
@@ -75,6 +80,70 @@ class InternalWebViewActivity : BaseActionBarActivity() {
         if (fragment?.handleBackPressed() != true) super.onBackPressed()
     }
 
+    private fun setupWindowInsets() {
+        val container = findViewById<android.view.View>(R.id.container)
+
+        // Setup toolbar insets - handle top (status bar) + horizontal (nav bars + display cutout) in one listener
+        toolbar?.let { toolbar ->
+            ViewCompat.setOnApplyWindowInsetsListener(toolbar) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+                val isLandscape = resources.configuration.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
+
+                if (isLandscape) {
+                    // In landscape, apply status bar at top and nav bars + display cutout horizontally
+                    val leftPadding = maxOf(systemBars.left, displayCutout.left)
+                    val rightPadding = maxOf(systemBars.right, displayCutout.right)
+
+                    view.setPadding(
+                        leftPadding,
+                        systemBars.top,
+                        rightPadding,
+                        0
+                    )
+                } else {
+                    // In portrait, apply status bar at top and display cutout horizontally
+                    view.setPadding(
+                        displayCutout.left,
+                        systemBars.top,
+                        displayCutout.right,
+                        0
+                    )
+                }
+                insets
+            }
+        }
+
+        // Setup container insets
+        ViewCompat.setOnApplyWindowInsetsListener(container) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+            val isLandscape = resources.configuration.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
+
+            if (isLandscape) {
+                // In landscape, apply navigation bars + display cutout horizontally and nav bar at bottom
+                val leftPadding = maxOf(navigationBars.left, displayCutout.left)
+                val rightPadding = maxOf(navigationBars.right, displayCutout.right)
+
+                view.setPadding(
+                    leftPadding,
+                    0,
+                    rightPadding,
+                    navigationBars.bottom
+                )
+            } else {
+                // In portrait, only apply display cutout insets horizontally
+                view.setPadding(
+                    displayCutout.left,
+                    0,
+                    displayCutout.right,
+                    0
+                )
+            }
+            insets
+        }
+    }
+
     private fun setActionBarStatusBarColor(color: Int) {
         val contentColor = resources?.getColor(R.color.textLightest) ?: Color.WHITE
         toolbar?.let {
diff --git a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt
index 4174d09dbb..8cfc85194f 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt
@@ -31,6 +31,7 @@ import android.view.ViewGroup
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.CompoundButton
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
@@ -41,8 +42,13 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.Insets
 import androidx.core.view.GravityCompat
 import androidx.core.view.MenuItemCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
@@ -103,7 +109,9 @@ import com.instructure.pandautils.room.offline.OfflineDatabase
 import com.instructure.pandautils.typeface.TypefaceBehavior
 import com.instructure.pandautils.update.UpdateManager
 import com.instructure.pandautils.utils.ActivityResult
+import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.LocaleUtils
 import com.instructure.pandautils.utils.NetworkStateProvider
 import com.instructure.pandautils.utils.OnActivityResults
@@ -126,6 +134,7 @@ import com.instructure.pandautils.utils.postSticky
 import com.instructure.pandautils.utils.setGone
 import com.instructure.pandautils.utils.setVisible
 import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.toPx
 import com.instructure.pandautils.utils.toast
 import com.instructure.student.R
 import com.instructure.student.databinding.ActivityNavigationBinding
@@ -137,12 +146,13 @@ import com.instructure.student.events.CourseColorOverlayToggledEvent
 import com.instructure.student.events.ShowConfettiEvent
 import com.instructure.student.events.ShowGradesToggledEvent
 import com.instructure.student.events.UserUpdatedEvent
+import com.instructure.student.features.dashboard.compose.NewDashboardFragment
 import com.instructure.student.features.files.list.FileListFragment
 import com.instructure.student.features.modules.progression.CourseModuleProgressionFragment
 import com.instructure.student.features.navigation.NavigationRepository
 import com.instructure.student.fragment.BookmarksFragment
-import com.instructure.student.fragment.OldDashboardFragment
 import com.instructure.student.fragment.NotificationListFragment
+import com.instructure.student.fragment.OldDashboardFragment
 import com.instructure.student.fragment.OldToDoListFragment
 import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadEffectHandler
 import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.emptySubmission.ui.SubmissionDetailsEmptyContentFragment
@@ -328,8 +338,10 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
              only one fragment on the backstack, which commonly occurs with non-root fragments when routing
              from external sources. */
             val visible = isBottomNavFragment(it) || supportFragmentManager.backStackEntryCount <= 1
-            binding.bottomBar.setVisible(visible)
+            binding.bottomBarContainer.setVisible(visible)
             binding.bottomBarDivider.setVisible(visible)
+            // Request insets reapplication when bottom bar visibility changes
+            ViewCompat.requestApplyInsets(binding.bottomBarContainer)
         }
     }
 
@@ -337,6 +349,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
         super.onResume()
         applyCurrentFragmentTheme()
         webViewAuthenticator.authenticateWebViews(lifecycleScope, this)
+        updateStatusBarAppearanceForDrawer()
     }
 
     private fun checkAppUpdates() {
@@ -362,12 +375,16 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         RouteMatcher.offlineDb = offlineDatabase
         RouteMatcher.networkStateProvider = networkStateProvider
         RouteMatcher.enabledTabs = enabledCourseTabs
         navigationDrawerBinding = NavigationDrawerBinding.bind(binding.root)
         canvasLoadingBinding = LoadingCanvasViewBinding.bind(binding.root)
         setContentView(binding.root)
+
+        setupWindowInsets()
+
         val masqueradingUserId: Long = intent.getLongExtra(Const.QR_CODE_MASQUERADE_ID, 0L)
         if (masqueradingUserId != 0L) {
             MasqueradeHelper.startMasquerading(masqueradingUserId, ApiPrefs.domain, NavigationActivity::class.java)
@@ -439,6 +456,164 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
         }
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        ViewCompat.setOnApplyWindowInsetsListener(fullscreen) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+            // Apply both navigation bar and display cutout insets
+            // This ensures content is not hidden behind the navigation bar OR the hole punch camera
+            val leftPadding = maxOf(navigationBars.left, displayCutout.left)
+            val rightPadding = maxOf(navigationBars.right, displayCutout.right)
+
+            view.setPadding(
+                leftPadding,
+                0,
+                rightPadding,
+                0
+            )
+
+            // Consume horizontal insets so child ComposeViews don't apply them again
+            // Also consume bottom insets when offline indicator is visible
+            val masquerading = ApiPrefs.isMasquerading
+            val consumeBottom = offlineIndicator.root.visibility == View.VISIBLE
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.navigationBars(),
+                    Insets.of(
+                        0, // Consume left
+                        if (masquerading) 0 else navigationBars.top,
+                        0, // Consume right
+                        if (consumeBottom) 0 else navigationBars.bottom
+                    )
+                )
+                .setInsets(
+                    WindowInsetsCompat.Type.displayCutout(),
+                    Insets.of(
+                        0, // Consume left
+                        if (masquerading) 0 else displayCutout.top,
+                        0, // Consume right
+                        displayCutout.bottom
+                    )
+                )
+                .build()
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(bottomBarContainer) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+            val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+            if (isLandscape) {
+                // In landscape, use both padding for content and margins to move the bar away from edges
+                val leftInset = maxOf(navigationBars.left, displayCutout.left)
+                val rightInset = maxOf(navigationBars.right, displayCutout.right)
+
+                view.setPadding(
+                    leftInset,
+                    view.paddingTop,
+                    rightInset,
+                    view.paddingBottom
+                )
+
+                view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                    this.leftMargin = leftInset
+                    this.rightMargin = rightInset
+                    this.bottomMargin = navigationBars.bottom
+                }
+            } else {
+                // In portrait, only apply display cutout and bottom navigation bar
+                view.setPadding(
+                    displayCutout.left,
+                    view.paddingTop,
+                    displayCutout.right,
+                    view.paddingBottom
+                )
+
+                view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                    this.leftMargin = 0
+                    this.rightMargin = 0
+                    this.bottomMargin = navigationBars.bottom
+                }
+            }
+
+            // Update offline indicator margin based on bottom bar visibility
+            // When bottom bar is visible, no margin needed (bottom bar handles insets)
+            // When bottom bar is not visible, apply margin to clear Android nav buttons
+            val layoutParams = offlineIndicator.root.layoutParams as? ViewGroup.MarginLayoutParams
+            layoutParams?.bottomMargin = if (bottomBarContainer.isVisible) 0 else navigationBars.bottom
+            offlineIndicator.root.layoutParams = layoutParams
+
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(bottomBarContainer) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            bottomBarContainer.updateLayoutParams<LinearLayout.LayoutParams> {
+                height = 56.toPx + navigationBars.bottom
+            }
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomBarDivider) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+            val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+            if (isLandscape) {
+                // In landscape, apply horizontal margins to match bottom bar
+                val leftInset = maxOf(navigationBars.left, displayCutout.left)
+                val rightInset = maxOf(navigationBars.right, displayCutout.right)
+
+                view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                    this.leftMargin = leftInset
+                    this.rightMargin = rightInset
+                }
+            } else {
+                // In portrait, apply display cutout margins to match bottom bar
+                view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                    this.leftMargin = displayCutout.left
+                    this.rightMargin = displayCutout.right
+                }
+            }
+
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(navigationDrawerBinding.navigationDrawer) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            view.setPadding(
+                insets.left,
+                insets.top,
+                0,
+                insets.bottom
+            )
+            windowInsets
+        }
+
+        ViewCompat.requestApplyInsets(bottomBarContainer)
+    }
+
+    private fun updateStatusBarAppearanceForDrawer() {
+        // Check if drawer is open and update status bar appearance accordingly (handles config changes)
+        // Post to ensure drawer state is checked after current layout pass
+        binding.drawerLayout.post {
+            if (binding.drawerLayout.isDrawerOpen(GravityCompat.START) && !ColorKeeper.darkTheme) {
+                window?.let { window ->
+                    val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                    controller?.isAppearanceLightStatusBars = true
+                }
+            } else if (!ColorKeeper.darkTheme) {
+                window?.let { window ->
+                    val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                    controller?.isAppearanceLightStatusBars = false
+                }
+            }
+        }
+    }
+
     private fun logOfflineEvents(isOnline: Boolean) {
         lifecycleScope.launch {
             if (isOnline) {
@@ -480,8 +655,9 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
 
         currentFragment?.let {
             val visible = isBottomNavFragment(it) || supportFragmentManager.backStackEntryCount <= 1
-            binding.bottomBar.setVisible(visible)
+            binding.bottomBarContainer.setVisible(visible)
             binding.bottomBarDivider.setVisible(visible)
+            ViewCompat.requestApplyInsets(binding.bottomBarContainer)
         }
     }
 
@@ -609,6 +785,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
         mDrawerToggle?.onConfigurationChanged(newConfig)
         super.onConfigurationChanged(newConfig)
         applyThemeForAllFragments()
+        updateStatusBarAppearanceForDrawer()
     }
 
     private fun applyThemeForAllFragments() {
@@ -684,9 +861,9 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
             }
         }
 
-        // Hide these settings when dashboard redesign is enabled (they're now in customize dashboard)
-        val isDashboardRedesignEnabled = RemoteConfigUtils.getBoolean(RemoteConfigParam.DASHBOARD_REDESIGN)
-        if (isDashboardRedesignEnabled) {
+        // Hide these settings when the new dashboard is active (they're now in customize dashboard)
+        val isNewDashboardActive = navigationBehavior.homeFragmentClass == NewDashboardFragment::class.java
+        if (isNewDashboardActive) {
             navigationDrawerBinding.navigationDrawerSettingsSpacer.setGone()
             navigationDrawerBinding.navigationMenuItemsDivider.setGone()
             navigationDrawerBinding.optionsMenuTitle.setGone()
@@ -732,6 +909,13 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
                 super.onDrawerOpened(drawerView)
                 invalidateOptionsMenu()
                 setCloseDrawerVisibility()
+                // Set status bar icons to dark only in light mode (for visibility on white drawer background)
+                if (!ColorKeeper.darkTheme) {
+                    window?.let { window ->
+                        val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                        controller?.isAppearanceLightStatusBars = true
+                    }
+                }
             }
 
             override fun onDrawerClosed(drawerView: View) {
@@ -739,6 +923,13 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
                 invalidateOptionsMenu()
                 // Make the scrollview that is inside the drawer scroll to the top
                 navigationDrawerBinding.navigationDrawer.scrollTo(0, 0)
+                // Restore status bar icons to light only in light mode (for dark toolbar)
+                if (!ColorKeeper.darkTheme) {
+                    window?.let { window ->
+                        val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                        controller?.isAppearanceLightStatusBars = false
+                    }
+                }
             }
         }
 
@@ -802,6 +993,8 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
             findItem(R.id.bottomNavigationNotifications).isEnabled = !isOffline
             findItem(R.id.bottomNavigationInbox).isEnabled = !isOffline
         }
+
+        ViewCompat.requestApplyInsets(binding.fullscreen)
     }
 
     override fun onStartMasquerading(domain: String, userId: Long) {
@@ -1322,7 +1515,7 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
     }
 
     override fun updateToDoCount(toDoCount: Int) {
-        updateBottomBarBadge(R.id.bottomNavigationToDo, toDoCount, R.plurals.a11y_todoBadgeCount)
+        updateBottomBarBadge(R.id.bottomNavigationToDo, toDoCount, R.plurals.a11y_todoBadgeCountNew)
     }
 
     override fun onToDoCountChanged(count: Int) {
diff --git a/apps/student/src/main/java/com/instructure/student/activity/NothingToSeeHereFragment.kt b/apps/student/src/main/java/com/instructure/student/activity/NothingToSeeHereFragment.kt
index 2e52258429..df12d6725d 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/NothingToSeeHereFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/NothingToSeeHereFragment.kt
@@ -24,6 +24,7 @@ import com.instructure.pandautils.analytics.SCREEN_VIEW_NOTHING_TO_SEE_HERE
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentNothingToSeeHereBinding
@@ -46,6 +47,7 @@ class NothingToSeeHereFragment : ParentFragment() {
 
     override fun applyTheme() {
         binding.toolbar.setupAsBackButton(this)
+        binding.toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarLight(requireActivity(), binding.toolbar)
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/activity/PandaAvatarActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/PandaAvatarActivity.kt
index 4acf0ee989..dae2ede4d6 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/PandaAvatarActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/PandaAvatarActivity.kt
@@ -20,7 +20,12 @@ package com.instructure.student.activity
 import android.annotation.TargetApi
 import android.app.Activity
 import android.content.Intent
-import android.graphics.*
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
 import android.graphics.drawable.BitmapDrawable
 import android.os.Build
 import android.os.Bundle
@@ -28,12 +33,19 @@ import android.os.Environment
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.view.animation.*
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import android.view.animation.AnticipateInterpolator
+import android.view.animation.OvershootInterpolator
+import android.view.animation.TranslateAnimation
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
+import android.widget.ScrollView
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.instructure.canvasapi2.utils.APIHelper
 import com.instructure.canvasapi2.utils.Analytics
 import com.instructure.canvasapi2.utils.AnalyticsEventConstants
@@ -41,14 +53,28 @@ import com.instructure.canvasapi2.utils.PrefManager
 import com.instructure.pandautils.analytics.SCREEN_VIEW_PANDA_AVATAR
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.ColorKeeper
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.DP
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
+import com.instructure.pandautils.utils.PermissionUtils
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomAndRightSystemBarPadding
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.onClick
+import com.instructure.pandautils.utils.requestAccessibilityFocus
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.toast
 import com.instructure.student.R
 import com.instructure.student.databinding.PandaImageBinding
 import com.instructure.student.util.PandaDrawables
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
-import java.util.*
+import java.util.Date
 
 private object PandaAvatarPrefs : PrefManager(Const.NAME)
 
@@ -61,10 +87,12 @@ class PandaAvatarActivity : ParentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         setContentView(binding.root)
         setSupportActionBar(binding.toolbar)
         setupViews()
         setupListeners()
+        applyWindowInsets()
         Analytics.logEvent(AnalyticsEventConstants.PANDA_AVATAR_EDITOR_OPENED)
     }
 
@@ -135,6 +163,7 @@ class PandaAvatarActivity : ParentActivity() {
         binding.toolbar.setupAsBackButton { finish() }
         ViewStyler.themeToolbarColored(this, binding.toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
         binding.toolbar.elevation = this.DP(2f)
+        binding.toolbar.applyTopSystemBarInsets()
         // Make the head and body all black
         binding.changeHead.background = ColorKeeper.getColoredDrawable(this@PandaAvatarActivity, R.drawable.pandify_head_02, Color.BLACK)
         binding.changeBody.background = ColorKeeper.getColoredDrawable(this@PandaAvatarActivity, R.drawable.pandify_body_11, Color.BLACK)
@@ -343,4 +372,40 @@ class PandaAvatarActivity : ParentActivity() {
         }
     }
 
+    private fun applyWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+            val leftPadding = maxOf(navigationBars.left, displayCutout.left)
+            val rightPadding = maxOf(navigationBars.right, displayCutout.right)
+
+            view.setPadding(
+                leftPadding,
+                0,
+                rightPadding,
+                0
+            )
+
+            // Apply bottom margin to editOptions
+            val editOptionsParams = binding.editOptions.layoutParams as? RelativeLayout.LayoutParams
+            editOptionsParams?.bottomMargin = systemBars.bottom
+            binding.editOptions.layoutParams = editOptionsParams
+
+            // Apply bottom margin to partsOptions
+            val partsOptionsParams = binding.partsOptions.layoutParams as? RelativeLayout.LayoutParams
+            partsOptionsParams?.bottomMargin = systemBars.bottom
+            binding.partsOptions.layoutParams = partsOptionsParams
+
+            insets
+        }
+
+        // Apply bottom and right padding to ScrollView for landscape mode navigation bar
+        (binding.pandaImages.parent as? ScrollView)?.let { scrollView ->
+            scrollView.applyBottomAndRightSystemBarPadding()
+            scrollView.clipToPadding = false
+        }
+    }
+
 }
diff --git a/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt b/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt
index c0e8976bdd..3d42c6b056 100644
--- a/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/activity/VideoViewActivity.kt
@@ -51,6 +51,7 @@ import com.instructure.pandautils.base.BaseCanvasActivity
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applySystemBarInsets
 import com.instructure.pandautils.utils.setGone
 import com.instructure.student.R
 import com.instructure.student.databinding.ActivityVideoViewBinding
@@ -71,6 +72,7 @@ class VideoViewActivity : BaseCanvasActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         binding.playerView.requestFocus()
+        binding.playerView.applySystemBarInsets(bottom = true)
         mediaDataSourceFactory = buildDataSourceFactory(true)
         mainHandler = Handler()
         val videoTrackSelectionFactory: ExoTrackSelection.Factory = AdaptiveTrackSelection.Factory()
diff --git a/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt b/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt
index 72b57b1a64..77b398e065 100644
--- a/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/coursebrowser/CourseBrowserFragment.kt
@@ -27,6 +27,9 @@ import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.appbar.AppBarLayout
@@ -34,6 +37,7 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.Group
 import com.instructure.canvasapi2.models.Tab
+import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.canvasapi2.utils.RemoteConfigParam
 import com.instructure.canvasapi2.utils.RemoteConfigUtils
 import com.instructure.canvasapi2.utils.isValid
@@ -59,6 +63,8 @@ import com.instructure.pandautils.utils.NetworkStateProvider
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.a11yManager
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isSwitchAccessEnabled
 import com.instructure.pandautils.utils.makeBundle
@@ -216,6 +222,40 @@ class CourseBrowserFragment : BaseCanvasFragment(), FragmentInteractions,
         noOverlayToolbar.title = canvasContext.name
         (canvasContext as? Course)?.term?.name?.let { noOverlayToolbar.subtitle = it }
         noOverlayToolbar.setBackgroundColor(canvasContext.color)
+        appBarLayout.setBackgroundColor(canvasContext.color)
+
+        // Apply top padding to noOverlayToolbar (skip when masquerading - MasqueradeUI handles it)
+        if (!ApiPrefs.isMasquerading) {
+            noOverlayToolbar.applyTopSystemBarInsets()
+        }
+
+        // Handle insets for color overlay mode
+        ViewCompat.setOnApplyWindowInsetsListener(appBarLayout) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+
+            // Skip top insets when masquerading - MasqueradeUI handles it
+            val topInset = if (ApiPrefs.isMasquerading) 0 else systemBars.top
+
+            if (overlayToolbar.isVisible) {
+                // Color overlay enabled: apply padding to push content below status bar
+                view.setPadding(view.paddingLeft, topInset, view.paddingRight, view.paddingBottom)
+            } else {
+                view.setPadding(view.paddingLeft, 0, view.paddingRight, view.paddingBottom)
+            }
+
+            // Reset any margins
+            val layoutParams = view.layoutParams as? ViewGroup.MarginLayoutParams
+            layoutParams?.topMargin = 0
+            view.layoutParams = layoutParams
+
+            insets
+        }
+
+        ViewCompat.requestApplyInsets(appBarLayout)
+
+        // Add a status bar background view when color overlay is enabled
+        setupStatusBarBackground()
+
         updateToolbarVisibility()
 
         // Hide image placeholder if color overlay is disabled and there is no valid image
@@ -233,6 +273,8 @@ class CourseBrowserFragment : BaseCanvasFragment(), FragmentInteractions,
 
         swipeRefreshLayout.setOnRefreshListener { loadTabs(true) }
 
+        swipeRefreshLayout.applyBottomSystemBarInsets()
+
         loadTabs()
     }
 
@@ -273,6 +315,44 @@ class CourseBrowserFragment : BaseCanvasFragment(), FragmentInteractions,
         courseHeader.setVisible(useOverlay)
     }
 
+    private var statusBarBackgroundView: View? = null
+
+    private fun setupStatusBarBackground() {
+        if (hideColorOverlay) {
+            // Remove status bar background if it exists
+            statusBarBackgroundView?.let {
+                (it.parent as? ViewGroup)?.removeView(it)
+            }
+            statusBarBackgroundView = null
+            return
+        }
+
+        // Find the fullscreen container in the activity
+        val fullscreenContainer = activity?.findViewById<ViewGroup>(R.id.fullscreen) ?: return
+
+        // Create or update the status bar background view
+        if (statusBarBackgroundView == null) {
+            statusBarBackgroundView = View(requireContext()).apply {
+                id = View.generateViewId()
+            }
+            fullscreenContainer.addView(statusBarBackgroundView, 0)
+        }
+
+        statusBarBackgroundView?.apply {
+            setBackgroundColor(canvasContext.color)
+            ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                val params = view.layoutParams
+                    ?: ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, systemBars.top)
+                params.width = ViewGroup.LayoutParams.MATCH_PARENT
+                params.height = systemBars.top
+                view.layoutParams = params
+                insets
+            }
+            ViewCompat.requestApplyInsets(this)
+        }
+    }
+
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         // Set course image again after orientation change to ensure correct scale/crop
@@ -288,6 +368,11 @@ class CourseBrowserFragment : BaseCanvasFragment(), FragmentInteractions,
     override fun onDestroyView() {
         super.onDestroyView()
         apiCalls?.cancel()
+        // Clean up the status bar background view
+        statusBarBackgroundView?.let {
+            (it.parent as? ViewGroup)?.removeView(it)
+        }
+        statusBarBackgroundView = null
     }
     //endregion
 
diff --git a/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardScreen.kt b/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardScreen.kt
index 1885bf560e..7c8ab93853 100644
--- a/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardScreen.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -141,6 +142,7 @@ fun DashboardScreenContent(
 
     Scaffold(
         modifier = Modifier.background(colorResource(R.color.backgroundLight)),
+        contentWindowInsets = WindowInsets(0),
         topBar = {
             CanvasThemedAppBar(
                 title = stringResource(id = R.string.dashboard),
diff --git a/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardViewModel.kt b/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardViewModel.kt
index 40d834e96c..bf40200637 100644
--- a/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardViewModel.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/dashboard/compose/DashboardViewModel.kt
@@ -84,7 +84,7 @@ class DashboardViewModel @Inject constructor(
         viewModelScope.launch {
             _uiState.update { it.copy(loading = true, error = null) }
             try {
-                launch { ensureDefaultWidgetsUseCase(Unit) }
+                ensureDefaultWidgetsUseCase(Unit)
                 combine(
                     observeWidgetMetadataUseCase(Unit),
                     networkStateProvider.isOnlineLiveData.asFlow()
diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt
index 5c01d98535..9c7248bc14 100644
--- a/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/discussion/details/DiscussionDetailsFragment.kt
@@ -80,6 +80,8 @@ import com.instructure.pandautils.utils.ProfileUtils
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.Utils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.getModuleItemId
 import com.instructure.pandautils.utils.isAccessibilityEnabled
 import com.instructure.pandautils.utils.isGroup
@@ -178,6 +180,7 @@ class DiscussionDetailsFragment : ParentFragment(), Bookmarkable {
             // Send out bus events to trigger a refresh for discussion list
             DiscussionUpdatedEvent(discussionTopicHeader, javaClass.simpleName).post()
         }
+        binding.discussionsScrollView.applyBottomSystemBarInsets()
 
         networkStateProvider.isOnlineLiveData.observe(viewLifecycleOwner) { isOnline ->
             if (isOnline) {
@@ -243,6 +246,7 @@ class DiscussionDetailsFragment : ParentFragment(), Bookmarkable {
         }
         */
             ViewStyler.themeToolbarColored(requireActivity(), toolbar, canvasContext)
+            toolbar.applyTopSystemBarInsets()
         }
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/features/discussion/list/DiscussionListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/discussion/list/DiscussionListFragment.kt
index 09be1b28f9..df45a79059 100644
--- a/apps/student/src/main/java/com/instructure/student/features/discussion/list/DiscussionListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/discussion/list/DiscussionListFragment.kt
@@ -52,6 +52,9 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
+import com.instructure.pandautils.utils.applyBottomAndRightSystemBarMargin
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.isTablet
@@ -183,6 +186,7 @@ open class DiscussionListFragment : ParentFragment(), Bookmarkable {
             })
 
             createNewDiscussion.apply {
+                applyBottomAndRightSystemBarMargin()
                 setGone()
                 backgroundTintList = ViewStyler.makeColorStateListForButton()
                 setImageDrawable(ColorUtils.colorIt(ThemePrefs.buttonTextColor, drawable))
@@ -246,6 +250,9 @@ open class DiscussionListFragment : ParentFragment(), Bookmarkable {
     override fun applyTheme() {
         with(binding) {
             setupToolbarMenu(discussionListToolbar)
+            discussionListToolbar.applyTopSystemBarInsets()
+            swipeRefreshLayout.applyImeAndSystemBarInsets()
+            discussionRecyclerView.clipToPadding = false
             discussionListToolbar.title = title()
             discussionListToolbar.setupAsBackButton(this@DiscussionListFragment)
             val searchHint =
diff --git a/apps/student/src/main/java/com/instructure/student/features/elementary/course/ElementaryCourseFragment.kt b/apps/student/src/main/java/com/instructure/student/features/elementary/course/ElementaryCourseFragment.kt
index a31806d943..49fac73c3a 100644
--- a/apps/student/src/main/java/com/instructure/student/features/elementary/course/ElementaryCourseFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/elementary/course/ElementaryCourseFragment.kt
@@ -21,7 +21,6 @@ import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.instructure.pandautils.base.BaseCanvasFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import com.google.android.material.tabs.TabLayout
@@ -32,7 +31,17 @@ import com.instructure.canvasapi2.utils.pageview.PageViewUrlParam
 import com.instructure.interactions.router.Route
 import com.instructure.pandautils.analytics.SCREEN_VIEW_ELEMENTARY_COURSE
 import com.instructure.pandautils.analytics.ScreenView
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.base.BaseCanvasFragment
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.argsWithContext
+import com.instructure.pandautils.utils.isCourse
+import com.instructure.pandautils.utils.isTablet
+import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.student.databinding.FragmentElementaryCourseBinding
 import com.instructure.student.features.coursebrowser.CourseBrowserFragment
 import com.instructure.student.features.grades.GradesFragment
@@ -89,6 +98,7 @@ class ElementaryCourseFragment : BaseCanvasFragment() {
             data?.let {
                 courseTabPager.offscreenPageLimit = it.tabs.size
                 courseTabPager.adapter = ElementaryCoursePagerAdapter(it.tabs)
+                courseTabPager.applyBottomSystemBarInsets()
 
                 val selectedTab = it.tabs.find { it.tabId == tabId }
                 val selectedTabPosition = it.tabs.indexOf(selectedTab)
@@ -112,6 +122,7 @@ class ElementaryCourseFragment : BaseCanvasFragment() {
     private fun applyTheme() = with(binding) {
         toolbar.title = canvasContext.name
         toolbar.setupAsBackButton(this@ElementaryCourseFragment)
+        toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), toolbar, canvasContext)
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt
index 0483d15691..05fdcc4d5f 100644
--- a/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/files/details/FileDetailsFragment.kt
@@ -50,6 +50,8 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.PermissionUtils
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.getModuleItemId
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.setGone
@@ -117,6 +119,8 @@ class FileDetailsFragment : ParentFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.downloadButton.setVisible(repository.isOnline())
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.buttonContainer.applyBottomSystemBarInsets()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
diff --git a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt
index 89657b7fb6..e5b72c3777 100644
--- a/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/files/list/FileListFragment.kt
@@ -71,6 +71,9 @@ import com.instructure.pandautils.utils.PermissionUtils
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.FeatureFlagProvider
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isCourse
 import com.instructure.pandautils.utils.isCourseOrGroup
 import com.instructure.pandautils.utils.isGroup
@@ -191,6 +194,7 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent
         binding.toolbar.title = title()
         binding.toolbar.subtitle = canvasContext.name
         binding.addFab.setInvisible()
+        binding.addFab.applyBottomSystemBarMargin()
         binding.toolbar.setMenu(R.menu.menu_file_list) {}
 
         if (canvasContext.type == CanvasContext.Type.USER) applyTheme()
@@ -311,6 +315,7 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent
                 toolbar
             )
             toolbar.setupAsBackButton(this@FileListFragment)
+            toolbar.applyTopSystemBarInsets()
             ViewStyler.themeFAB(addFab)
             ViewStyler.themeFAB(addFileFab)
             ViewStyler.themeFAB(addFolderFab)
@@ -373,6 +378,7 @@ class FileListFragment : ParentFragment(), Bookmarkable, FileUploadDialogParent
         }
 
         configureRecyclerView(requireView(), requireContext(), recyclerAdapter!!, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView)
+        swipeRefreshLayout.applyBottomSystemBarInsets()
 
         setupToolbarMenu(toolbar)
 
diff --git a/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt b/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt
index 03fe04ceca..95b6758d2f 100644
--- a/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/files/search/FileSearchFragment.kt
@@ -21,6 +21,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.FileFolder
@@ -35,6 +38,7 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isUser
 import com.instructure.pandautils.utils.makeBundle
@@ -88,6 +92,21 @@ class FileSearchFragment : ParentFragment(), FileSearchView {
             adapter = searchAdapter
         }
         setupViews()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        searchHeader.applyTopSystemBarInsets()
+        ViewCompat.setOnApplyWindowInsetsListener(fileSearchRecyclerView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+            view.updatePadding(bottom = maxOf(systemBars.bottom, ime.bottom))
+            insets
+        }
+        fileSearchRecyclerView.clipToPadding = false
+        if (fileSearchRecyclerView.isAttachedToWindow) {
+            ViewCompat.requestApplyInsets(fileSearchRecyclerView)
+        }
     }
 
     override fun onRefreshStarted() {
diff --git a/apps/student/src/main/java/com/instructure/student/features/inbox/list/StudentInboxRouter.kt b/apps/student/src/main/java/com/instructure/student/features/inbox/list/StudentInboxRouter.kt
index 80237db782..7f3aba89c4 100644
--- a/apps/student/src/main/java/com/instructure/student/features/inbox/list/StudentInboxRouter.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/inbox/list/StudentInboxRouter.kt
@@ -34,7 +34,7 @@ import com.instructure.student.router.RouteMatcher.openMedia
 class StudentInboxRouter(private val activity: FragmentActivity, private val fragment: Fragment) : InboxRouter {
 
     override fun openConversation(conversation: Conversation, scope: InboxApi.Scope) {
-        val route = InboxDetailsFragment.makeRoute(conversation.id, conversation.workflowState == Conversation.WorkflowState.UNREAD)
+        val route = InboxDetailsFragment.makeRoute(conversation.id, conversation.workflowState == Conversation.WorkflowState.UNREAD, scope)
         RouteMatcher.route(activity, route)
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt
index b25e55b5cf..1352b67a2f 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/list/ModuleListFragment.kt
@@ -39,6 +39,8 @@ import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.setVisible
@@ -101,6 +103,7 @@ class ModuleListFragment : ParentFragment(), Bookmarkable {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         recyclerBinding = PandaRecyclerRefreshLayoutBinding.bind(binding.root)
+        binding.toolbar.applyTopSystemBarInsets()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -212,6 +215,7 @@ class ModuleListFragment : ParentFragment(), Bookmarkable {
         recyclerAdapter?.let {
             configureRecyclerView(requireView(), requireContext(), it, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView)
         }
+        recyclerBinding.swipeRefreshLayout.applyBottomSystemBarInsets()
     }
 
     fun notifyOfItemChanged(`object`: ModuleObject?, item: ModuleItem?) {
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt
index 8ceddd27c8..25300735ed 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/CourseModuleProgressionFragment.kt
@@ -23,6 +23,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -52,6 +54,7 @@ import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.features.assignments.details.AssignmentDetailsFragment
 import com.instructure.pandautils.features.discussion.router.DiscussionRouteHelper
 import com.instructure.pandautils.features.discussion.router.DiscussionRouterFragment
+import com.instructure.pandautils.features.offline.sync.StudioOfflineVideoHelper
 import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.IntArg
@@ -100,6 +103,9 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable {
     @Inject
     lateinit var repository: ModuleProgressionRepository
 
+    @Inject
+    lateinit var studioOfflineVideoHelper: StudioOfflineVideoHelper
+
     private var moduleItemsJob: Job? = null
     private var markAsReadJob: WeaveJob? = null
 
@@ -149,6 +155,32 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable {
 
         binding.prevItem.setImageDrawable(ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_left, canvasContext.color))
         binding.nextItem.setImageDrawable(ColorKeeper.getColoredDrawable(requireActivity(), R.drawable.ic_chevron_right, canvasContext.color))
+
+        // Apply bottom margin to bottom bar for edge-to-edge support
+        ViewCompat.setOnApplyWindowInsetsListener(binding.bottomBarModule) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val layoutParams = view.layoutParams as? ViewGroup.MarginLayoutParams
+            layoutParams?.bottomMargin = systemBars.bottom
+            view.layoutParams = layoutParams
+            insets
+        }
+
+        // Consume bottom insets for fragment container to prevent child fragments from applying them again
+        ViewCompat.setOnApplyWindowInsetsListener(binding.fragmentContainer) { view, insets ->
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.systemBars(),
+                    androidx.core.graphics.Insets.of(
+                        insets.getInsets(WindowInsetsCompat.Type.systemBars()).left,
+                        insets.getInsets(WindowInsetsCompat.Type.systemBars()).top,
+                        insets.getInsets(WindowInsetsCompat.Type.systemBars()).right,
+                        0 // Set bottom to 0 to consume bottom insets
+                    )
+                )
+                .build()
+        }
+
+        ViewCompat.requestApplyInsets(binding.bottomBarModule)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -671,7 +703,8 @@ class CourseModuleProgressionFragment : ParentFragment(), Bookmarkable {
             repository.isOnline() || !isOfflineEnabled, // If the offline feature is disabled we always use the online behavior
             snycedTabs,
             syncedFileIds,
-            requireContext()
+            requireContext(),
+            studioOfflineVideoHelper = if (isOfflineEnabled) studioOfflineVideoHelper else null
         )
         var args: Bundle? = fragment!!.arguments
         if (args == null) {
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt
index 806f82655c..8a9de6c3d7 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/LockedModuleItemFragment.kt
@@ -33,6 +33,7 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.pandautils.views.CanvasWebView
 import com.instructure.student.R
@@ -62,6 +63,7 @@ class LockedModuleItemFragment : ParentFragment() {
         binding.explanationWebView.loadHtml(lockExplanation, "")
 
         binding.toolbar.setupAsBackButton(this)
+        binding.toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, course)
     }
     //endregion
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/ModuleQuizDecider.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/ModuleQuizDecider.kt
index d87a077543..6cc031da52 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/progression/ModuleQuizDecider.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/ModuleQuizDecider.kt
@@ -41,6 +41,7 @@ import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.argsWithContext
 import com.instructure.pandautils.utils.onClickWithRequireNetwork
 import com.instructure.pandautils.utils.setGone
@@ -113,6 +114,7 @@ class ModuleQuizDecider : ParentFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding.toolbar.applyTopSystemBarInsets()
         obtainQuiz()
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/NotAvailableOfflineFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/NotAvailableOfflineFragment.kt
index 643c08acf7..87aa6e7f36 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/progression/NotAvailableOfflineFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/NotAvailableOfflineFragment.kt
@@ -57,6 +57,7 @@ class NotAvailableOfflineFragment : ParentFragment() {
         if (showToolbar) {
             binding.toolbar.title = moduleItemName
             binding.toolbar.setupAsBackButton(this)
+            binding.toolbar.applyTopSystemBarInsets()
             ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, course)
         } else {
             binding.toolbar.setGone()
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/StudioVideoFragment.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/StudioVideoFragment.kt
new file mode 100644
index 0000000000..f5acdb1a3a
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/StudioVideoFragment.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.instructure.student.features.modules.progression
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.interactions.router.Route
+import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.NullableStringArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.color
+import com.instructure.student.activity.VideoViewActivity
+import com.instructure.student.fragment.ParentFragment
+import dagger.hilt.android.AndroidEntryPoint
+
+private const val COURSE_ID = "course_id"
+private const val VIDEO_URI = "video_uri"
+private const val VIDEO_TITLE = "video_title"
+private const val POSTER_URI = "poster_uri"
+
+@AndroidEntryPoint
+class StudioVideoFragment : ParentFragment() {
+
+    private var courseId: Long by LongArg(key = COURSE_ID)
+    private var videoUri: String by StringArg(key = VIDEO_URI)
+    private var videoTitle: String by StringArg(key = VIDEO_TITLE)
+    private var posterUri: String? by NullableStringArg(key = POSTER_URI)
+
+    override fun title(): String = videoTitle
+
+    override fun applyTheme() {}
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
+        return ComposeView(requireContext()).apply {
+            setContent {
+                CanvasTheme {
+                    val courseColor = Color(CanvasContext.emptyCourseContext(courseId).color)
+                    StudioVideoScreen(
+                        title = videoTitle,
+                        posterUri = posterUri,
+                        courseColor = courseColor,
+                        onOpenClick = {
+                            startActivity(VideoViewActivity.createIntent(requireContext(), videoUri))
+                        },
+                        onBackClick = {
+                            requireActivity().onBackPressedDispatcher.onBackPressed()
+                        }
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+        fun makeRoute(courseId: Long, videoUri: String, title: String, posterUri: String?): Route {
+            val bundle = Bundle().apply {
+                putLong(COURSE_ID, courseId)
+                putString(VIDEO_URI, videoUri)
+                putString(VIDEO_TITLE, title)
+                putString(POSTER_URI, posterUri)
+            }
+            return Route(StudioVideoFragment::class.java, null, bundle)
+        }
+
+        fun newInstance(route: Route) = StudioVideoFragment().apply {
+            arguments = route.arguments
+        }
+    }
+}
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/progression/StudioVideoScreen.kt b/apps/student/src/main/java/com/instructure/student/features/modules/progression/StudioVideoScreen.kt
new file mode 100644
index 0000000000..185070eb7a
--- /dev/null
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/progression/StudioVideoScreen.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.instructure.student.features.modules.progression
+
+import android.content.res.Configuration
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
+import com.bumptech.glide.integration.compose.GlideImage
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.student.R
+
+@OptIn(ExperimentalGlideComposeApi::class)
+@Composable
+fun StudioVideoScreen(
+    title: String,
+    posterUri: String?,
+    courseColor: Color = Color(ThemePrefs.primaryColor),
+    onOpenClick: () -> Unit,
+    onBackClick: () -> Unit
+) {
+    Scaffold(
+        topBar = {
+            CanvasThemedAppBar(
+                title = title,
+                navigationActionClick = onBackClick,
+                backgroundColor = courseColor,
+                contentColor = colorResource(R.color.textLightest)
+            )
+        }
+    ) { padding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(colorResource(R.color.backgroundLightest))
+                .padding(padding)
+                .padding(16.dp)
+                .verticalScroll(rememberScrollState()),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            if (posterUri != null) {
+                GlideImage(
+                    model = posterUri,
+                    contentDescription = title,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(200.dp),
+                    contentScale = ContentScale.Fit
+                )
+            } else {
+                Box(
+                    modifier = Modifier
+                        .size(120.dp)
+                        .background(
+                            color = colorResource(id = R.color.backgroundMedium),
+                            shape = CircleShape
+                        ),
+                    contentAlignment = Alignment.Center
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_media),
+                        contentDescription = null,
+                        modifier = Modifier.size(48.dp),
+                        tint = colorResource(id = R.color.textDarkest)
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Text(
+                text = title,
+                fontSize = 20.sp,
+                fontWeight = FontWeight.SemiBold,
+                textAlign = TextAlign.Center,
+                color = colorResource(id = R.color.textDarkest)
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Button(
+                onClick = onOpenClick,
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = Color(ThemePrefs.brandColor)
+                )
+            ) {
+                Text(
+                    text = stringResource(id = R.string.open),
+                    color = colorResource(R.color.textLightest)
+                )
+            }
+        }
+    }
+}
+
+@Preview
+@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun StudioVideoScreenPreview() {
+    ContextKeeper.appContext = LocalContext.current
+    StudioVideoScreen(
+        title = "Module Video",
+        posterUri = null,
+        onOpenClick = {},
+        onBackClick = {}
+    )
+}
diff --git a/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt b/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt
index e64c3035dc..5b07957ba8 100644
--- a/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/modules/util/ModuleUtility.kt
@@ -31,12 +31,14 @@ import com.instructure.pandautils.features.assignments.details.AssignmentDetails
 import com.instructure.pandautils.features.assignments.details.AssignmentDetailsFragment.Companion.makeRoute
 import com.instructure.pandautils.features.discussion.details.DiscussionDetailsWebViewFragment
 import com.instructure.student.R
+import com.instructure.pandautils.features.offline.sync.StudioOfflineVideoHelper
 import com.instructure.student.features.discussion.details.DiscussionDetailsFragment
 import com.instructure.student.features.discussion.details.DiscussionDetailsFragment.Companion.makeRoute
 import com.instructure.student.features.files.details.FileDetailsFragment
 import com.instructure.student.features.modules.progression.LockedModuleItemFragment
 import com.instructure.student.features.modules.progression.ModuleQuizDecider
 import com.instructure.student.features.modules.progression.NotAvailableOfflineFragment
+import com.instructure.student.features.modules.progression.StudioVideoFragment
 import com.instructure.student.features.pages.details.PageDetailsFragment
 import com.instructure.student.fragment.InternalWebviewFragment
 import com.instructure.student.fragment.InternalWebviewFragment.Companion.makeRoute
@@ -53,7 +55,8 @@ object ModuleUtility {
         isOnline: Boolean,
         syncedTabs: Set<String>,
         syncedFileIds: List<Long>,
-        context: Context
+        context: Context,
+        studioOfflineVideoHelper: StudioOfflineVideoHelper? = null
     ): Fragment? = when (item.type) {
         "Page" -> PageDetailsFragment.newInstance(PageDetailsFragment.makeRoute(course, item.title, item.pageUrl, navigatedFromModules))
         "Assignment" -> {
@@ -85,6 +88,22 @@ object ModuleUtility {
         "ExternalUrl", "ExternalTool" -> {
             if (item.isLocked()) {
                 LockedModuleItemFragment.newInstance(LockedModuleItemFragment.makeRoute(course, item.title!!, item.moduleDetails?.lockExplanation ?: ""))
+            } else if (!isOnline && studioOfflineVideoHelper != null) {
+                val mediaId = studioOfflineVideoHelper.getStudioMediaId(item.externalUrl)
+                if (mediaId != null && studioOfflineVideoHelper.isStudioVideoAvailableOffline(mediaId)) {
+                    StudioVideoFragment.newInstance(
+                        StudioVideoFragment.makeRoute(
+                            course.id,
+                            studioOfflineVideoHelper.getStudioVideoUri(mediaId),
+                            item.title ?: "",
+                            studioOfflineVideoHelper.getStudioPosterUri(mediaId)
+                        )
+                    )
+                } else {
+                    NotAvailableOfflineFragment.newInstance(
+                        NotAvailableOfflineFragment.makeRoute(course, item.title, context.getString(R.string.notAvailableOfflineDescription))
+                    )
+                }
             } else {
                 createFragmentWithOfflineCheck(isOnline, course, item, syncedTabs, context) {
                     val uri = Uri.parse(item.htmlUrl).buildUpon().appendQueryParameter("display", "borderless").build()
diff --git a/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt
index edbbc5abd9..2a28293c36 100644
--- a/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/pages/details/PageDetailsFragment.kt
@@ -50,6 +50,8 @@ import com.instructure.pandautils.utils.FileDownloader
 import com.instructure.pandautils.utils.NullableStringArg
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.getModuleItemId
 import com.instructure.pandautils.utils.loadHtmlWithIframes
 import com.instructure.pandautils.utils.makeBundle
@@ -311,6 +313,8 @@ class PageDetailsFragment : InternalWebviewFragment(), Bookmarkable {
     }
 
     override fun applyTheme() {
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.canvasWebViewWrapper.applyBottomSystemBarInsets()
         binding.toolbar.let {
             setupToolbarMenu(it, R.menu.menu_page_details)
             it.title = title()
diff --git a/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt
index 13938daf88..5bdbf27ac3 100644
--- a/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/pages/list/PageListFragment.kt
@@ -34,7 +34,17 @@ import com.instructure.interactions.router.RouterParams
 import com.instructure.pandautils.analytics.SCREEN_VIEW_PAGE_LIST
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.addSearch
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.closeSearch
+import com.instructure.pandautils.utils.isTablet
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentCoursePagesBinding
 import com.instructure.student.databinding.PandaRecyclerRefreshLayoutBinding
@@ -125,6 +135,8 @@ class PageListFragment : ParentFragment(), Bookmarkable {
         recyclerAdapter?.let {
             configureRecyclerView(rootView!!, requireContext(), it, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView)
         }
+        recyclerBinding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        recyclerBinding.listView.clipToPadding = false
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -171,6 +183,7 @@ class PageListFragment : ParentFragment(), Bookmarkable {
             setupToolbarMenu(toolbar)
             toolbar.title = title()
             toolbar.setupAsBackButton(this@PageListFragment)
+            toolbar.applyTopSystemBarInsets()
             toolbar.addSearch(getString(R.string.searchPagesHint)) { query ->
                 if (query.isBlank()) {
                     recyclerBinding.emptyView.emptyViewText(R.string.noItemsToDisplayShort)
diff --git a/apps/student/src/main/java/com/instructure/student/features/people/details/PeopleDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/features/people/details/PeopleDetailsFragment.kt
index 758280833e..63b8e67d1d 100644
--- a/apps/student/src/main/java/com/instructure/student/features/people/details/PeopleDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/people/details/PeopleDetailsFragment.kt
@@ -58,6 +58,8 @@ import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isCourse
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.toast
 import com.instructure.pandautils.utils.withArgs
 import com.instructure.student.R
@@ -98,8 +100,11 @@ class PeopleDetailsFragment : ParentFragment(), Bookmarkable {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding.userBackground.applyTopSystemBarInsets()
+        binding.avatar.applyTopSystemBarInsets()
         binding.compose.backgroundTintList = ColorStateList.valueOf(ThemePrefs.buttonColor)
         binding.compose.setImageDrawable(ColorKeeper.getColoredDrawable(requireContext(), R.drawable.ic_send, ThemePrefs.buttonTextColor))
+        binding.compose.applyBottomSystemBarMargin()
         binding.compose.setOnClickListener {
             // Messaging other users is not available in Student view
             val route = if (ApiPrefs.isStudentView) NothingToSeeHereFragment.makeRoute() else {
diff --git a/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListFragment.kt
index fa683d01bf..7b7096821d 100644
--- a/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/people/list/PeopleListFragment.kt
@@ -32,7 +32,15 @@ import com.instructure.interactions.router.Route
 import com.instructure.pandautils.analytics.SCREEN_VIEW_PEOPLE_LIST
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.isCourse
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.withArgs
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentPeopleListBinding
 import com.instructure.student.features.people.details.PeopleDetailsFragment
@@ -88,12 +96,14 @@ class PeopleListFragment : ParentFragment(), Bookmarkable {
             R.id.emptyView,
             R.id.listView
         )
+        view.findViewById<androidx.swiperefreshlayout.widget.SwipeRefreshLayout>(R.id.swipeRefreshLayout)?.applyBottomSystemBarInsets()
     }
 
     override fun applyTheme() {
         with(binding) {
             toolbar.title = title()
             toolbar.setupAsBackButton(this@PeopleListFragment)
+            toolbar.applyTopSystemBarInsets()
             setupToolbarMenu(toolbar)
             ViewStyler.themeToolbarColored(requireActivity(), toolbar, canvasContext)
         }
diff --git a/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListFragment.kt b/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListFragment.kt
index fda4afb086..531d45f3e7 100644
--- a/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/features/quiz/list/QuizListFragment.kt
@@ -41,6 +41,8 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.makeBundle
@@ -99,6 +101,8 @@ class QuizListFragment : ParentFragment(), Bookmarkable {
             R.id.emptyView,
             R.id.listView
         )
+        recyclerBinding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        recyclerBinding.listView.clipToPadding = false
     }
 
     override fun applyTheme() {
@@ -106,6 +110,7 @@ class QuizListFragment : ParentFragment(), Bookmarkable {
             setupToolbarMenu(toolbar)
             toolbar.title = title()
             toolbar.setupAsBackButton(this@QuizListFragment)
+            toolbar.applyTopSystemBarInsets()
             toolbar.addSearch(getString(R.string.searchQuizzesHint)) { query ->
                 if (query.isBlank()) {
                     recyclerBinding.emptyView.emptyViewText(R.string.noItemsToDisplayShort)
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt
index 2973b7707a..7c4b222166 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/AccountPreferencesFragment.kt
@@ -34,6 +34,8 @@ import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setVisible
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.student.BuildConfig
@@ -80,10 +82,12 @@ class AccountPreferencesFragment : ParentFragment() {
     override fun applyTheme() = with(binding) {
         toolbar.title = title()
         toolbar.setupAsBackButton(this@AccountPreferencesFragment)
+        toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
     }
 
     private fun setupViews() = with(binding) {
+        scrollView.applyBottomSystemBarInsets()
         if (BuildConfig.DEBUG) {
             // Only show language override picker in debug builds
             languageContainer.setVisible()
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/AssignmentBasicFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/AssignmentBasicFragment.kt
index 3241f92107..f290ee843f 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/AssignmentBasicFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/AssignmentBasicFragment.kt
@@ -36,6 +36,7 @@ import com.instructure.pandautils.utils.FeatureFlagProvider
 import com.instructure.pandautils.utils.OnBackStackChangedEvent
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.argsWithContext
 import com.instructure.pandautils.utils.loadHtmlWithIframes
 import com.instructure.pandautils.utils.setGone
@@ -186,6 +187,7 @@ class AssignmentBasicFragment : ParentFragment() {
         binding.toolbar.let {
             it.title = assignment.name ?: ""
             it.setupAsBackButton(this)
+            it.applyTopSystemBarInsets()
             ViewStyler.themeToolbarColored(requireActivity(), it, canvasContext)
         }
     }
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt
index af2dbf27e3..901ab4f897 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/BookmarksFragment.kt
@@ -41,6 +41,8 @@ import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.hideKeyboard
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.setupAsBackButton
@@ -105,6 +107,7 @@ class BookmarksFragment : ParentFragment() {
             }
         }
 
+        toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
     }
 
@@ -126,6 +129,7 @@ class BookmarksFragment : ParentFragment() {
         configureRecyclerView(requireView(), requireContext(), recyclerAdapter!!, R.id.swipeRefreshLayout, R.id.emptyView, R.id.listView, R.string.no_bookmarks)
         pandaRecyclerBinding.listView.addItemDecoration(DividerDecoration(requireContext()))
         pandaRecyclerBinding.listView.isSelectionEnabled = false
+        pandaRecyclerBinding.swipeRefreshLayout.applyBottomSystemBarInsets()
     }
 
     private fun configureRecyclerAdapter() {
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/CourseSettingsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/CourseSettingsFragment.kt
index 639c1089e4..88a95d8ca8 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/CourseSettingsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/CourseSettingsFragment.kt
@@ -29,7 +29,15 @@ import com.instructure.interactions.router.Route
 import com.instructure.pandautils.analytics.SCREEN_VIEW_COURSE_SETTINGS
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.withArgs
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentCourseSettingsBinding
 
@@ -50,6 +58,7 @@ class CourseSettingsFragment : ParentFragment() {
     override fun applyTheme() {
         binding.toolbar.title = title()
         binding.toolbar.setupAsBackButton(this)
+        binding.toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, course)
     }
 
@@ -67,6 +76,7 @@ class CourseSettingsFragment : ParentFragment() {
         startDate.text = DateHelper.dateToDayMonthYearString(requireContext(), course.startDate)
         endLayout.setVisible(course.endDate != null)
         endDate.text = DateHelper.dateToDayMonthYearString(requireContext(), course.endDate)
+        scrollView.applyBottomSystemBarInsets()
     }
 
     companion object {
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/EditPageDetailsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/EditPageDetailsFragment.kt
index 024589e5da..9632031bf1 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/EditPageDetailsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/EditPageDetailsFragment.kt
@@ -19,6 +19,7 @@ package com.instructure.student.fragment
 
 import android.app.Activity
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -40,7 +41,20 @@ import com.instructure.interactions.router.Route
 import com.instructure.pandautils.analytics.SCREEN_VIEW_EDIT_PAGE_DETAILS
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.MediaUploadUtils
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.RequestCodes
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.makeBundle
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsCloseButton
+import com.instructure.pandautils.utils.toast
+import com.instructure.pandautils.utils.withArgs
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentEditPageBinding
 import com.instructure.student.dialog.UnsavedChangesExitDialog
@@ -74,6 +88,11 @@ class EditPageDetailsFragment : ParentFragment() {
         return url.toString()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ViewStyler.setStatusBarLightDelayed(requireActivity())
+    }
+
     //region Fragment Lifecycle Overrides
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.fragment_edit_page, container, false)
@@ -82,6 +101,7 @@ class EditPageDetailsFragment : ParentFragment() {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
         setupDescription()
+        binding.pageRCEView.applyBottomSystemBarInsets()
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -121,7 +141,9 @@ class EditPageDetailsFragment : ParentFragment() {
     //endregion
 
     //region Fragment Interaction Overrides
-    override fun applyTheme() = Unit
+    override fun applyTheme() {
+        ViewStyler.themeToolbarLight(requireActivity(), binding.toolbar)
+    }
 
     override fun title(): String = getString(R.string.editPage)
     //endregion
@@ -192,6 +214,7 @@ class EditPageDetailsFragment : ParentFragment() {
             }
         }
         toolbar.title = page.title
+        toolbar.applyTopSystemBarInsets()
         setupToolbarMenu(toolbar, R.menu.menu_edit_page)
         ViewStyler.themeToolbarLight(requireActivity(), toolbar)
         ViewStyler.setToolbarElevationSmall(requireContext(), toolbar)
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/FeatureFlagsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/FeatureFlagsFragment.kt
index 367b70e22a..2ec81b3b71 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/FeatureFlagsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/FeatureFlagsFragment.kt
@@ -26,6 +26,8 @@ import com.instructure.canvasapi2.utils.FeatureFlagPref
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.student.R
 import com.instructure.student.databinding.AdapterFeatureFlagBinding
@@ -44,10 +46,12 @@ class FeatureFlagsFragment : BaseCanvasFragment() {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
         binding.recyclerView.adapter = FeatureFlagAdapter()
+        binding.recyclerView.applyBottomSystemBarInsets()
     }
 
     private fun setupToolbar() {
         binding.toolbar.setupAsBackButton(this)
+        binding.toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
     }
 }
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt
index 4820ea9d1a..b65c4761a4 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/InternalWebviewFragment.kt
@@ -55,6 +55,8 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.PermissionUtils
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.argsWithContext
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
 import com.instructure.pandautils.utils.makeBundle
@@ -233,6 +235,8 @@ open class InternalWebviewFragment : ParentFragment() {
 
         })
 
+        canvasWebViewWrapper.applyBottomSystemBarInsets()
+
         if (savedInstanceState != null) {
             canvasWebViewWrapper?.webView?.restoreState(savedInstanceState)
         }
@@ -302,6 +306,7 @@ open class InternalWebviewFragment : ParentFragment() {
     override fun applyTheme() = with(binding) {
         toolbar.title = title()
         toolbar.setupAsBackButton(this@InternalWebviewFragment)
+        toolbar.applyTopSystemBarInsets()
         if (canvasContext.type != CanvasContext.Type.COURSE && canvasContext.type != CanvasContext.Type.GROUP) {
             ViewStyler.themeToolbarColored(requireActivity(), toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
         } else {
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt
index a8d19ad08c..6de0f8d9d4 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/NotificationListFragment.kt
@@ -54,6 +54,8 @@ import com.instructure.pandautils.features.inbox.details.InboxDetailsFragment
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isCourse
 import com.instructure.pandautils.utils.isCourseOrGroup
 import com.instructure.pandautils.utils.isGroup
@@ -189,10 +191,12 @@ class NotificationListFragment : ParentFragment(), Bookmarkable, FragmentManager
         val canvasContext = canvasContext
         if (canvasContext is Course || canvasContext is Group) {
             binding.toolbar.setupAsBackButton(this)
+            binding.toolbar.applyTopSystemBarInsets()
             ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, canvasContext)
         } else {
             val navigation = navigation
             navigation?.attachNavigationDrawer(this, binding.toolbar)
+            binding.toolbar.applyTopSystemBarInsets()
             // Styling done in attachNavigationDrawer
         }
     }
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/OldDashboardFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/OldDashboardFragment.kt
index 9a68423101..c0eed9e2dc 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/OldDashboardFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/OldDashboardFragment.kt
@@ -30,6 +30,7 @@ import android.view.MotionEvent.ACTION_CANCEL
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
@@ -59,6 +60,8 @@ import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.dialogs.ColorPickerDialog
 import com.instructure.pandautils.dialogs.EditCourseNicknameDialog
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.instructure.canvasapi2.utils.Analytics
+import com.instructure.canvasapi2.utils.AnalyticsParamConstants
 import com.instructure.canvasapi2.utils.RemoteConfigParam
 import com.instructure.canvasapi2.utils.RemoteConfigUtils
 import com.instructure.pandautils.features.dashboard.DashboardCourseItem
@@ -170,6 +173,8 @@ class OldDashboardFragment : ParentFragment() {
 
         applyTheme()
 
+        binding.toolbar.applyTopSystemBarInsets()
+
         networkStateProvider.isOnlineLiveData.observe(this) { online ->
             recyclerAdapter?.refresh()
             if (online) recyclerBinding.swipeRefreshLayout.isRefreshing = true
@@ -314,6 +319,7 @@ class OldDashboardFragment : ParentFragment() {
             .setTitle(R.string.changing_dashboard_layout)
             .setMessage(R.string.changing_dashboard_layout_message)
             .setPositiveButton(R.string.restart_now) { _, _ ->
+                Analytics.logEvent(AnalyticsParamConstants.NEW_DASHBOARD_ENABLED)
                 lifecycleScope.launch {
                     updateNewDashboardPreferenceUseCase(UpdateNewDashboardPreferenceUseCase.Params(true))
                     dashboardRouter.restartApp()
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/OldToDoListFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/OldToDoListFragment.kt
index c87f39ba29..f2e56a527f 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/OldToDoListFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/OldToDoListFragment.kt
@@ -42,6 +42,7 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.accessibilityClassName
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.children
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.makeBundle
@@ -99,7 +100,7 @@ class OldToDoListFragment : ParentFragment() {
         override fun onShowErrorCrouton(message: Int) = Unit
     }
 
-    override fun title(): String = getString(R.string.Todo)
+    override fun title(): String = getString(R.string.TodoNew)
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return layoutInflater.inflate(R.layout.fragment_list_todo, container, false)
@@ -154,6 +155,7 @@ class OldToDoListFragment : ParentFragment() {
 
     override fun applyTheme() {
         setupToolbarMenu(binding.toolbar)
+        binding.toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ProfileSettingsFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ProfileSettingsFragment.kt
index 1648b3278b..b1d2369175 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/ProfileSettingsFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/ProfileSettingsFragment.kt
@@ -83,10 +83,12 @@ class ProfileSettingsFragment : ParentFragment(), LoaderManager.LoaderCallbacks<
         applyTheme()
         setupViews()
         getUserPermissions()
+        binding.scrollView.applyBottomSystemBarInsets()
     }
 
     override fun applyTheme() {
         binding.toolbar.setupAsBackButton(this)
+        binding.toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
     }
 
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt
index 0f11b2b3db..a51f8d859d 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/ViewImageFragment.kt
@@ -16,6 +16,7 @@
  */
 package com.instructure.student.fragment
 
+import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
@@ -24,7 +25,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.instructure.pandautils.base.BaseCanvasFragment
 import androidx.palette.graphics.Palette
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.DataSource
@@ -32,10 +32,25 @@ import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import com.instructure.interactions.router.Route
+import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.interfaces.ShareableFile
 import com.instructure.pandautils.models.EditableFile
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.FileFolderDeletedEvent
+import com.instructure.pandautils.utils.FileFolderUpdatedEvent
+import com.instructure.pandautils.utils.IntArg
+import com.instructure.pandautils.utils.NullableParcelableArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.isTablet
+import com.instructure.pandautils.utils.onClick
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.viewExternally
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentViewImageBinding
 import org.greenrobot.eventbus.EventBus
@@ -65,6 +80,11 @@ class ViewImageFragment : BaseCanvasFragment(), ShareableFile {
         if (mShowToolbar) setupToolbar() else binding.toolbar.setGone()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ViewStyler.setStatusBarLightDelayed(requireActivity())
+    }
+
     private fun setupToolbar() = with(binding) {
 
         mEditableFile?.let {
@@ -87,6 +107,8 @@ class ViewImageFragment : BaseCanvasFragment(), ShareableFile {
             ViewStyler.themeToolbarLight(requireActivity(), toolbar)
             ViewStyler.setToolbarElevationSmall(requireContext(), toolbar)
         }
+
+        toolbar.applyTopSystemBarInsets()
     }
 
     private val requestListener = object : RequestListener<Drawable> {
diff --git a/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt b/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt
index abb06c8b44..9fb72bef72 100644
--- a/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/fragment/ViewUnsupportedFileFragment.kt
@@ -16,6 +16,7 @@ package com.instructure.student.fragment
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -59,6 +60,12 @@ class ViewUnsupportedFileFragment : BaseCanvasFragment() {
 
         mEditableFile?.let { setupToolbar() } ?: binding.toolbar.setGone()
     }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ViewStyler.setStatusBarLightDelayed(requireActivity())
+    }
+
     private fun setupToolbar() = with(binding) {
 
         mEditableFile?.let {
@@ -74,6 +81,7 @@ class ViewUnsupportedFileFragment : BaseCanvasFragment() {
             fileNameView.text = it.file.displayName
         }
 
+        toolbar.applyTopSystemBarInsets()
         if(isTablet && mToolbarColor != 0) {
             ViewStyler.themeToolbarColored(requireActivity(), toolbar, mToolbarColor, requireContext().getColor(R.color.white))
         } else {
diff --git a/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt b/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt
index 25eb647a20..75597802d8 100644
--- a/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt
+++ b/apps/student/src/main/java/com/instructure/student/holders/TodoViewHolder.kt
@@ -60,9 +60,9 @@ class TodoViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     private fun getContextNameForPlannerItem(context: Context, plannerItem: PlannerItem): String {
         return if (plannerItem.plannableType == PlannableType.PLANNER_NOTE) {
             if (plannerItem.contextName.isNullOrEmpty()) {
-                context.getString(R.string.userCalendarToDo)
+                context.getString(R.string.userCalendarToDoNew)
             } else {
-                context.getString(R.string.courseToDo, plannerItem.contextName)
+                context.getString(R.string.courseToDoNew, plannerItem.contextName)
             }
         } else {
             plannerItem.contextName.orEmpty()
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt
index 8f674daed0..d8f8c4c383 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/annnotation/AnnotationSubmissionUploadFragment.kt
@@ -16,6 +16,7 @@
  */
 package com.instructure.student.mobius.assignmentDetails.submission.annnotation
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -30,6 +31,8 @@ import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.pandautils.utils.withArgs
@@ -80,6 +83,8 @@ class AnnotationSubmissionUploadFragment : BaseCanvasFragment() {
         }
 
         setUpToolbar(binding.annotationSubmissionToolbar)
+        binding.annotationSubmissionToolbar.applyTopSystemBarInsets()
+        binding.annotationSubmissionViewContainer.applyBottomSystemBarInsets()
 
         return binding.root
     }
@@ -97,6 +102,11 @@ class AnnotationSubmissionUploadFragment : BaseCanvasFragment() {
         ViewStyler.themeToolbarLight(requireActivity(), toolbar)
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ViewStyler.setStatusBarLightDelayed(requireActivity())
+    }
+
     companion object {
 
         private const val ANNOTATABLE_ATTACHMENT_ID = "annotatable_attachment_id"
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionView.kt
index c83cd5479c..6d57dcfbe4 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/file/ui/UploadStatusSubmissionView.kt
@@ -18,6 +18,7 @@ package com.instructure.student.mobius.assignmentDetails.submission.file.ui
 
 import android.app.Activity
 import android.content.res.ColorStateList
+import android.content.res.Configuration
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Toast
@@ -28,6 +29,9 @@ import com.instructure.pandautils.adapters.BasicItemBinder
 import com.instructure.pandautils.adapters.BasicItemCallback
 import com.instructure.pandautils.adapters.BasicRecyclerAdapter
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.getActivityOrNull
 import com.instructure.pandautils.utils.setGone
 import com.instructure.pandautils.utils.setVisible
 import com.instructure.pandautils.utils.setupAsBackButton
@@ -47,6 +51,11 @@ class UploadStatusSubmissionView(inflater: LayoutInflater, parent: ViewGroup) :
 
     private var dialog: AlertDialog? = null
 
+    init {
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.uploadStatusRecycler.applyBottomSystemBarInsets()
+    }
+
     private val adapter = UploadRecyclerAdapter(object : UploadListCallback {
         override fun deleteClicked(position: Int) {
             consumer?.accept(UploadStatusSubmissionEvent.OnDeleteFile(position))
@@ -63,6 +72,13 @@ class UploadStatusSubmissionView(inflater: LayoutInflater, parent: ViewGroup) :
         ViewStyler.themeToolbarLight(context as Activity, binding.toolbar)
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        context.getActivityOrNull()?.let {
+            ViewStyler.setStatusBarLightDelayed(it)
+        }
+    }
+
     override fun onConnect(output: Consumer<UploadStatusSubmissionEvent>) = with(binding) {
         toolbar.setupAsBackButton { backPress() }
         toolbar.title = context.getString(R.string.submission)
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt
index d806afc883..5038b26674 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadEffectHandler.kt
@@ -22,6 +22,7 @@ import android.net.Uri
 import androidx.core.content.FileProvider
 import com.instructure.canvasapi2.models.postmodels.FileSubmitObject
 import com.instructure.canvasapi2.utils.exhaustive
+import com.instructure.pandautils.features.file.upload.scanner.DocumentScannerManager
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.FilePrefs
 import com.instructure.pandautils.utils.FileUploadUtils
@@ -50,7 +51,8 @@ import java.io.File
 // We need a context in this class to register receivers and to access the database
 class PickerSubmissionUploadEffectHandler(
     private val context: Context,
-    private val submissionHelper: SubmissionHelper
+    private val submissionHelper: SubmissionHelper,
+    private val documentScannerManager: DocumentScannerManager
 ) : EffectHandler<PickerSubmissionUploadView, PickerSubmissionUploadEvent, PickerSubmissionUploadEffect>() {
 
     override fun connect(output: Consumer<PickerSubmissionUploadEvent>): Connection<PickerSubmissionUploadEffect> {
@@ -94,8 +96,10 @@ class PickerSubmissionUploadEffectHandler(
                 } else if (it.requestCode == REQUEST_DOCUMENT_SCANNING) {
                     event.remove()
 
-                    if (it.data != null && it.data?.data != null) {
-                        consumer.accept(PickerSubmissionUploadEvent.OnFileSelected(it.data!!.data!!))
+                    val scanResult = documentScannerManager.handleScanResultFromIntent(it.data)
+                    val pdfUri = scanResult.pdfUri
+                    if (pdfUri != null) {
+                        consumer.accept(PickerSubmissionUploadEvent.OnFileSelected(pdfUri))
                     } else {
                         view?.showErrorMessage(R.string.unexpectedErrorOpeningFile)
                     }
@@ -115,6 +119,9 @@ class PickerSubmissionUploadEffectHandler(
             PickerSubmissionUploadEffect.LaunchSelectFile -> {
                 launchSelectFile()
             }
+            PickerSubmissionUploadEffect.LaunchScanner -> {
+                launchScanner()
+            }
             is PickerSubmissionUploadEffect.LoadFileContents -> {
                 loadFile(effect.allowedExtensions, effect.uri, context)
             }
@@ -215,6 +222,21 @@ class PickerSubmissionUploadEffectHandler(
         }
     }
 
+    private fun launchScanner() {
+        val activity = context.getFragmentActivity()
+        documentScannerManager.getStartScanIntent(activity)
+            .addOnSuccessListener { intentSender ->
+                activity.startIntentSenderForResult(
+                    intentSender,
+                    REQUEST_DOCUMENT_SCANNING,
+                    null, 0, 0, 0
+                )
+            }
+            .addOnFailureListener {
+                view?.showErrorMessage(R.string.unexpectedErrorOpeningFile)
+            }
+    }
+
     private fun launchCamera() {
         // Get camera permission if we need it
         if (needsPermissions(
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt
index 610aa66f74..8011a08e52 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadModels.kt
@@ -25,6 +25,7 @@ sealed class PickerSubmissionUploadEvent {
     object CameraClicked : PickerSubmissionUploadEvent()
     object GalleryClicked : PickerSubmissionUploadEvent()
     object SelectFileClicked : PickerSubmissionUploadEvent()
+    object ScannerClicked : PickerSubmissionUploadEvent()
     data class OnFileSelected(val uri: Uri) : PickerSubmissionUploadEvent()
     data class OnFileRemoved(val fileIndex: Int) : PickerSubmissionUploadEvent()
     data class OnFileAdded(val file: FileSubmitObject?) : PickerSubmissionUploadEvent()
@@ -34,6 +35,7 @@ sealed class PickerSubmissionUploadEffect {
     object LaunchCamera : PickerSubmissionUploadEffect()
     object LaunchGallery : PickerSubmissionUploadEffect()
     object LaunchSelectFile : PickerSubmissionUploadEffect()
+    object LaunchScanner : PickerSubmissionUploadEffect()
     data class HandleSubmit(val model: PickerSubmissionUploadModel) : PickerSubmissionUploadEffect()
     data class LoadFileContents(val uri: Uri, val allowedExtensions: List<String>) :
         PickerSubmissionUploadEffect()
@@ -51,7 +53,8 @@ data class PickerSubmissionUploadModel(
     val files: List<FileSubmitObject> = emptyList(),
     val isLoadingFile: Boolean = false,
     val attemptId: Long? = null,
-    val mediaSource: String? = null
+    val mediaSource: String? = null,
+    val scannerAvailable: Boolean = false
 )
 
 enum class PickerSubmissionMode {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadPresenter.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadPresenter.kt
index 4d2ab35dea..7a0e01db4c 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadPresenter.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadPresenter.kt
@@ -62,7 +62,8 @@ object PickerSubmissionUploadPresenter : Presenter<PickerSubmissionUploadModel,
         submit = model.files.isNotEmpty(),
         sourceFile = !model.mode.isMediaSubmission,
         sourceCamera = !model.mode.isMediaSubmission && allowsCameraImages(model.allowedExtensions),
-        sourceGallery = !model.mode.isMediaSubmission && allowsGalleryImages(model.allowedExtensions)
+        sourceGallery = !model.mode.isMediaSubmission && allowsGalleryImages(model.allowedExtensions),
+        sourceScanner = !model.mode.isMediaSubmission && model.scannerAvailable && allowsScannedDocuments(model.allowedExtensions)
     )
 
     private fun allowsCameraImages(allowedExtensions: List<String>): Boolean {
@@ -72,4 +73,8 @@ object PickerSubmissionUploadPresenter : Presenter<PickerSubmissionUploadModel,
     private fun allowsGalleryImages(allowedExtensions: List<String>): Boolean {
         return allowedExtensions.isEmpty() || allowedExtensions.any { it in listOf("png", "jpg", "jpeg", "mp4", "mov", "gif", "tiff", "bmp") }
     }
+
+    private fun allowsScannedDocuments(allowedExtensions: List<String>): Boolean {
+        return allowedExtensions.isEmpty() || allowedExtensions.any { it in listOf("pdf") }
+    }
 }
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt
index 5be56f5e1b..b171210a0d 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/PickerSubmissionUploadUpdate.kt
@@ -39,6 +39,7 @@ class PickerSubmissionUploadUpdate :
         PickerSubmissionUploadEvent.CameraClicked -> Next.next(model.copy(mediaSource = "camera"), setOf(PickerSubmissionUploadEffect.LaunchCamera))
         PickerSubmissionUploadEvent.GalleryClicked -> Next.next(model.copy(mediaSource = "library"), setOf(PickerSubmissionUploadEffect.LaunchGallery))
         PickerSubmissionUploadEvent.SelectFileClicked -> Next.next(model.copy(mediaSource = "files"), setOf(PickerSubmissionUploadEffect.LaunchSelectFile))
+        PickerSubmissionUploadEvent.ScannerClicked -> Next.next(model.copy(mediaSource = "scanner"), setOf(PickerSubmissionUploadEffect.LaunchScanner))
         is PickerSubmissionUploadEvent.OnFileSelected -> {
             Next.next(
                 model.copy(isLoadingFile = true),
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/BasePickerSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/BasePickerSubmissionUploadFragment.kt
index 7d29f79651..04d394d8f4 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/BasePickerSubmissionUploadFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/BasePickerSubmissionUploadFragment.kt
@@ -23,6 +23,7 @@ import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Course
 import com.instructure.pandautils.analytics.SCREEN_VIEW_SUBMISSION_UPLOAD_PICKER
 import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.features.file.upload.scanner.DocumentScannerManager
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.NullableParcelableArg
@@ -40,6 +41,7 @@ import com.instructure.student.mobius.assignmentDetails.submission.picker.ui.Pic
 import com.instructure.student.mobius.assignmentDetails.submission.picker.ui.PickerSubmissionUploadFragment.Companion.MEDIA_SOURCE
 import com.instructure.student.mobius.assignmentDetails.submission.picker.ui.PickerSubmissionUploadFragment.Companion.PICKER_MODE
 import com.instructure.student.mobius.common.ui.MobiusFragment
+import javax.inject.Inject
 
 @ScreenView(SCREEN_VIEW_SUBMISSION_UPLOAD_PICKER)
 abstract class BasePickerSubmissionUploadFragment :
@@ -52,6 +54,9 @@ abstract class BasePickerSubmissionUploadFragment :
     private var attemptId by LongArg(key = Const.SUBMISSION_ATTEMPT)
     private val initialMediaSource by NullableStringArg(key = MEDIA_SOURCE)
 
+    @Inject
+    lateinit var documentScannerManager: DocumentScannerManager
+
     override fun makeUpdate() = PickerSubmissionUploadUpdate()
 
     override fun makeView(inflater: LayoutInflater, parent: ViewGroup) =
@@ -68,6 +73,7 @@ abstract class BasePickerSubmissionUploadFragment :
         mode,
         mediaUri,
         attemptId = attemptId.takeIf { it != INVALID_ATTEMPT },
-        mediaSource = initialMediaSource
+        mediaSource = initialMediaSource,
+        scannerAvailable = documentScannerManager.isDeviceSupported()
     )
 }
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt
index bf9a72866f..b9db7498ca 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadFragment.kt
@@ -25,6 +25,7 @@ import com.instructure.pandautils.utils.isCourseOrGroup
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.withArgs
 import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionMode
+import com.instructure.pandautils.features.file.upload.scanner.DocumentScannerManager
 import com.instructure.student.mobius.assignmentDetails.submission.picker.PickerSubmissionUploadEffectHandler
 import com.instructure.student.mobius.common.ui.SubmissionHelper
 import dagger.hilt.android.AndroidEntryPoint
@@ -36,7 +37,7 @@ class PickerSubmissionUploadFragment : BasePickerSubmissionUploadFragment() {
     @Inject
     lateinit var submissionHelper: SubmissionHelper
 
-    override fun makeEffectHandler() = PickerSubmissionUploadEffectHandler(requireContext(), submissionHelper)
+    override fun makeEffectHandler() = PickerSubmissionUploadEffectHandler(requireContext(), submissionHelper, documentScannerManager)
 
     companion object {
 
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadView.kt
index 8a5f4cfe74..0dd557ea9f 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadView.kt
@@ -18,6 +18,7 @@ package com.instructure.student.mobius.assignmentDetails.submission.picker.ui
 
 import android.app.Activity
 import android.content.Intent
+import android.content.res.Configuration
 import android.net.Uri
 import android.provider.MediaStore
 import android.view.LayoutInflater
@@ -53,6 +54,8 @@ class PickerSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup, va
     init {
         binding.toolbar.setupAsBackButton { (context as? Activity)?.onBackPressed() }
         binding.toolbar.title = context.getString(if (mode.isForComment) R.string.commentUpload else R.string.submission)
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.sourcesContainer.applyBottomSystemBarInsets()
 
         binding.filePickerRecycler.layoutManager = LinearLayoutManager(context)
         binding.filePickerRecycler.adapter = adapter
@@ -60,6 +63,7 @@ class PickerSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup, va
 
         binding.sourceDevice.setOnClickListener { consumer?.accept(PickerSubmissionUploadEvent.SelectFileClicked) }
         binding.sourceGallery.setOnClickListener { consumer?.accept(PickerSubmissionUploadEvent.GalleryClicked) }
+        binding.sourceScanner.setOnClickListener { consumer?.accept(PickerSubmissionUploadEvent.ScannerClicked) }
     }
 
     override fun onConnect(output: Consumer<PickerSubmissionUploadEvent>) {
@@ -80,6 +84,13 @@ class PickerSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup, va
         ViewStyler.themeToolbarLight(context as Activity, binding.toolbar)
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        context.getActivityOrNull()?.let {
+            ViewStyler.setStatusBarLightDelayed(it)
+        }
+    }
+
     override fun render(state: PickerSubmissionUploadViewState) = with(binding) {
         toolbar.menu.findItem(R.id.menuSubmit).isVisible = state.visibilities.submit
         fileLoading.setVisible(state.visibilities.loading)
@@ -116,6 +127,7 @@ class PickerSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup, va
         sourceCamera.setVisible(visibilities.sourceCamera)
         sourceDevice.setVisible(visibilities.sourceFile)
         sourceGallery.setVisible(visibilities.sourceGallery)
+        sourceScanner.setVisible(visibilities.sourceScanner)
     }
 
     fun getSelectFileIntent() = Intent(Intent.ACTION_GET_CONTENT).apply {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadViewState.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadViewState.kt
index 710d32187e..0cdcfdd89a 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadViewState.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/picker/ui/PickerSubmissionUploadViewState.kt
@@ -27,6 +27,7 @@ data class PickerVisibilities(
     val sourceCamera: Boolean = false,
     val sourceGallery: Boolean = false,
     val sourceFile: Boolean = false,
+    val sourceScanner: Boolean = false,
     val submit: Boolean = false
 )
 
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadView.kt
index 449271fcd1..7151471815 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/text/ui/TextSubmissionUploadView.kt
@@ -17,6 +17,7 @@
 package com.instructure.student.mobius.assignmentDetails.submission.text.ui
 
 import android.app.Activity
+import android.content.res.Configuration
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -26,6 +27,9 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.pandautils.utils.MediaUploadUtils
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.getActivityOrNull
 import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setVisible
 import com.instructure.pandautils.utils.setupAsBackButton
@@ -51,6 +55,8 @@ class TextSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup) :
     init {
         binding.toolbar.setupAsBackButton { (context as? Activity)?.onBackPressed() }
         binding.toolbar.title = context.getString(R.string.textEntry)
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.rce.applyBottomSystemBarInsets()
     }
 
     override fun onConnect(output: Consumer<TextSubmissionUploadEvent>) = with(binding) {
@@ -102,6 +108,13 @@ class TextSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup) :
         ViewStyler.themeToolbarLight(context as Activity, binding.toolbar)
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        context.getActivityOrNull()?.let {
+            ViewStyler.setStatusBarLightDelayed(it)
+        }
+    }
+
     fun setInitialSubmissionText(text: String?) {
         initialText = text
         binding.rce.setHtml(text ?: "", context.getString(R.string.textEntry), context.getString(R.string.submissionWrite), ThemePrefs.brandColor, ThemePrefs.textButtonColor)
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadView.kt
index b3e36dd319..e31a5aae66 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submission/url/ui/UrlSubmissionUploadView.kt
@@ -16,9 +16,14 @@
 package com.instructure.student.mobius.assignmentDetails.submission.url.ui
 
 import android.app.Activity
+import android.content.res.Configuration
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.webkit.WebViewClient
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.getActivityOrNull
 import com.instructure.pandautils.utils.onChangeDebounce
 import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setVisible
@@ -37,6 +42,8 @@ class UrlSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup) : Mob
     init {
         binding.toolbar.setupAsBackButton { (context as? Activity)?.onBackPressed() }
         binding.toolbar.title = context.getString(R.string.websiteUrl)
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.urlPreviewWebView.applyBottomSystemBarInsets()
 
         binding.urlPreviewWebView.webViewClient = WebViewClient()
         binding.urlPreviewWebView.settings.javaScriptEnabled = true
@@ -68,7 +75,17 @@ class UrlSubmissionUploadView(inflater: LayoutInflater, parent: ViewGroup) : Mob
     }
 
     override fun onDispose() {}
-    override fun applyTheme() {}
+
+    override fun applyTheme() {
+        ViewStyler.themeToolbarLight(context as Activity, binding.toolbar)
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        context.getActivityOrNull()?.let {
+            ViewStyler.setStatusBarLightDelayed(it)
+        }
+    }
 
     fun showPreviewUrl(url: String) {
         binding.urlPreviewWebView.setVisible()
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/PdfStudentSubmissionView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/PdfStudentSubmissionView.kt
index 33915716ac..8bb0699361 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/PdfStudentSubmissionView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/content/PdfStudentSubmissionView.kt
@@ -48,8 +48,9 @@ import com.instructure.student.R
 import com.instructure.student.databinding.ViewPdfStudentSubmissionBinding
 import com.instructure.student.router.RouteMatcher
 import com.pspdfkit.preferences.PSPDFKitPreferences
+import com.pspdfkit.ui.annotations.OnAnnotationCreationModeChangeListener
+import com.pspdfkit.ui.annotations.OnAnnotationEditingModeChangeListener
 import com.pspdfkit.ui.inspector.PropertyInspectorCoordinatorLayout
-import com.pspdfkit.ui.special_mode.manager.AnnotationManager
 import com.pspdfkit.ui.toolbar.ToolbarCoordinatorLayout
 import kotlinx.coroutines.Job
 import okhttp3.ResponseBody
@@ -67,7 +68,7 @@ class PdfStudentSubmissionView(
     private val studentAnnotationView: Boolean = false,
 ) : PdfSubmissionView(
     activity, studentAnnotationView, courseId
-), AnnotationManager.OnAnnotationCreationModeChangeListener, AnnotationManager.OnAnnotationEditingModeChangeListener {
+), OnAnnotationCreationModeChangeListener, OnAnnotationEditingModeChangeListener {
 
     private val binding: ViewPdfStudentSubmissionBinding
 
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricDescriptionFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricDescriptionFragment.kt
index 0e12c066bd..0c6f4c85a2 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricDescriptionFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/drawer/rubric/ui/SubmissionRubricDescriptionFragment.kt
@@ -16,6 +16,7 @@
  */
 package com.instructure.student.mobius.assignmentDetails.submissionDetails.drawer.rubric.ui
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -26,7 +27,15 @@ import com.instructure.pandautils.base.BaseCanvasDialogFragment
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.interactions.router.Route
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsBackButton
+import com.instructure.pandautils.utils.withArgs
 import com.instructure.pandautils.views.CanvasWebView
 import com.instructure.student.R
 import com.instructure.student.activity.InternalWebViewActivity
@@ -53,6 +62,7 @@ class SubmissionRubricDescriptionFragment : BaseCanvasDialogFragment() {
         with (binding) {
             toolbar.title = title
             toolbar.setupAsBackButton(this@SubmissionRubricDescriptionFragment)
+            toolbar.applyTopSystemBarInsets()
             ViewStyler.themeToolbarLight(requireActivity(), toolbar)
 
             // Show progress bar while loading description
@@ -92,11 +102,18 @@ class SubmissionRubricDescriptionFragment : BaseCanvasDialogFragment() {
             // make the WebView background transparent
             webView.setBackgroundResource(android.R.color.transparent)
 
+            webView.applyBottomSystemBarInsets()
+
             // Load description
             webView.loadHtml(description, title)
         }
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        ViewStyler.setStatusBarLightDelayed(requireActivity())
+    }
+
     companion object {
 
         fun makeRoute(title: String, description: String): Route {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt
index 5c6e57e0fb..cdbbbb2247 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/assignmentDetails/submissionDetails/ui/SubmissionDetailsView.kt
@@ -42,6 +42,8 @@ import com.instructure.pandautils.binding.BindableSpinnerAdapter
 import com.instructure.pandautils.features.assignmentdetails.AssignmentDetailsAttemptItemViewModel
 import com.instructure.pandautils.features.assignmentdetails.AssignmentDetailsAttemptViewData
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyImeAndSystemBarMargin
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.asStateList
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.hideKeyboard
@@ -110,6 +112,7 @@ class SubmissionDetailsView(
     }
 
     init {
+        binding.toolbar.applyTopSystemBarInsets()
         binding.toolbar.setupAsBackButton { activity.onBackPressed() }
         binding.retryButton.onClick { consumer?.accept(SubmissionDetailsEvent.RefreshRequested) }
         binding.drawerViewPager.offscreenPageLimit = 3
@@ -117,6 +120,8 @@ class SubmissionDetailsView(
         configureDrawerTabLayout()
         configureSlidingPanelHeight()
 
+        binding.slidingUpPanelLayout.applyImeAndSystemBarMargin()
+
         if (isAccessibilityEnabled(context)) {
             binding.slidingUpPanelLayout.anchorPoint = 1.0f
         }
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt
index 6b56a89e2c..f47f659810 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/common/ui/MobiusFragment.kt
@@ -18,6 +18,7 @@ package com.instructure.student.mobius.common.ui
 
 import android.app.Activity
 import android.content.Context
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -151,6 +152,11 @@ abstract class MobiusFragment<MODEL, EVENT, EFFECT, VIEW : MobiusView<VIEW_STATE
         effectHandler.cancel()
         super.onDestroy()
     }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        view.onConfigurationChanged(newConfig)
+    }
 }
 
 abstract class UpdateInit<MODEL, EVENT, EFFECT> : Update<MODEL, EVENT, EFFECT>, Init<MODEL, EFFECT>,
@@ -230,6 +236,8 @@ abstract class MobiusView<VIEW_STATE, EVENT, BINDING: ViewBinding>(inflater: Lay
     fun releaseBinding() {
         _binding = null
     }
+
+    open fun onConfigurationChanged(newConfig: Configuration) = Unit
 }
 
 interface Presenter<MODEL, VIEW_STATE> {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_details/ui/ConferenceDetailsView.kt b/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_details/ui/ConferenceDetailsView.kt
index 525d5391aa..a472dcb972 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_details/ui/ConferenceDetailsView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_details/ui/ConferenceDetailsView.kt
@@ -24,6 +24,10 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
+import androidx.core.view.updatePadding
 import com.google.android.material.snackbar.Snackbar
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.pandautils.utils.ViewStyler
@@ -50,6 +54,24 @@ class ConferenceDetailsView(val canvasContext: CanvasContext, inflater: LayoutIn
     init {
         binding.toolbar.setupAsBackButton { (context as? Activity)?.onBackPressed() }
         binding.toolbar.subtitle = canvasContext.name
+
+        // Apply top system bar insets for edge-to-edge support
+        ViewCompat.setOnApplyWindowInsetsListener(binding.toolbar) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(top = systemBars.top)
+            insets
+        }
+        ViewCompat.requestApplyInsets(binding.toolbar)
+
+        // Apply bottom system bar insets to join container using margin
+        ViewCompat.setOnApplyWindowInsetsListener(binding.joinContainer) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                bottomMargin = systemBars.bottom
+            }
+            insets
+        }
+        ViewCompat.requestApplyInsets(binding.joinContainer)
     }
 
     override fun applyTheme() {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt b/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt
index 7bb9d6daf8..ae5c5aba7a 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/conferences/conference_list/ui/ConferenceListView.kt
@@ -29,6 +29,8 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Conference
 import com.instructure.canvasapi2.utils.exhaustive
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.asChooserExcludingInstructure
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.items
@@ -59,6 +61,8 @@ class ConferenceListView(
     init {
         binding.toolbar.setupAsBackButton { (context as? Activity)?.onBackPressed() }
         binding.toolbar.subtitle = canvasContext.name
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.recyclerView.applyBottomSystemBarInsets()
 
         // Set up menu
         with(binding.toolbar.menu.add(0, R.id.openExternallyButton, 0, R.string.openInBrowser)) {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/elementary/ElementaryDashboardFragment.kt b/apps/student/src/main/java/com/instructure/student/mobius/elementary/ElementaryDashboardFragment.kt
index a9ae53a5a2..95c167dd8c 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/elementary/ElementaryDashboardFragment.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/elementary/ElementaryDashboardFragment.kt
@@ -20,6 +20,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.google.android.material.tabs.TabLayout
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.interactions.router.Route
@@ -33,6 +35,7 @@ import com.instructure.pandautils.features.elementary.resources.ResourcesFragmen
 import com.instructure.pandautils.features.elementary.schedule.pager.SchedulePagerFragment
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.student.R
@@ -60,6 +63,7 @@ class ElementaryDashboardFragment : ParentFragment() {
 
     override fun applyTheme() {
         binding.toolbar.title = title()
+        binding.toolbar.applyTopSystemBarInsets()
         navigation?.attachNavigationDrawer(this, binding.toolbar)
     }
 
@@ -81,6 +85,24 @@ class ElementaryDashboardFragment : ParentFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         dashboardPager.adapter = ElementaryDashboardPagerAdapter(fragments, childFragmentManager)
+
+        // Consume bottom insets so child fragments don't apply them
+        // The Canvas bottom navigation bar handles bottom spacing at the activity level
+        ViewCompat.setOnApplyWindowInsetsListener(dashboardPager) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.navigationBars(),
+                    androidx.core.graphics.Insets.of(
+                        navigationBars.left,
+                        navigationBars.top,
+                        navigationBars.right,
+                        0 // Consume bottom insets
+                    )
+                )
+                .build()
+        }
+
         dashboardTabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
             override fun onTabReselected(tab: TabLayout.Tab?) = Unit
 
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt b/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt
index 3595c5e834..a859eade63 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/settings/pairobserver/ui/PairObserverView.kt
@@ -42,6 +42,7 @@ class PairObserverView(inflater: LayoutInflater, parent: ViewGroup) :
 
     init {
         binding.toolbar.setupAsBackButton { (context as? Activity)?.onBackPressed() }
+        binding.toolbar.applyTopSystemBarInsets()
     }
 
     override fun applyTheme() {
diff --git a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt
index fecfb4604b..98eb5a379c 100644
--- a/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt
+++ b/apps/student/src/main/java/com/instructure/student/mobius/syllabus/ui/SyllabusView.kt
@@ -19,6 +19,8 @@ package com.instructure.student.mobius.syllabus.ui
 import android.app.Activity
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.FragmentActivity
 import com.google.android.material.tabs.TabLayout
 import com.instructure.canvasapi2.models.CanvasContext
@@ -75,12 +77,57 @@ class SyllabusView(
         binding.toolbar.title = context.getString(com.instructure.pandares.R.string.syllabus)
         binding.toolbar.subtitle = canvasContext.name
 
+        setupWindowInsets()
+
         adapter = SyllabusTabAdapter(activity, canvasContext, getTabTitles())
 
         binding.syllabusPager.adapter = adapter
         binding.syllabusTabLayout.setupWithViewPager(binding.syllabusPager, true)
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.toolbar) { view, insets ->
+            val statusBars = insets.getInsets(WindowInsetsCompat.Type.statusBars())
+            view.setPadding(
+                view.paddingLeft,
+                statusBars.top,
+                view.paddingRight,
+                view.paddingBottom
+            )
+            insets
+        }
+    }
+
+    private fun setupRecyclerViewInsets() {
+        eventsBinding?.syllabusEventsRecycler?.let { recyclerView ->
+            ViewCompat.setOnApplyWindowInsetsListener(recyclerView) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.setPadding(
+                    view.paddingLeft,
+                    view.paddingTop,
+                    view.paddingRight,
+                    systemBars.bottom
+                )
+                insets
+            }
+        }
+    }
+
+    private fun setupWebViewInsets() {
+        webviewBinding?.syllabusScrollView?.let { scrollView ->
+            ViewCompat.setOnApplyWindowInsetsListener(scrollView) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.setPadding(
+                    view.paddingLeft,
+                    view.paddingTop,
+                    view.paddingRight,
+                    systemBars.bottom
+                )
+                insets
+            }
+        }
+    }
+
     override fun applyTheme() {
         ViewStyler.themeToolbarColored(context as Activity, binding.toolbar, canvasContext)
         binding.syllabusTabLayout.setBackgroundColor(canvasContext.color)
@@ -98,6 +145,8 @@ class SyllabusView(
     override fun render(state: SyllabusViewState) {
         webviewBinding = adapter.webviewBinding
         eventsBinding = adapter.eventsBinding
+        setupRecyclerViewInsets()
+        setupWebViewInsets()
         when (state) {
             SyllabusViewState.Loading -> {
                 binding.swipeRefreshLayout.isRefreshing = true
diff --git a/apps/student/src/main/java/com/instructure/student/util/DefaultAppShortcutManager.kt b/apps/student/src/main/java/com/instructure/student/util/DefaultAppShortcutManager.kt
index e7fc5117f7..24d1135d35 100644
--- a/apps/student/src/main/java/com/instructure/student/util/DefaultAppShortcutManager.kt
+++ b/apps/student/src/main/java/com/instructure/student/util/DefaultAppShortcutManager.kt
@@ -53,8 +53,8 @@ class DefaultAppShortcutManager : AppShortcutManager {
         todoIntent.action = AppShortcutManager.ACTION_APP_SHORTCUT
         todoIntent.putExtra(AppShortcutManager.APP_SHORTCUT_PLACEMENT, AppShortcutManager.APP_SHORTCUT_TODO)
         val shortcutTodo = createShortcut(context, AppShortcutManager.APP_SHORTCUT_TODO,
-            context.getString(R.string.toDoList),
-            context.getString(R.string.toDoList),
+            context.getString(R.string.toDoListNew),
+            context.getString(R.string.toDoListNew),
             R.mipmap.ic_shortcut_todo,
             todoIntent)
 
diff --git a/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt b/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt
index 1e34d0599f..647d7adba7 100644
--- a/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt
+++ b/apps/student/src/main/java/com/instructure/student/util/FileUtils.kt
@@ -21,11 +21,12 @@ import android.content.Context
 import android.net.Uri
 import androidx.annotation.IntegerRes
 import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.pandautils.features.shareextension.ShareFileSubmissionTarget
 import com.instructure.pandautils.loaders.OpenMediaAsyncTaskLoader
+import com.instructure.pandautils.utils.Const
 import com.instructure.student.R
 import com.instructure.student.activity.CandroidPSPDFActivity
-import com.instructure.pandautils.features.shareextension.ShareFileSubmissionTarget
-import com.pspdfkit.PSPDFKit
+import com.pspdfkit.Nutrient
 import com.pspdfkit.annotations.AnnotationType
 import com.pspdfkit.configuration.activity.PdfActivityConfiguration
 import com.pspdfkit.configuration.activity.ThumbnailBarMode
@@ -73,6 +74,7 @@ object FileUtils {
             pspdfActivityConfiguration = PdfActivityConfiguration.Builder(context)
                 .scrollDirection(PageScrollDirection.HORIZONTAL)
                 .setThumbnailBarMode(ThumbnailBarMode.THUMBNAIL_BAR_MODE_PINNED)
+                .contentEditingEnabled(false)
                 .fitMode(PageFitMode.FIT_TO_WIDTH)
                 .build()
         } else {
@@ -82,17 +84,18 @@ object FileUtils {
                 .setDocumentInfoViewSeparated(false)
                 .enabledAnnotationTools(annotationCreationList)
                 .editableAnnotationTypes(annotationEditList)
+                .contentEditingEnabled(false)
                 .fitMode(PageFitMode.FIT_TO_WIDTH)
                 .build()
         }
 
-        if (PSPDFKit.isOpenableUri(context, uri)) {
+        if (Nutrient.isOpenableUri(context, uri)) {
             val intent = PdfActivityIntentBuilder
                 .fromUri(context, uri)
                 .configuration(pspdfActivityConfiguration)
                 .activityClass(CandroidPSPDFActivity::class.java)
                 .build()
-            intent.putExtra(com.instructure.pandautils.utils.Const.SUBMISSION_TARGET, submissionTarget)
+            intent.putExtra(Const.SUBMISSION_TARGET, submissionTarget)
             context.startActivity(intent)
         } else {
             //If we still can't open this PDF, we will then attempt to pass it off to the user's pdfviewer
diff --git a/apps/student/src/main/java/com/instructure/student/widget/grades/courseselector/CourseSelectorActivity.kt b/apps/student/src/main/java/com/instructure/student/widget/grades/courseselector/CourseSelectorActivity.kt
index ab5eb0fa55..a2072fe0a8 100644
--- a/apps/student/src/main/java/com/instructure/student/widget/grades/courseselector/CourseSelectorActivity.kt
+++ b/apps/student/src/main/java/com/instructure/student/widget/grades/courseselector/CourseSelectorActivity.kt
@@ -21,6 +21,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.collectAsState
@@ -63,6 +64,7 @@ class CourseSelectorActivity : BaseCanvasActivity() {
         setContent {
             val uiState by viewModel.uiState.collectAsState()
             Scaffold(
+                contentWindowInsets = WindowInsets(0, 0, 0, 0),
                 topBar = {
                     CanvasThemedAppBar(
                         title = stringResource(R.string.selectCourse),
diff --git a/apps/student/src/main/java/com/instructure/student/widget/todo/ToDoWidget.kt b/apps/student/src/main/java/com/instructure/student/widget/todo/ToDoWidget.kt
index 9de5e83aa2..1782a017b9 100644
--- a/apps/student/src/main/java/com/instructure/student/widget/todo/ToDoWidget.kt
+++ b/apps/student/src/main/java/com/instructure/student/widget/todo/ToDoWidget.kt
@@ -127,7 +127,7 @@ class ToDoWidget : GlanceAppWidget() {
             WidgetFloatingActionButton(
                 alignment = Alignment.TopEnd,
                 imageRes = R.drawable.ic_canvas_logo_student,
-                contentDescriptionRes = R.string.a11y_widgetToDoOpenToDoList,
+                contentDescriptionRes = R.string.a11y_widgetToDoOpenToDoListNew,
                 backgroundColor = WidgetColors.textDanger,
                 tintColor = WidgetColors.textLightest,
                 onClickAction =
@@ -161,7 +161,7 @@ class ToDoWidget : GlanceAppWidget() {
                     WidgetFloatingActionButton(
                         alignment = Alignment.BottomEnd,
                         imageRes = R.drawable.ic_add_lined,
-                        contentDescriptionRes = R.string.a11y_widgetToDoCreateNewToDo,
+                        contentDescriptionRes = R.string.a11y_widgetToDoCreateNewToDoNew,
                         backgroundColor = ColorProvider(
                             color = Color(color = ThemePrefs.buttonColor)
                         ),
diff --git a/apps/student/src/main/res/layout/activity_navigation.xml b/apps/student/src/main/res/layout/activity_navigation.xml
index cdbdefd661..0c007a90f3 100644
--- a/apps/student/src/main/res/layout/activity_navigation.xml
+++ b/apps/student/src/main/res/layout/activity_navigation.xml
@@ -57,16 +57,24 @@
             android:layout_height="1dp"
             android:background="@color/backgroundLight" />
 
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/bottomBar"
+        <FrameLayout
+            android:id="@+id/bottomBarContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="48dp"
-            android:background="@color/backgroundLightestElevated"
-            app:elevation="0dp"
-            app:itemIconTint="@color/textDarkest"
-            app:itemTextColor="@color/textDarkest"
-            app:labelVisibilityMode="labeled" />
+            android:layout_height="56dp"
+            android:background="@color/backgroundLightestElevated">
+
+            <com.google.android.material.bottomnavigation.BottomNavigationView
+                android:id="@+id/bottomBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp"
+                android:background="@color/backgroundLightestElevated"
+                app:elevation="0dp"
+                app:itemIconTint="@color/textDarkest"
+                app:itemTextColor="@color/textDarkest"
+                app:labelVisibilityMode="labeled" />
+
+        </FrameLayout>
 
     </LinearLayout>
 
diff --git a/apps/student/src/main/res/layout/course_discussion_topic.xml b/apps/student/src/main/res/layout/course_discussion_topic.xml
index cc09febe77..821d9032c9 100644
--- a/apps/student/src/main/res/layout/course_discussion_topic.xml
+++ b/apps/student/src/main/res/layout/course_discussion_topic.xml
@@ -28,7 +28,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/discussionListToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:elevation="6dp"
             app:popupTheme="@style/ToolBarPopupStyle"
             app:theme="@style/ToolBarStyle"
diff --git a/apps/student/src/main/res/layout/fragment_account_preferences.xml b/apps/student/src/main/res/layout/fragment_account_preferences.xml
index 6639ea862b..0a34e80897 100644
--- a/apps/student/src/main/res/layout/fragment_account_preferences.xml
+++ b/apps/student/src/main/res/layout/fragment_account_preferences.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@android:color/white"
         android:elevation="2dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/student/src/main/res/layout/fragment_annotation_comment_list.xml b/apps/student/src/main/res/layout/fragment_annotation_comment_list.xml
index cbf55c5541..0fc84cc53c 100644
--- a/apps/student/src/main/res/layout/fragment_annotation_comment_list.xml
+++ b/apps/student/src/main/res/layout/fragment_annotation_comment_list.xml
@@ -26,6 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:ignore="UnusedAttribute"/>
 
diff --git a/apps/student/src/main/res/layout/fragment_annotation_submission_upload.xml b/apps/student/src/main/res/layout/fragment_annotation_submission_upload.xml
index 93d623aa1e..7bbf44ed92 100644
--- a/apps/student/src/main/res/layout/fragment_annotation_submission_upload.xml
+++ b/apps/student/src/main/res/layout/fragment_annotation_submission_upload.xml
@@ -30,7 +30,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/annotationSubmissionToolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:elevation="6dp"
             app:layout_constraintTop_toTopOf="parent">
 
diff --git a/apps/student/src/main/res/layout/fragment_assignment_basic.xml b/apps/student/src/main/res/layout/fragment_assignment_basic.xml
index 4ba981c087..28168b9ad8 100644
--- a/apps/student/src/main/res/layout/fragment_assignment_basic.xml
+++ b/apps/student/src/main/res/layout/fragment_assignment_basic.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/student/src/main/res/layout/fragment_bookmarks_fragment.xml b/apps/student/src/main/res/layout/fragment_bookmarks_fragment.xml
index 981bf47666..121e2b43a3 100644
--- a/apps/student/src/main/res/layout/fragment_bookmarks_fragment.xml
+++ b/apps/student/src/main/res/layout/fragment_bookmarks_fragment.xml
@@ -25,7 +25,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@android:color/white"
         android:elevation="2dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/student/src/main/res/layout/fragment_course_browser.xml b/apps/student/src/main/res/layout/fragment_course_browser.xml
index 1db95041a2..3372dfa192 100644
--- a/apps/student/src/main/res/layout/fragment_course_browser.xml
+++ b/apps/student/src/main/res/layout/fragment_course_browser.xml
@@ -25,7 +25,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/noOverlayToolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle" />
 
@@ -155,6 +156,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:cacheColorHint="@android:color/transparent"
+                    android:clipToPadding="false"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
diff --git a/apps/student/src/main/res/layout/fragment_course_grades.xml b/apps/student/src/main/res/layout/fragment_course_grades.xml
index 36d85c1c43..76f9cd4027 100644
--- a/apps/student/src/main/res/layout/fragment_course_grades.xml
+++ b/apps/student/src/main/res/layout/fragment_course_grades.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_course_grid.xml b/apps/student/src/main/res/layout/fragment_course_grid.xml
index ba1358ac0a..f9f56499f3 100644
--- a/apps/student/src/main/res/layout/fragment_course_grid.xml
+++ b/apps/student/src/main/res/layout/fragment_course_grid.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_course_settings.xml b/apps/student/src/main/res/layout/fragment_course_settings.xml
index dd2dc98341..45e4714e3b 100644
--- a/apps/student/src/main/res/layout/fragment_course_settings.xml
+++ b/apps/student/src/main/res/layout/fragment_course_settings.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
@@ -35,6 +36,7 @@
         tools:targetApi="lollipop"/>
 
     <ScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/toolbar">
diff --git a/apps/student/src/main/res/layout/fragment_discussions_details.xml b/apps/student/src/main/res/layout/fragment_discussions_details.xml
index 4c86a44f4e..78eade94fd 100644
--- a/apps/student/src/main/res/layout/fragment_discussions_details.xml
+++ b/apps/student/src/main/res/layout/fragment_discussions_details.xml
@@ -33,6 +33,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:elevation="6dp"
             tools:background="#00bcd5"
             tools:ignore="UnusedAttribute" />
diff --git a/apps/student/src/main/res/layout/fragment_edit_page.xml b/apps/student/src/main/res/layout/fragment_edit_page.xml
index 88a4f2fb50..cc046ac2fe 100644
--- a/apps/student/src/main/res/layout/fragment_edit_page.xml
+++ b/apps/student/src/main/res/layout/fragment_edit_page.xml
@@ -23,6 +23,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp">
 
         <ProgressBar
diff --git a/apps/student/src/main/res/layout/fragment_elementary_course.xml b/apps/student/src/main/res/layout/fragment_elementary_course.xml
index da3ef57a14..493d7e0a21 100644
--- a/apps/student/src/main/res/layout/fragment_elementary_course.xml
+++ b/apps/student/src/main/res/layout/fragment_elementary_course.xml
@@ -46,7 +46,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/actionBarSize"
                 android:background="@color/textDarkest"
                 android:elevation="6dp"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/apps/student/src/main/res/layout/fragment_elementary_dashboard.xml b/apps/student/src/main/res/layout/fragment_elementary_dashboard.xml
index 4737a7ab3a..e73a9a9376 100644
--- a/apps/student/src/main/res/layout/fragment_elementary_dashboard.xml
+++ b/apps/student/src/main/res/layout/fragment_elementary_dashboard.xml
@@ -35,7 +35,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:background="@color/textDarkest"
             android:elevation="6dp"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/apps/student/src/main/res/layout/fragment_feature_flags.xml b/apps/student/src/main/res/layout/fragment_feature_flags.xml
index 8cb1e4217a..d7cfb5c9bb 100644
--- a/apps/student/src/main/res/layout/fragment_feature_flags.xml
+++ b/apps/student/src/main/res/layout/fragment_feature_flags.xml
@@ -25,6 +25,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightest"
         android:elevation="6dp"
         app:title="@string/featureFlagsTitle"
diff --git a/apps/student/src/main/res/layout/fragment_file_details.xml b/apps/student/src/main/res/layout/fragment_file_details.xml
index ff70ecc370..ef37333aba 100644
--- a/apps/student/src/main/res/layout/fragment_file_details.xml
+++ b/apps/student/src/main/res/layout/fragment_file_details.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         app:layout_constraintTop_toTopOf="parent"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_file_list.xml b/apps/student/src/main/res/layout/fragment_file_list.xml
index 34ed8d2005..cd3b164cc9 100644
--- a/apps/student/src/main/res/layout/fragment_file_list.xml
+++ b/apps/student/src/main/res/layout/fragment_file_list.xml
@@ -28,7 +28,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_file_search.xml b/apps/student/src/main/res/layout/fragment_file_search.xml
index d4c3143733..298532259a 100644
--- a/apps/student/src/main/res/layout/fragment_file_search.xml
+++ b/apps/student/src/main/res/layout/fragment_file_search.xml
@@ -24,7 +24,8 @@
     <LinearLayout
         android:id="@+id/searchHeader"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:orientation="horizontal">
 
         <ImageButton
diff --git a/apps/student/src/main/res/layout/fragment_list_notification.xml b/apps/student/src/main/res/layout/fragment_list_notification.xml
index 91a88686fd..568e20455b 100644
--- a/apps/student/src/main/res/layout/fragment_list_notification.xml
+++ b/apps/student/src/main/res/layout/fragment_list_notification.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_list_todo.xml b/apps/student/src/main/res/layout/fragment_list_todo.xml
index 7c5d4d0d29..5ea65c005e 100644
--- a/apps/student/src/main/res/layout/fragment_list_todo.xml
+++ b/apps/student/src/main/res/layout/fragment_list_todo.xml
@@ -25,7 +25,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_locked_module_item.xml b/apps/student/src/main/res/layout/fragment_locked_module_item.xml
index 1fab7e7cad..ae4d4a13e2 100644
--- a/apps/student/src/main/res/layout/fragment_locked_module_item.xml
+++ b/apps/student/src/main/res/layout/fragment_locked_module_item.xml
@@ -27,6 +27,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         app:layout_constraintTop_toTopOf="parent"
         tools:background="#00bcd5"
         tools:title="Ecosystem Health and Human Well-Being"
diff --git a/apps/student/src/main/res/layout/fragment_module_list.xml b/apps/student/src/main/res/layout/fragment_module_list.xml
index b79a75b07d..799efc10db 100644
--- a/apps/student/src/main/res/layout/fragment_module_list.xml
+++ b/apps/student/src/main/res/layout/fragment_module_list.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_module_quiz_decider.xml b/apps/student/src/main/res/layout/fragment_module_quiz_decider.xml
index c3b1e991de..fd4e926467 100644
--- a/apps/student/src/main/res/layout/fragment_module_quiz_decider.xml
+++ b/apps/student/src/main/res/layout/fragment_module_quiz_decider.xml
@@ -25,7 +25,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_not_available_offline.xml b/apps/student/src/main/res/layout/fragment_not_available_offline.xml
index 1e71fc297a..607a78655b 100644
--- a/apps/student/src/main/res/layout/fragment_not_available_offline.xml
+++ b/apps/student/src/main/res/layout/fragment_not_available_offline.xml
@@ -27,6 +27,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         app:layout_constraintTop_toTopOf="parent"
         tools:background="#00bcd5"
         tools:title="Ecosystem Health and Human Well-Being"
diff --git a/apps/student/src/main/res/layout/fragment_nothing_to_see_here.xml b/apps/student/src/main/res/layout/fragment_nothing_to_see_here.xml
index 2f12420272..f09e9e561f 100644
--- a/apps/student/src/main/res/layout/fragment_nothing_to_see_here.xml
+++ b/apps/student/src/main/res/layout/fragment_nothing_to_see_here.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@android:color/white"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/student/src/main/res/layout/fragment_pair_observer.xml b/apps/student/src/main/res/layout/fragment_pair_observer.xml
index de3d307ed1..b75e2bab06 100644
--- a/apps/student/src/main/res/layout/fragment_pair_observer.xml
+++ b/apps/student/src/main/res/layout/fragment_pair_observer.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightest"
         android:elevation="2dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/student/src/main/res/layout/fragment_people_list.xml b/apps/student/src/main/res/layout/fragment_people_list.xml
index 9ea5495b29..fa7f25fe70 100644
--- a/apps/student/src/main/res/layout/fragment_people_list.xml
+++ b/apps/student/src/main/res/layout/fragment_people_list.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/fragment_picker_submission_upload.xml b/apps/student/src/main/res/layout/fragment_picker_submission_upload.xml
index 73b14a4553..7e3c5c6c15 100644
--- a/apps/student/src/main/res/layout/fragment_picker_submission_upload.xml
+++ b/apps/student/src/main/res/layout/fragment_picker_submission_upload.xml
@@ -160,6 +160,36 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/sourceScanner"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <ImageView
+                android:id="@+id/sourceScannerIcon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:importantForAccessibility="no"
+                android:tint="@color/textInfo"
+                app:srcCompat="@drawable/ic_scan"/>
+
+            <TextView
+                android:id="@+id/sourceScannerLabel"
+                style="@style/TextFont.Regular"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/fromDocumentScanning"
+                android:textColor="@color/textInfo"
+                android:textSize="12sp"/>
+
+        </LinearLayout>
+
     </LinearLayout>
 
     <ProgressBar
diff --git a/apps/student/src/main/res/layout/fragment_profile_settings.xml b/apps/student/src/main/res/layout/fragment_profile_settings.xml
index 42436b2072..57827ebd74 100644
--- a/apps/student/src/main/res/layout/fragment_profile_settings.xml
+++ b/apps/student/src/main/res/layout/fragment_profile_settings.xml
@@ -27,7 +27,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@android:color/white"
         android:elevation="2dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/student/src/main/res/layout/fragment_submission_rubric_description.xml b/apps/student/src/main/res/layout/fragment_submission_rubric_description.xml
index 93103e82f4..68ac8aef68 100644
--- a/apps/student/src/main/res/layout/fragment_submission_rubric_description.xml
+++ b/apps/student/src/main/res/layout/fragment_submission_rubric_description.xml
@@ -24,6 +24,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         tools:navigationIcon="@drawable/ic_back_arrow"
         tools:title="Rubric Criterion Title"/>
diff --git a/apps/student/src/main/res/layout/fragment_syllabus.xml b/apps/student/src/main/res/layout/fragment_syllabus.xml
index e854156095..dcfb8b597a 100644
--- a/apps/student/src/main/res/layout/fragment_syllabus.xml
+++ b/apps/student/src/main/res/layout/fragment_syllabus.xml
@@ -27,6 +27,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
         android:elevation="6dp"
         tools:background="#00bcd5"
         tools:navigationIcon="@drawable/ic_back_arrow"
diff --git a/apps/student/src/main/res/layout/fragment_syllabus_events.xml b/apps/student/src/main/res/layout/fragment_syllabus_events.xml
index 413be35314..3a9d5f98f1 100644
--- a/apps/student/src/main/res/layout/fragment_syllabus_events.xml
+++ b/apps/student/src/main/res/layout/fragment_syllabus_events.xml
@@ -24,6 +24,7 @@
         android:id="@+id/syllabusEventsRecycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
         tools:listitem="@layout/viewholder_card_generic"
         tools:visibility="gone" />
 
diff --git a/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml b/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml
index c42c459331..ee4ec05891 100644
--- a/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml
+++ b/apps/student/src/main/res/layout/fragment_unsupported_file_type.xml
@@ -24,6 +24,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:ignore="UnusedAttribute"/>
 
diff --git a/apps/student/src/main/res/layout/fragment_webview.xml b/apps/student/src/main/res/layout/fragment_webview.xml
index 0dd387ac12..f09362c697 100644
--- a/apps/student/src/main/res/layout/fragment_webview.xml
+++ b/apps/student/src/main/res/layout/fragment_webview.xml
@@ -27,7 +27,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/layout/panda_image.xml b/apps/student/src/main/res/layout/panda_image.xml
index d8551e8d31..cec6d13a89 100644
--- a/apps/student/src/main/res/layout/panda_image.xml
+++ b/apps/student/src/main/res/layout/panda_image.xml
@@ -27,7 +27,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         app:theme="@style/ToolBarStyle"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/student/src/main/res/layout/quiz_list_layout.xml b/apps/student/src/main/res/layout/quiz_list_layout.xml
index 4ce23cbc5a..95883d4c8c 100644
--- a/apps/student/src/main/res/layout/quiz_list_layout.xml
+++ b/apps/student/src/main/res/layout/quiz_list_layout.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="@color/textDarkest"
         android:elevation="6dp"
diff --git a/apps/student/src/main/res/menu/bottom_bar_menu.xml b/apps/student/src/main/res/menu/bottom_bar_menu.xml
index 3e18617bd3..6c2f3b97ae 100644
--- a/apps/student/src/main/res/menu/bottom_bar_menu.xml
+++ b/apps/student/src/main/res/menu/bottom_bar_menu.xml
@@ -39,7 +39,7 @@
         android:id="@+id/bottomNavigationToDo"
         android:enabled="true"
         android:icon="@drawable/bottom_nav_todo"
-        android:title="@string/Todo"
+        android:title="@string/TodoNew"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction"/>
 
diff --git a/apps/student/src/main/res/menu/bottom_bar_menu_elementary.xml b/apps/student/src/main/res/menu/bottom_bar_menu_elementary.xml
index d4885b30ed..b34d19fd04 100644
--- a/apps/student/src/main/res/menu/bottom_bar_menu_elementary.xml
+++ b/apps/student/src/main/res/menu/bottom_bar_menu_elementary.xml
@@ -39,7 +39,7 @@
         android:id="@+id/bottomNavigationToDo"
         android:enabled="true"
         android:icon="@drawable/bottom_nav_todo"
-        android:title="@string/Todo"
+        android:title="@string/TodoNew"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction"/>
 
diff --git a/apps/student/src/main/res/values-night/styles.xml b/apps/student/src/main/res/values-night/styles.xml
index 5dfac1c73f..eb2fb7e728 100644
--- a/apps/student/src/main/res/values-night/styles.xml
+++ b/apps/student/src/main/res/values-night/styles.xml
@@ -38,7 +38,6 @@
         <item name="pspdf__annotationCreationToolbarIconsStyle">@style/PSPDFAnnotationCreationToolbarIconsStyle</item>
         <item name="pspdf__actionBarIconsStyle">@style/PSPDFKitActionBarIconsStyle</item>
         <item name="pspdf__contextualToolbarStyle">@style/ContextualToolbarStyle</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/apps/student/src/main/res/values/styles.xml b/apps/student/src/main/res/values/styles.xml
index 93466a1d23..0c05c17652 100644
--- a/apps/student/src/main/res/values/styles.xml
+++ b/apps/student/src/main/res/values/styles.xml
@@ -25,7 +25,6 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="Theme.Transparent.NoAnimationOrBackground" parent="CanvasMaterialTheme_Default">
@@ -36,7 +35,6 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
         <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <!-- Used for stand alone PSPDFKit activity, pdf fragment uses values in CanvasMaterialTheme_Default-->
@@ -52,7 +50,6 @@
         <item name="pspdf__annotationCreationToolbarIconsStyle">@style/PSPDFAnnotationCreationToolbarIconsStyle</item>
         <item name="pspdf__actionBarIconsStyle">@style/PSPDFKitActionBarIconsStyle</item>
         <item name="pspdf__contextualToolbarStyle">@style/ContextualToolbarStyle</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="PSPDFKitActionBarIconsStyle">
@@ -90,7 +87,7 @@
 
     <style name="StampPickerStyle">
         <item name="pspdf__maxHeight">380dp</item>
-        <item name="pspdf__maxWidth">100dp</item>
+        <item name="pspdf__maxWidth">200dp</item>
         <item name="pspdf__backgroundColor">@color/backgroundLightest</item>
     </style>
 
diff --git a/apps/student/src/main/res/values/themes_canvastheme.xml b/apps/student/src/main/res/values/themes_canvastheme.xml
index bf1dbf3405..d3af28925c 100755
--- a/apps/student/src/main/res/values/themes_canvastheme.xml
+++ b/apps/student/src/main/res/values/themes_canvastheme.xml
@@ -26,6 +26,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@color/darkStatusBarColor</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowBackground">@color/backgroundLightest</item>
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
@@ -45,7 +46,6 @@
         <item name="pspdf__annotationNoteHinterStyle">@style/AnnotationNoteHinter</item>
         <item name="pspdf__backgroundColor">@color/backgroundLight</item>
         <item name="android:datePickerStyle">@style/DatePickerStyle</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="CanvasMaterialTheme_Default.Translucent">
@@ -58,7 +58,6 @@
         <item name="editTextStyle">@style/NoGifEditText</item>
         <item name="android:alertDialogTheme">@style/CanvasDialogTheme_Default</item>
         <item name="alertDialogTheme">@style/CanvasDialogTheme_Default</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
 </resources>
diff --git a/apps/student/src/main/res/xml/todo_widget_info.xml b/apps/student/src/main/res/xml/todo_widget_info.xml
index 02ea1b7c5f..cb23e17a00 100644
--- a/apps/student/src/main/res/xml/todo_widget_info.xml
+++ b/apps/student/src/main/res/xml/todo_widget_info.xml
@@ -18,7 +18,7 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:initialKeyguardLayout="@layout/widget_initial_layout"
     android:initialLayout="@layout/widget_initial_layout"
-    android:label="@string/Todo"
+    android:label="@string/TodoNew"
     android:minWidth="200dp"
     android:minHeight="110dp"
     android:previewImage="@drawable/widget_preview_todo_light"
diff --git a/apps/student/src/qa/AndroidManifest.xml b/apps/student/src/qa/AndroidManifest.xml
index d98941d859..546b398971 100644
--- a/apps/student/src/qa/AndroidManifest.xml
+++ b/apps/student/src/qa/AndroidManifest.xml
@@ -24,6 +24,11 @@
 
     <application tools:ignore="GoogleAppIndexingWarning">
 
+        <meta-data
+            android:name="nutrient_automatic_initialize"
+            android:value="true"
+            tools:replace="android:value" />
+
         <activity android:name=".SingleFragmentTestActivity" />
 
     </application>
diff --git a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadEffectHandlerTest.kt b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadEffectHandlerTest.kt
index ce1fe893fe..3b196fbcae 100644
--- a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadEffectHandlerTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadEffectHandlerTest.kt
@@ -23,6 +23,7 @@ import androidx.core.content.FileProvider
 import androidx.fragment.app.FragmentActivity
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.postmodels.FileSubmitObject
+import com.instructure.pandautils.features.file.upload.scanner.DocumentScannerManager
 import com.instructure.pandautils.utils.ActivityResult
 import com.instructure.pandautils.utils.FilePrefs
 import com.instructure.pandautils.utils.FileUploadUtils
@@ -64,7 +65,8 @@ class PickerSubmissionUploadEffectHandlerTest : Assert() {
     private val view: PickerSubmissionUploadView = mockk(relaxed = true)
     private val eventConsumer: Consumer<PickerSubmissionUploadEvent> = mockk(relaxed = true)
     private val submissionHelper: SubmissionHelper = mockk(relaxed = true)
-    private val effectHandler = PickerSubmissionUploadEffectHandler(context, submissionHelper)
+    private val documentScannerManager: DocumentScannerManager = mockk(relaxed = true)
+    private val effectHandler = PickerSubmissionUploadEffectHandler(context, submissionHelper, documentScannerManager)
     private val connection = effectHandler.connect(eventConsumer)
 
     @ExperimentalCoroutinesApi
diff --git a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadUpdateTest.kt b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadUpdateTest.kt
index 94c79d1652..cb7141df87 100644
--- a/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadUpdateTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/test/assignment/details/submission/PickerSubmissionUploadUpdateTest.kt
@@ -168,6 +168,22 @@ class PickerSubmissionUploadUpdateTest : Assert() {
             )
     }
 
+    @Test
+    fun `ScannerClicked event results in LaunchScanner effect`() {
+        val expectedModel = initModel.copy(mediaSource = "scanner")
+        updateSpec
+            .given(initModel)
+            .whenEvent(PickerSubmissionUploadEvent.ScannerClicked)
+            .then(
+                assertThatNext(
+                    NextMatchers.hasModel(expectedModel),
+                    matchesEffects<PickerSubmissionUploadModel, PickerSubmissionUploadEffect>(
+                        PickerSubmissionUploadEffect.LaunchScanner
+                    )
+                )
+            )
+    }
+
     @Test
     fun `OnFileAdded event results in model change to files`() {
         val startModel = initModel.copy(files = emptyList(), isLoadingFile = true)
diff --git a/apps/student/src/test/java/com/instructure/student/test/util/ModuleUtilityTest.kt b/apps/student/src/test/java/com/instructure/student/test/util/ModuleUtilityTest.kt
index d4c052a9ea..5d9de87bec 100644
--- a/apps/student/src/test/java/com/instructure/student/test/util/ModuleUtilityTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/test/util/ModuleUtilityTest.kt
@@ -330,6 +330,7 @@ class ModuleUtilityTest : TestCase() {
         val course = Course()
         val expectedBundle = Bundle()
         expectedBundle.putParcelable(Const.CANVAS_CONTEXT, course)
+        expectedBundle.putBoolean("isInModulesPager", false)
         expectedBundle.putLong(DiscussionDetailsFragment.DISCUSSION_TOPIC_HEADER_ID, 123456789)
         val parentFragment = callGetFragment(moduleItem, course, null)
         assertNotNull(parentFragment)
diff --git a/apps/student/src/test/java/com/instructure/student/widget/todo/ToDoWidgetUpdaterTest.kt b/apps/student/src/test/java/com/instructure/student/widget/todo/ToDoWidgetUpdaterTest.kt
index 7eb273ea72..011f095036 100644
--- a/apps/student/src/test/java/com/instructure/student/widget/todo/ToDoWidgetUpdaterTest.kt
+++ b/apps/student/src/test/java/com/instructure/student/widget/todo/ToDoWidgetUpdaterTest.kt
@@ -71,7 +71,7 @@ class ToDoWidgetUpdaterTest {
         ContextKeeper.appContext = mockk(relaxed = true)
         mockkObject(DateHelper)
         every { DateHelper.getPreferredTimeFormat(any()) } returns SimpleDateFormat("HH:mm", Locale.getDefault())
-        every { context.getString(R.string.userCalendarToDo) } returns "To Do"
+        every { context.getString(R.string.userCalendarToDoNew) } returns "To Do"
         every { context.getString(R.string.widgetAllDay) } returns "All day"
 
         // Set up default mocks
diff --git a/apps/teacher/build.gradle b/apps/teacher/build.gradle
index d0af2eb124..a1c38e1e1c 100644
--- a/apps/teacher/build.gradle
+++ b/apps/teacher/build.gradle
@@ -51,8 +51,8 @@ android {
     defaultConfig {
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 88
-        versionName = '2.4.0'
+        versionCode = 90
+        versionName = '2.5.1'
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner 'com.instructure.teacher.espresso.TeacherHiltTestRunner'
         testInstrumentationRunnerArguments disableAnalytics: 'true'
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/DiscussionsE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/DiscussionsE2ETest.kt
index 9ef7a23056..ff63057fcd 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/DiscussionsE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/DiscussionsE2ETest.kt
@@ -20,19 +20,25 @@ import android.util.Log
 import androidx.test.espresso.Espresso
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.SecondaryFeatureCategory
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.dataseeding.api.DiscussionTopicsApi
-import com.instructure.teacher.ui.utils.TeacherTest
+import com.instructure.espresso.getCustomDateCalendar
+import com.instructure.teacher.ui.utils.TeacherComposeTest
 import com.instructure.teacher.ui.utils.extensions.seedData
 import com.instructure.teacher.ui.utils.extensions.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
 import java.lang.Thread.sleep
+import java.text.SimpleDateFormat
+import java.util.Locale
+import java.util.TimeZone
 
 @HiltAndroidTest
-class DiscussionsE2ETest : TeacherTest() {
+class DiscussionsE2ETest : TeacherComposeTest() {
 
     override fun displaysPageObjects() = Unit
 
@@ -196,4 +202,107 @@ class DiscussionsE2ETest : TeacherTest() {
         discussionsListPage.assertDiscussionCount(1)
         discussionsListPage.assertHasDiscussion(discussion3.title)
     }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.DISCUSSIONS, TestCategory.E2E, SecondaryFeatureCategory.DISCUSSION_CHECKPOINTS)
+    fun testDiscussionCheckpointsCalendarE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        val discussionWithCheckpointsTitle = "Test Discussion with Checkpoints"
+        val assignmentName = "Test Assignment with Checkpoints"
+
+        Log.d(PREPARATION_TAG, "Convert dates to match with different formats in different screens (Calendar, Assignment Details)")
+        val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US).apply {
+            timeZone = TimeZone.getTimeZone("UTC")
+        }
+        val calendarDisplayFormat = SimpleDateFormat(" MMM d 'at' h:mm a", Locale.US)
+        val replyToTopicCalendar = getCustomDateCalendar(2)
+        val replyToEntryCalendar = getCustomDateCalendar(4)
+        val replyToTopicDueDate = dateFormat.format(replyToTopicCalendar.time)
+        val replyToEntryDueDate = dateFormat.format(replyToEntryCalendar.time)
+
+        Log.d(PREPARATION_TAG, "Seed a discussion topic with checkpoints for '${course.name}' course.")
+        DiscussionTopicsApi.createDiscussionTopicWithCheckpoints(course.id, teacher.token, discussionWithCheckpointsTitle, assignmentName, replyToTopicDueDate, replyToEntryDueDate)
+
+        val convertedReplyToTopicDueDate = calendarDisplayFormat.format(replyToTopicCalendar.time)
+        val convertedReplyToEntryDueDate = calendarDisplayFormat.format(replyToEntryCalendar.time)
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Click on the 'Calendar' bottom menu to navigate to the Calendar page.")
+        dashboardPage.openCalendar()
+
+        Log.d(STEP_TAG, "Navigate forward 2 days to the 'Reply to Topic' checkpoint due date.")
+        calendarScreenPage.swipeEventsLeft(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the '$discussionWithCheckpointsTitle Reply to Topic' checkpoint is displayed on its due date on the Calendar Page.")
+        calendarScreenPage.assertItemDetails("$discussionWithCheckpointsTitle Reply to Topic", course.name, "Due$convertedReplyToTopicDueDate")
+
+        Log.d(STEP_TAG, "Select the '$discussionWithCheckpointsTitle Reply to Topic' event and navigate back to the Calendar Page.")
+        calendarScreenPage.clickOnItem("$discussionWithCheckpointsTitle Reply to Topic")
+
+        Log.d(ASSERTION_TAG, "Assert that the assignment details page is displayed with the correct assignment name.")
+        assignmentDetailsPage.waitForRender()
+        assignmentDetailsPage.assertAssignmentName(discussionWithCheckpointsTitle)
+
+        Log.d(STEP_TAG, "Click on the 'Due Dates' section to navigate to the Due Dates page.")
+        assignmentDetailsPage.openDueDatesPage()
+
+        Log.d(ASSERTION_TAG, "Assert that 2 due dates are visible on the Due Dates page.")
+        assignmentDueDatesPage.assertDueDatesCount(2)
+
+        Log.d(ASSERTION_TAG, "Assert first due date is with date '$convertedReplyToTopicDueDate'.")
+        assignmentDueDatesPage.assertDueDateTime(convertedReplyToTopicDueDate)
+
+        Log.d(ASSERTION_TAG, "Assert second due date is with date '$convertedReplyToEntryDueDate'.")
+        assignmentDueDatesPage.assertDueDateTime(convertedReplyToEntryDueDate)
+
+        Log.d(STEP_TAG, "Navigate back to the Calendar Page.")
+        pressBackButton(2)
+
+        Log.d(STEP_TAG, "Navigate forward 2 more days to the 'Required Replies' checkpoint due date.")
+        calendarScreenPage.swipeEventsLeft(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the '$discussionWithCheckpointsTitle Required Replies (2)' checkpoint is displayed on its due date on the Calendar Page.")
+        calendarScreenPage.assertItemDetails("$discussionWithCheckpointsTitle Required Replies (2)", course.name, "Due$convertedReplyToEntryDueDate")
+
+        Log.d(STEP_TAG, "Select the '$discussionWithCheckpointsTitle Required Replies (2)' event and navigate back to the Calendar Page.")
+        calendarScreenPage.clickOnItem("$discussionWithCheckpointsTitle Required Replies (2)")
+
+        Log.d(ASSERTION_TAG, "Assert that the assignment details page is displayed with the correct assignment name.")
+        assignmentDetailsPage.waitForRender()
+        assignmentDetailsPage.assertAssignmentName(discussionWithCheckpointsTitle)
+
+        Log.d(ASSERTION_TAG, "Assert that the assignment details page is displayed with the correct assignment name.")
+        assignmentDetailsPage.waitForRender()
+        assignmentDetailsPage.assertAssignmentName(discussionWithCheckpointsTitle)
+
+        Log.d(STEP_TAG, "Click on the 'Due Dates' section to navigate to the Due Dates page.")
+        assignmentDetailsPage.openDueDatesPage()
+
+        Log.d(ASSERTION_TAG, "Assert that 2 due dates are visible on the Due Dates page.")
+        assignmentDueDatesPage.assertDueDatesCount(2)
+
+        Log.d(ASSERTION_TAG, "Assert first due date is with date '$convertedReplyToTopicDueDate'.")
+        assignmentDueDatesPage.assertDueDateTime(convertedReplyToTopicDueDate)
+
+        Log.d(ASSERTION_TAG, "Assert second due date is with date '$convertedReplyToEntryDueDate'.")
+        assignmentDueDatesPage.assertDueDateTime(convertedReplyToEntryDueDate)
+
+        Log.d(STEP_TAG, "Navigate back to the Calendar Page.")
+        pressBackButton(2)
+
+        Log.d(STEP_TAG, "Navigate back 2 days to the 'Reply to Topic' checkpoint due date.")
+        calendarScreenPage.swipeEventsRight(2)
+
+        Log.d(ASSERTION_TAG, "Assert that the '$discussionWithCheckpointsTitle Reply to Topic' checkpoint is displayed on its due date on the Calendar Page.")
+        calendarScreenPage.assertItemDetails("$discussionWithCheckpointsTitle Reply to Topic", course.name, "Due$convertedReplyToTopicDueDate")
+    }
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/FilesE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/FilesE2ETest.kt
index 2e2c61adc4..0e6e422a88 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/FilesE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/FilesE2ETest.kt
@@ -20,8 +20,11 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.pdf.PdfDocument
 import android.os.Environment
+import android.os.SystemClock.sleep
 import android.util.Log
+import androidx.media3.ui.R
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.intent.Intents
 import androidx.test.uiautomator.UiSelector
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
@@ -40,6 +43,8 @@ import com.instructure.dataseeding.api.SubmissionsApi
 import com.instructure.dataseeding.model.FileUploadType
 import com.instructure.dataseeding.model.SubmissionType
 import com.instructure.dataseeding.util.Randomizer
+import com.instructure.espresso.getVideoPosition
+import com.instructure.espresso.retryWithIncreasingDelay
 import com.instructure.espresso.triggerWorkManagerJobs
 import com.instructure.teacher.ui.utils.TeacherComposeTest
 import com.instructure.teacher.ui.utils.extensions.seedData
@@ -350,4 +355,148 @@ class FilesE2ETest: TeacherComposeTest() {
         speedGraderPage.assertCommentsLabelDisplayed(1)
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.FILES, TestCategory.E2E)
+    fun testVideoFileUploadE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+        val videoFileName = "test_video.mp4"
+
+        Log.d(PREPARATION_TAG, "Setup the '$videoFileName' file on the device.")
+        setupFileOnDevice(videoFileName)
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Navigate to the global 'Files' Page from the left side menu.")
+        leftSideNavigationDrawerPage.clickFilesMenu()
+
+        Log.d(STEP_TAG, "Click on the 'Add' (+) icon and after that on the 'Upload File' icon.")
+        fileListPage.clickAddButton()
+        fileListPage.clickUploadFileButton()
+
+        Log.d(PREPARATION_TAG, "Simulate file picker intent for '$videoFileName'.")
+        Intents.init()
+        try {
+            stubFilePickerIntent(videoFileName)
+            fileChooserPage.chooseDevice()
+        } finally {
+            Intents.release()
+        }
+
+        Log.d(STEP_TAG, "Click on the 'Upload' button.")
+        fileChooserPage.clickUpload()
+
+        Log.d(ASSERTION_TAG, "Assert that '$videoFileName' is displayed in My Files after the upload.")
+        retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = {
+            triggerWorkManagerJobs("FileUploadWorker", 20000)
+        }) {
+            fileListPage.assertItemDisplayed(videoFileName)
+        }
+
+        Log.d(STEP_TAG, "Click on '$videoFileName' to open it.")
+        fileListPage.selectItem(videoFileName)
+
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
+
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        var firstVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        var secondVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+
+        Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
+        pressBackButton(2)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open '${course.name}' course and navigate to the Files tab.")
+        dashboardPage.openCourse(course.name)
+        courseBrowserPage.openFilesTab()
+
+        Log.d(STEP_TAG, "Click on the 'Add' (+) icon and after that on the 'Upload File' icon.")
+        fileListPage.clickAddButton()
+        fileListPage.clickUploadFileButton()
+
+        Log.d(PREPARATION_TAG, "Simulate file picker intent for '$videoFileName'.")
+        Intents.init()
+        try {
+            stubFilePickerIntent(videoFileName)
+            fileChooserPage.chooseDevice()
+        } finally {
+            Intents.release()
+        }
+
+        Log.d(STEP_TAG, "Click on the 'Upload' button.")
+        fileChooserPage.clickUpload()
+
+        Log.d(ASSERTION_TAG, "Assert that '$videoFileName' is displayed in course files after the upload.")
+        retryWithIncreasingDelay(times = 10, maxDelay = 3000, catchBlock = {
+            triggerWorkManagerJobs("FileUploadWorker", 20000)
+        }) {
+            fileListPage.assertItemDisplayed(videoFileName)
+        }
+
+        Log.d(STEP_TAG, "Click on '$videoFileName' to open it.")
+        fileListPage.selectItem(videoFileName)
+
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
+
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        firstVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        secondVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/LoginE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/LoginE2ETest.kt
index aed1c65b2d..008090edc2 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/LoginE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/LoginE2ETest.kt
@@ -16,8 +16,11 @@
  */
 package com.instructure.teacher.ui.e2e.classic
 
+import android.app.Instrumentation
 import android.util.Log
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.SecondaryFeatureCategory
@@ -204,13 +207,15 @@ class LoginE2ETest : TeacherTest() {
 
     @E2E
     @Test
+    @Stub("MBL-19866")
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.E2E)
     fun testInvalidAndEmptyLoginCredentialsE2E() {
 
         val INVALID_USERNAME = "invalidusercred@test.com"
         val INVALID_PASSWORD = "invalidpw"
-        val INVALID_CREDENTIALS_ERROR_MESSAGE = "Please verify your username or password and try again. Trouble logging in? Check out our Login FAQs."
-        val NO_PASSWORD_GIVEN_ERROR_MESSAGE = "No password was given"
+        val INVALID_CREDENTIALS_ERROR_MESSAGE = "Please verify your email or password and try again."
+        val NO_EMAIL_GIVEN_ERROR_MESSAGE = "Please enter your email."
+        val NO_PASSWORD_GIVEN_ERROR_MESSAGE = "Please enter your password."
         val DOMAIN = "mobileqa.beta"
 
         Log.d(STEP_TAG, "Click 'Find My School' button.")
@@ -222,29 +227,32 @@ class LoginE2ETest : TeacherTest() {
         Log.d(STEP_TAG, "Click on 'Next' button on the Toolbar.")
         loginFindSchoolPage.clickToolbarNextMenuItem()
 
-        Log.d(STEP_TAG, "Try to login with invalid, non-existing credentials: '$INVALID_USERNAME', '$INVALID_PASSWORD'.")
+        /* Somehow React does not recognize the invalid credentials, need to be fixed in follow-up ticket
+        Log.d(STEP_TAG, "Try to login with invalid, non-existing credentials ('$INVALID_USERNAME', '$INVALID_PASSWORD').")
         loginSignInPage.loginAs(INVALID_USERNAME, INVALID_PASSWORD)
 
         Log.d(ASSERTION_TAG, "Assert that the invalid credentials error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE)
+        loginSignInPage.assertLoginEmailErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE) // Invalid credentials error message will be displayed within the email error message holder on the login page.
+        */
 
         Log.d(STEP_TAG, "Try to login with no credentials typed in either of the username and password field.")
         loginSignInPage.loginAs(EMPTY_STRING, EMPTY_STRING)
 
-        Log.d(ASSERTION_TAG, "Assert that the no password was given error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
+        Log.d(ASSERTION_TAG, "Assert that the no email and no password error messages are displayed.")
+        loginSignInPage.assertLoginEmailErrorMessage(NO_EMAIL_GIVEN_ERROR_MESSAGE)
+        loginSignInPage.assertLoginPasswordErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
 
         Log.d(STEP_TAG, "Try to login with leaving only the password field empty.")
         loginSignInPage.loginAs(INVALID_USERNAME, EMPTY_STRING)
 
         Log.d(ASSERTION_TAG, "Assert that the no password was given error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
+        loginSignInPage.assertLoginEmailErrorMessage(NO_PASSWORD_GIVEN_ERROR_MESSAGE)
 
         Log.d(STEP_TAG, "Try to login with leaving only the username field empty.")
         loginSignInPage.loginAs(EMPTY_STRING, INVALID_PASSWORD)
 
-        Log.d(ASSERTION_TAG, "Assert that the invalid credentials error message is displayed.")
-        loginSignInPage.assertLoginErrorMessage(INVALID_CREDENTIALS_ERROR_MESSAGE)
+        Log.d(ASSERTION_TAG, "Assert that the no email error message is displayed.")
+        loginSignInPage.assertLoginEmailErrorMessage(NO_EMAIL_GIVEN_ERROR_MESSAGE) // Invalid credentials error message will be displayed within the email error message holder on the login page.
     }
 
     @Test
@@ -299,6 +307,36 @@ class LoginE2ETest : TeacherTest() {
         loginSignInPage.assertPageObjects()
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginHowDoIFindMySchoolE2E() {
+
+        Log.d(STEP_TAG, "Click 'Find My School' button.")
+        loginLandingPage.clickFindMySchoolButton()
+
+        Log.d(STEP_TAG, "Enter and invalid domain to trigger the 'Tap here for login help.' link to be displayed.")
+        loginFindSchoolPage.enterDomain("invalid-domain")
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Tap here for login help.' link is displayed.")
+        loginFindSchoolPage.assertHowDoIFindMySchoolLinkDisplayed()
+
+        val expectedUrl = "https://community.instructure.com/en/kb/articles/662717-where-do-i-find-my-institutions-url-to-access-canvas"
+        val expectedIntent = IntentMatchers.hasData(expectedUrl)
+        Intents.init()
+        try {
+            Intents.intending(expectedIntent).respondWith(Instrumentation.ActivityResult(0, null))
+
+            Log.d(STEP_TAG, "Click on the 'Tap here for login help.' link.")
+            loginFindSchoolPage.clickOnHowDoIFindMySchoolLink()
+
+            Log.d(ASSERTION_TAG, "Assert that an intent with the correct URL was fired.")
+            Intents.intended(expectedIntent)
+        } finally {
+            Intents.release()
+        }
+    }
+
     private fun loginWithUser(user: CanvasUserApiModel, lastSchoolSaved: Boolean = false) {
 
         if(lastSchoolSaved) {
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/PeopleE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/PeopleE2ETest.kt
index 170841f22f..90b94db5ec 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/PeopleE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/PeopleE2ETest.kt
@@ -30,6 +30,8 @@ import com.instructure.dataseeding.model.SubmissionType
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
+import com.instructure.espresso.retryWithIncreasingDelay
+import com.instructure.teacher.R
 import com.instructure.teacher.ui.pages.classic.PeopleListPage
 import com.instructure.teacher.ui.pages.classic.PersonContextPage
 import com.instructure.teacher.ui.utils.TeacherComposeTest
@@ -246,4 +248,96 @@ class PeopleE2ETest: TeacherComposeTest() {
         inboxPage.assertHasConversation()
      }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.COMMON, FeatureCategory.PEOPLE, TestCategory.E2E)
+    fun testHiddenGradeDisplaysBothBeforeAndAfterGradesE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(teachers = 1, courses = 1, students = 1, favoriteCourses = 1)
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+        val student = data.studentsList[0]
+
+        Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.")
+        val assignments = seedAssignments(
+            courseId = course.id,
+            dueAt = 1.days.fromNow.iso8601,
+            submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY),
+            teacherToken = teacher.token,
+            pointsPossible = 15.0
+        )
+
+        Log.d(PREPARATION_TAG, "Seed a submission for '${assignments[0].name}' assignment with '${student.name}' student.")
+        seedAssignmentSubmission(
+            submissionSeeds = listOf(SubmissionsApi.SubmissionSeedInfo(
+                amount = 1,
+                submissionType = SubmissionType.ONLINE_TEXT_ENTRY
+            )),
+            assignmentId = assignments[0].id,
+            courseId = course.id,
+            studentToken = student.token
+        )
+
+        Log.d(PREPARATION_TAG, "Grade the previously seeded submission for '${student.name}' student.")
+        SubmissionsApi.gradeSubmission(teacher.token, course.id, assignments[0].id, student.id, postedGrade = "15")
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open '${course.name}' course and navigate to People tab.")
+        dashboardPage.openCourse(course.name)
+        courseBrowserPage.openPeopleTab()
+
+        Log.d(STEP_TAG, "Click on '${student.name}' student.")
+        peopleListPage.clickPerson(student)
+
+        Log.d(ASSERTION_TAG, "Assert that only 1 grade box is shown while the grade is posted: 'Grade before posting' shows '100.0' (current grade) and 'Grade after posting' container is not visible since both values are equal.")
+        studentContextPage.assertStudentGrade("100.0")
+        studentContextPage.assertGradeAfterPostingNotDisplayed()
+
+        Log.d(STEP_TAG, "Navigate back to the Course Browser Page.")
+        pressBackButton(2)
+
+        Log.d(STEP_TAG, "Navigate to Assignments tab.")
+        courseBrowserPage.openAssignmentsTab()
+
+        Log.d(STEP_TAG, "Click on '${assignments[0].name}' assignment.")
+        assignmentListPage.clickAssignment(assignments[0])
+
+        Log.d(STEP_TAG, "Open (all) submissions.")
+        assignmentDetailsPage.clickAllSubmissions()
+
+        Log.d(STEP_TAG, "Click on 'Post Policies' (eye) icon.")
+        assignmentSubmissionListPage.clickOnPostPolicies()
+
+        Log.d(STEP_TAG, "Click on 'Hide Grades' tab.")
+        postSettingsPage.clickOnTab(R.string.hideGradesTab)
+
+        Log.d(ASSERTION_TAG, "Assert that there is 1 grade which is currently posted.")
+        postSettingsPage.assertPostPolicyStatusCount(1, false)
+
+        Log.d(STEP_TAG, "Click on 'Hide Grades' button. It will automatically navigate back to the Assignment Submission List Page.")
+        postSettingsPage.clickOnHideGradesButton()
+
+        Log.d(ASSERTION_TAG, "Assert that the hide grades (eye) icon is displayed next to '${student.name}'.")
+        retryWithIncreasingDelay(initialDelay = 500, maxDelay = 5000, times = 5) {
+            assignmentSubmissionListPage.assertGradesHidden(student.name)
+        }
+
+        Log.d(STEP_TAG, "Navigate back to Course Browser Page.")
+        pressBackButton(3)
+
+        Log.d(STEP_TAG, "Navigate to People tab.")
+        courseBrowserPage.openPeopleTab()
+
+        Log.d(STEP_TAG, "Click on '${student.name}' student.")
+        peopleListPage.clickPerson(student)
+
+        Log.d(ASSERTION_TAG, "Assert that both grade boxes are now shown: 'Grade before posting' shows '--' (what students currently see since the grade is hidden) and 'Grade after posting' shows '100.0' (what they will see once the grade is posted).")
+        studentContextPage.assertStudentGrade("--")
+        studentContextPage.assertStudentGradeAfterPosting("100.0")
+    }
+
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/TodoE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/TodoE2ETest.kt
index 6c918e2bc8..5cec37a8e2 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/TodoE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/TodoE2ETest.kt
@@ -65,11 +65,11 @@ class TodoE2ETest : TeacherTest() {
         tokenLogin(teacher)
         dashboardPage.waitForRender()
 
-        Log.d(STEP_TAG, "Navigate to 'To Do' Page.")
+        Log.d(STEP_TAG, "Navigate to 'To-do' Page.")
         dashboardPage.openTodo()
         todoPage.waitForRender()
 
-        Log.d(ASSERTION_TAG, "Assert that the empty view is displayed because there are no To Do items yet.")
+        Log.d(ASSERTION_TAG, "Assert that the empty view is displayed because there are no To-do items yet.")
         todoPage.assertEmptyView()
 
         Log.d(PREPARATION_TAG, "Seed a submission for '${testAssignment.name}' assignment with '${student.name}' student.")
@@ -90,7 +90,7 @@ class TodoE2ETest : TeacherTest() {
 
         // region Make seeded quiz published manually
 
-        // We need to make the seeded quiz manually published because if we seed it published by default, seeding a submission for it will be automatically 'Graded' status so won't be displayed among the 'To Do' items.
+        // We need to make the seeded quiz manually published because if we seed it published by default, seeding a submission for it will be automatically 'Graded' status so won't be displayed among the 'To-do' items.
         Log.d(STEP_TAG, "Click on the '${testQuiz.title}' quiz.")
         quizListPage.clickQuiz(testQuiz.title)
 
@@ -112,30 +112,30 @@ class TodoE2ETest : TeacherTest() {
         Log.d(STEP_TAG, "Navigate back to the Dashboard Page.")
         pressBackButton(3)
 
-        Log.d(STEP_TAG, "Navigate to 'To Do' Page.")
+        Log.d(STEP_TAG, "Navigate to 'To-do' Page.")
         dashboardPage.openTodo()
         todoPage.waitForRender()
 
-        Log.d(ASSERTION_TAG, "Assert that the previously seeded '${testAssignment.name}' assignment is displayed as a To Do element for the '${course.name}' course." +
+        Log.d(ASSERTION_TAG, "Assert that the previously seeded '${testAssignment.name}' assignment is displayed as a To-do element for the '${course.name}' course." +
                 "Assert that the '1 Needs Grading' text is under the corresponding assignment's details.")
         todoPage.assertTodoElementDetailsDisplayed(course.name, testAssignment.name)
         todoPage.assertNeedsGradingCountOfTodoElement(assignments[0].name, 1)
 
-        Log.d(ASSERTION_TAG, "Assert that the previously seeded '${testQuiz.title}' quiz is displayed as a To Do element for the '${course.name}' course." +
+        Log.d(ASSERTION_TAG, "Assert that the previously seeded '${testQuiz.title}' quiz is displayed as a To-do element for the '${course.name}' course." +
                 "Assert that the '1 Needs Grading' text is under the corresponding quiz's details.")
         todoPage.assertTodoElementDetailsDisplayed(course.name, testQuiz.title)
         todoPage.assertNeedsGradingCountOfTodoElement(testQuiz.title, 1)
 
-        Log.d(ASSERTION_TAG, "Assert that the 'To Do' element count is 2, since we have a quiz and an assignment which needs to be graded.")
+        Log.d(ASSERTION_TAG, "Assert that the 'To-do' element count is 2, since we have a quiz and an assignment which needs to be graded.")
         todoPage.assertTodoElementCount(2)
 
         Log.d(PREPARATION_TAG, "Grade the previously seeded '${testAssignment.name}' assignment for '${student.name}' student.")
         SubmissionsApi.gradeSubmission(teacher.token, course.id, testAssignment.id, student.id, postedGrade = "15")
 
-        Log.d(STEP_TAG, "Refresh the To Do Page.")
+        Log.d(STEP_TAG, "Refresh the To-do Page.")
         todoPage.refresh()
 
-        Log.d(ASSERTION_TAG, "Assert that the 'To Do' element count is 1, since we just graded the '${testAssignment.id}' assignment but we haven't graded the '${testQuiz.title}' quiz yet.")
+        Log.d(ASSERTION_TAG, "Assert that the 'To-do' element count is 1, since we just graded the '${testAssignment.id}' assignment but we haven't graded the '${testQuiz.title}' quiz yet.")
         todoPage.assertTodoElementCount(1)
     }
 
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/AssignmentE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/AssignmentE2ETest.kt
index 6752bf9d98..3a2b100dab 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/AssignmentE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/AssignmentE2ETest.kt
@@ -16,8 +16,11 @@
  */
 package com.instructure.teacher.ui.e2e.compose
 
+import android.os.SystemClock.sleep
 import android.util.Log
+import androidx.media3.ui.R
 import androidx.test.espresso.Espresso
+import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
@@ -27,6 +30,7 @@ import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
 import com.instructure.canvas.espresso.refresh
 import com.instructure.dataseeding.api.AssignmentsApi
+import com.instructure.dataseeding.api.FileUploadsApi
 import com.instructure.dataseeding.api.SectionsApi
 import com.instructure.dataseeding.api.SubmissionsApi
 import com.instructure.dataseeding.model.FileUploadType
@@ -35,6 +39,7 @@ import com.instructure.dataseeding.model.SubmissionType
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
+import com.instructure.espresso.getVideoPosition
 import com.instructure.espresso.retryWithIncreasingDelay
 import com.instructure.espresso.triggerWorkManagerJobs
 import com.instructure.teacher.ui.utils.TeacherComposeTest
@@ -434,12 +439,71 @@ class AssignmentE2ETest : TeacherComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
         speedGraderPage.assertMediaCommentPreviewDisplayed()
 
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the audio.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current audio position.")
+        val firstAudioPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First audio position: $firstAudioPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume audio playback, wait for audio to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the audio position again.")
+        val secondAudioPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second audio position: $secondAudioPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the audio position has changed, confirming audio is playing.")
+        assert(firstAudioPositionText != secondAudioPositionText) {
+            "Audio position did not change. First: $firstAudioPositionText, Second: $secondAudioPositionText"
+        }
+
         Log.d(STEP_TAG, "Navigate back. Click on the previously uploaded video comment.")
         Espresso.pressBack()
         speedGraderPage.clickOnMediaComment("Media Upload - Video")
 
         Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
         speedGraderPage.assertMediaCommentPreviewDisplayed()
+
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        val firstVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        val secondVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+
+        Log.d(STEP_TAG, "Navigate back to SpeedGrader.")
+        Espresso.pressBack()
     }
 
     @E2E
@@ -663,4 +727,96 @@ class AssignmentE2ETest : TeacherComposeTest() {
         assignmentSubmissionListPage.assertHasStudentSubmission(student2)
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.E2E)
+    fun testVideoFileUploadSubmissionE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, teachers = 1, courses = 1)
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+
+        Log.d(PREPARATION_TAG, "Seeding 'File Upload' assignment for '${course.name}' course.")
+        val videoUploadAssignment = AssignmentsApi.createAssignment(
+            AssignmentsApi.CreateAssignmentRequest(
+                courseId = course.id,
+                submissionTypes = listOf(SubmissionType.ONLINE_UPLOAD),
+                gradingType = GradingType.POINTS,
+                teacherToken = teacher.token,
+                pointsPossible = 15.0,
+                dueAt = 1.days.fromNow.iso8601
+            )
+        )
+
+        Log.d(PREPARATION_TAG, "Upload the mp4 file from assets as an assignment submission file.")
+        val videoFileName = "test_video.mp4"
+        val videoFileBytes = InstrumentationRegistry.getInstrumentation().context.assets.open(videoFileName).readBytes()
+        val uploadInfo = FileUploadsApi.uploadFile(
+            courseId = course.id,
+            assignmentId = videoUploadAssignment.id,
+            file = videoFileBytes,
+            fileName = videoFileName,
+            token = student.token,
+            fileUploadType = FileUploadType.ASSIGNMENT_SUBMISSION
+        )
+
+        Log.d(PREPARATION_TAG, "Submit '${videoUploadAssignment.name}' assignment for '${student.name}' student with the uploaded mp4 file.")
+        SubmissionsApi.submitCourseAssignment(course.id, student.token, videoUploadAssignment.id, SubmissionType.ONLINE_UPLOAD, fileIds = mutableListOf(uploadInfo.id))
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Select '${course.name}' course and navigate to its Assignments Page.")
+        dashboardPage.selectCourse(course)
+        courseBrowserPage.openAssignmentsTab()
+
+        Log.d(STEP_TAG, "Click on '${videoUploadAssignment.name}' assignment.")
+        assignmentListPage.clickAssignment(videoUploadAssignment)
+
+        Log.d(STEP_TAG, "Open '${student.name}' student's submission in SpeedGrader.")
+        assignmentDetailsPage.clickAllSubmissions()
+        assignmentSubmissionListPage.clickSubmission(student)
+
+        Log.d(STEP_TAG, "Expand then collapse the SpeedGrader panel to show the video submission content in full.")
+        speedGraderPage.clickExpandPanelButton()
+        speedGraderPage.clickCollapsePanelButton()
+
+        Log.d(ASSERTION_TAG, "Assert that '$videoFileName' attachment is displayed in SpeedGrader.")
+        speedGraderPage.assertSelectedAttachmentItemDisplayed(videoFileName)
+
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
+
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
+
+        Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
+
+        Log.d(STEP_TAG, "Click play/pause button to pause the video.")
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the current video position.")
+        val firstVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "First video position: $firstVideoPositionText")
+
+        Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
+        videoPlayerPage.clickPlayPauseButton()
+        sleep(2000)
+        videoPlayerPage.clickPlayPauseButton()
+
+        Log.d(STEP_TAG, "Get the video position again.")
+        val secondVideoPositionText = getVideoPosition(R.id.exo_position)
+        Log.d(ASSERTION_TAG, "Second video position: $secondVideoPositionText")
+
+        Log.d(ASSERTION_TAG, "Assert that the video position has changed, confirming video is playing.")
+        assert(firstVideoPositionText != secondVideoPositionText) {
+            "Video position did not change. First: $firstVideoPositionText, Second: $secondVideoPositionText"
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/CalendarE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/CalendarE2ETest.kt
index cd26633dd7..9c6a40d819 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/CalendarE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/CalendarE2ETest.kt
@@ -158,12 +158,12 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the page title is 'Calendar'.")
         calendarScreenPage.assertCalendarPageTitle()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo Title"
         val testTodoDescription = "Details of ToDo"
@@ -173,26 +173,26 @@ class CalendarE2ETest: TeacherComposeTest() {
         calendarToDoCreateUpdatePage.clickSave()
 
         val currentDate = getDateInCanvasCalendarFormat()
-        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously created To Do item is displayed with the corresponding title, context and date.")
-        calendarScreenPage.assertItemDetails(testTodoTitle, "To Do", "$currentDate at 12:00 PM")
+        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously created To-do item is displayed with the corresponding title, context and date.")
+        calendarScreenPage.assertItemDetails(testTodoTitle, "To-do", "$currentDate at 12:00 PM")
 
-        Log.d(STEP_TAG, "Clicks on the '$testTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Clicks on the '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle', the context is 'To Do', the date is the current day with 12:00 PM time and the description is '$testTodoDescription'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle', the context is 'To-do', the date is the current day with 12:00 PM time and the description is '$testTodoDescription'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
         calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
         calendarToDoDetailsPage.assertDescription(testTodoDescription)
 
-        Log.d(STEP_TAG, "Click on the 'Edit To Do' within the toolbar more menu and confirm the editing.")
+        Log.d(STEP_TAG, "Click on the 'Edit To-do' within the toolbar more menu and confirm the editing.")
         calendarToDoDetailsPage.clickToolbarMenu()
         calendarToDoDetailsPage.clickEditMenu()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'Edit To Do' as we are editing an existing To Do item.")
-        calendarToDoCreateUpdatePage.assertPageTitle("Edit To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'Edit To-do' as we are editing an existing To-do item.")
+        calendarToDoCreateUpdatePage.assertPageTitle("Edit To-do")
 
-        Log.d(ASSERTION_TAG, "Assert that the 'original' To Do Title and details has been filled into the input fields as we on the edit screen.")
+        Log.d(ASSERTION_TAG, "Assert that the 'original' To-do Title and details has been filled into the input fields as we on the edit screen.")
         calendarToDoCreateUpdatePage.assertTodoTitle(testTodoTitle)
         calendarToDoCreateUpdatePage.assertDetails(testTodoDescription)
 
@@ -203,19 +203,19 @@ class CalendarE2ETest: TeacherComposeTest() {
         calendarToDoCreateUpdatePage.typeDetails(modifiedTestTodoDescription)
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously modified To Do item is displayed with the corresponding title, context and with the same date as we haven't changed it.")
-        calendarScreenPage.assertItemDetails(modifiedTestTodoTitle, "To Do", "$currentDate at 12:00 PM")
+        Log.d(ASSERTION_TAG, "Assert that the user has been navigated back to the Calendar Screen Page and that the previously modified To-do item is displayed with the corresponding title, context and with the same date as we haven't changed it.")
+        calendarScreenPage.assertItemDetails(modifiedTestTodoTitle, "To-do", "$currentDate at 12:00 PM")
 
-        Log.d(STEP_TAG, "Clicks on the '$modifiedTestTodoTitle' To Do item.")
+        Log.d(STEP_TAG, "Clicks on the '$modifiedTestTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(modifiedTestTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do title is '$modifiedTestTodoTitle', the page title is 'To Do', the date remained current day with 12:00 PM time (as we haven't modified it) and the description is '$modifiedTestTodoDescription'.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do title is '$modifiedTestTodoTitle', the page title is 'To-do', the date remained current day with 12:00 PM time (as we haven't modified it) and the description is '$modifiedTestTodoDescription'.")
         calendarToDoDetailsPage.assertTitle(modifiedTestTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
         calendarToDoDetailsPage.assertDate("$currentDate at 12:00 PM")
         calendarToDoDetailsPage.assertDescription(modifiedTestTodoDescription)
 
-        Log.d(STEP_TAG, "Click on the 'Delete To Do' within the toolbar more menu and confirm the deletion.")
+        Log.d(STEP_TAG, "Click on the 'Delete To-do' within the toolbar more menu and confirm the deletion.")
         calendarToDoDetailsPage.clickToolbarMenu()
         calendarToDoDetailsPage.clickDeleteMenu()
         calendarToDoDetailsPage.confirmDeletion()
@@ -223,7 +223,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the deleted item does not exist anymore on the Calendar Screen Page.")
         calendarScreenPage.assertItemNotExist(modifiedTestTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any To Do items on the current day.")
+        Log.d(ASSERTION_TAG, "Assert that after the deletion the empty view will be displayed since we don't have any To-do items on the current day.")
         calendarScreenPage.assertEmptyView()
     }
 
@@ -273,12 +273,12 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the event is displayed with the corresponding details (title, context name, date, status) on the page.")
         calendarScreenPage.assertItemDetails(newEventTitle, teacher.name, currentDate)
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo Title"
         val testTodoDescription = "Details of ToDo"
@@ -294,7 +294,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To Do item is displayed because we created it to this particular day." +
+        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To-do item is displayed because we created it to this particular day." +
                 "Assert that '$newEventTitle' calendar event is not displayed because it's created for today.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
         calendarScreenPage.assertItemNotExist(newEventTitle)
@@ -306,7 +306,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         calendarFilterPage.clickOnFilterItem(course.name)
         calendarFilterPage.closeFilterPage()
 
-        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To Do item is not displayed because we filtered out from the calendar. " +
+        Log.d(ASSERTION_TAG, "Assert that the '$testTodoTitle' To-do item is not displayed because we filtered out from the calendar. " +
                 "Assert that the empty view is displayed because there are no items for today.")
         calendarScreenPage.assertItemNotExist(testTodoTitle)
         calendarScreenPage.assertEmptyView()
@@ -593,12 +593,12 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the page title is 'Calendar'.")
         calendarScreenPage.assertCalendarPageTitle()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo With Reminder"
         val testTodoDescription = "Details of ToDo"
@@ -613,15 +613,24 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
-        calendarScreenPage.assertItemDisplayed(testTodoTitle)
-
-        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To Do item.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar. If the app did not navigate to the correct day, navigate there manually by clicking on the day.")
+        try {
+            calendarScreenPage.assertItemDisplayed(testTodoTitle)
+        } catch (e: Throwable) {
+            if (calendarScreenPage.checkCalendarCollapsed()) {
+                Log.d(STEP_TAG, "Expand the calendar to make all day numbers visible.")
+                calendarScreenPage.clickCalendarHeader()
+            }
+            calendarScreenPage.clickOnDayNumber(futureDate.get(Calendar.DAY_OF_MONTH))
+            calendarScreenPage.assertItemDisplayed(testTodoTitle)
+        }
+
+        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To Do'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To-do'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
 
         Log.d(ASSERTION_TAG, "Assert that the reminder section is displayed.")
         calendarToDoDetailsPage.assertReminderSectionDisplayed()
@@ -635,7 +644,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneHour)
         calendarToDoDetailsPage.selectTime(reminderDateOneHour)
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneHour.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -665,7 +674,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneWeek)
         calendarToDoDetailsPage.selectTime(reminderDateOneWeek)
 
-        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To Do which is due in 2 days).")
+        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To-do which is due in 2 days).")
         calendarToDoDetailsPage.assertReminderNotDisplayedWithText(reminderDateOneWeek.time.toFormattedString())
         checkToastText(R.string.reminderInPast, activityRule.activity)
         futureDate.apply { add(Calendar.WEEK_OF_YEAR, 1) }
@@ -679,7 +688,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         calendarToDoDetailsPage.selectDate(reminderDateOneDay)
         calendarToDoDetailsPage.selectTime(reminderDateOneDay)
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneDay.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -697,7 +706,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Navigate back to Calendar Screen Page.")
         Espresso.pressBack()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
     }
 
@@ -724,12 +733,12 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the page title is 'Calendar'.")
         calendarScreenPage.assertCalendarPageTitle()
 
-        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To Do' to create a new To Do.")
+        Log.d(STEP_TAG, "Click on the 'Add' (FAB) button and 'Add To-do' to create a new To-do.")
         calendarScreenPage.clickOnAddButton()
         calendarScreenPage.clickAddTodo()
 
-        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To Do' as we are clicked on the 'Add To Do' button to create a new one.")
-        calendarToDoCreateUpdatePage.assertPageTitle("New To Do")
+        Log.d(ASSERTION_TAG, "Assert that the page title is 'New To-do' as we are clicked on the 'Add To-do' button to create a new one.")
+        calendarToDoCreateUpdatePage.assertPageTitle("New To-do")
 
         val testTodoTitle = "Test ToDo With Reminder"
         val testTodoDescription = "Details of ToDo"
@@ -744,15 +753,24 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Click on the 'Save' button.")
         calendarToDoCreateUpdatePage.clickSave()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
-        calendarScreenPage.assertItemDisplayed(testTodoTitle)
-
-        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To Do item.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar. If the app did not navigate to the correct day, navigate there manually by clicking on the day.")
+        try {
+            calendarScreenPage.assertItemDisplayed(testTodoTitle)
+        } catch (e: Throwable) {
+            if (calendarScreenPage.checkCalendarCollapsed()) {
+                Log.d(STEP_TAG, "Expand the calendar to make all day numbers visible.")
+                calendarScreenPage.clickCalendarHeader()
+            }
+            calendarScreenPage.clickOnDayNumber(futureDate.get(Calendar.DAY_OF_MONTH))
+            calendarScreenPage.assertItemDisplayed(testTodoTitle)
+        }
+
+        Log.d(STEP_TAG, "Click on the previously created '$testTodoTitle' To-do item.")
         calendarScreenPage.clickOnItem(testTodoTitle)
 
-        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To Do'.")
+        Log.d(ASSERTION_TAG, "Assert that the title is '$testTodoTitle' and the context is 'To-do'.")
         calendarToDoDetailsPage.assertTitle(testTodoTitle)
-        calendarToDoDetailsPage.assertPageTitle("To Do")
+        calendarToDoDetailsPage.assertPageTitle("To-do")
 
         Log.d(ASSERTION_TAG, "Assert that the reminder section is displayed.")
         calendarToDoDetailsPage.assertReminderSectionDisplayed()
@@ -764,7 +782,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Select '1 Hour Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Hour Before")
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneHour.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -790,7 +808,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Select '1 Week Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Week Before")
 
-        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To Do which is due in 2 days).")
+        Log.d(ASSERTION_TAG, "Assert that a toast message is occurring which warns that we cannot pick up a reminder which has already passed (for example cannot pick '1 Week Before' reminder for a To-do which is due in 2 days).")
         calendarToDoDetailsPage.assertReminderNotDisplayedWithText(reminderDateOneWeek.time.toFormattedString())
         checkToastText(R.string.reminderInPast, activityRule.activity)
         futureDate.apply { add(Calendar.WEEK_OF_YEAR, 1) }
@@ -802,7 +820,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Select '1 Day Before'.")
         calendarToDoDetailsPage.clickBeforeReminderOption("1 Day Before")
 
-        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To Do Details Page.")
+        Log.d(ASSERTION_TAG, "Assert that the reminder has been picked up and displayed on the To-do Details Page.")
         calendarToDoDetailsPage.assertReminderDisplayedWithText(reminderDateOneDay.time.toFormattedString())
 
         Log.d(STEP_TAG, "Click on the '+' button (Add reminder) to pick up a new reminder.")
@@ -818,7 +836,7 @@ class CalendarE2ETest: TeacherComposeTest() {
         Log.d(STEP_TAG, "Navigate back to Calendar Screen Page.")
         Espresso.pressBack()
 
-        Log.d(ASSERTION_TAG, "Assert that the To Do item is displayed on the calendar.")
+        Log.d(ASSERTION_TAG, "Assert that the To-do item is displayed on the calendar.")
         calendarScreenPage.assertItemDisplayed(testTodoTitle)
     }
 }
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/InboxE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/InboxE2ETest.kt
index 5a47464e9f..7bc32ffde6 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/InboxE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/InboxE2ETest.kt
@@ -14,7 +14,6 @@
  *     limitations under the License.
  *
  */
-
 package com.instructure.teacher.ui.e2e.compose
 
 import android.os.Environment
@@ -32,15 +31,21 @@ import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
+import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.canvas.espresso.refresh
 import com.instructure.dataseeding.api.ConversationsApi
 import com.instructure.dataseeding.api.GroupsApi
 import com.instructure.dataseeding.model.CanvasUserApiModel
 import com.instructure.dataseeding.model.CourseApiModel
+import com.instructure.dataseeding.model.SubmissionType
+import com.instructure.dataseeding.util.days
+import com.instructure.dataseeding.util.fromNow
+import com.instructure.dataseeding.util.iso8601
 import com.instructure.espresso.getVideoPosition
 import com.instructure.espresso.retry
 import com.instructure.espresso.retryWithIncreasingDelay
 import com.instructure.teacher.ui.utils.TeacherComposeTest
+import com.instructure.teacher.ui.utils.extensions.seedAssignments
 import com.instructure.teacher.ui.utils.extensions.seedData
 import com.instructure.teacher.ui.utils.extensions.tokenLogin
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -816,26 +821,26 @@ class InboxE2ETest : TeacherComposeTest() {
         Log.d(STEP_TAG, "Click on the attachment to verify it can be opened.")
         inboxDetailsPage.clickAttachment(videoFileName)
 
-        Log.d(ASSERTION_TAG, "Wait for video to load and assert that the media play button is visible.")
-        inboxDetailsPage.assertPlayButtonDisplayed()
+        Log.d(ASSERTION_TAG, "Assert that the media comment preview (and the 'Play button') is displayed.")
+        videoPlayerPage.assertMediaCommentPreviewDisplayed()
 
-        Log.d(STEP_TAG, "Click the play button to start the video and on the screen to show media controls.")
-        inboxDetailsPage.clickPlayButton()
-        inboxDetailsPage.clickScreenCenterToShowControls(device)
+        Log.d(STEP_TAG, "Click the play button to start the video and wait for it to finish loading.")
+        videoPlayerPage.clickPlayButton()
+        videoPlayerPage.waitForVideoToStart(device)
 
         Log.d(ASSERTION_TAG, "Assert that the play/pause button is visible in the media controls.")
-        inboxDetailsPage.assertPlayPauseButtonDisplayed()
+        videoPlayerPage.assertPlayPauseButtonDisplayed()
 
         Log.d(STEP_TAG, "Click play/pause button to pause the video.")
-        inboxDetailsPage.clickPlayPauseButton()
+        videoPlayerPage.clickPlayPauseButton()
 
         Log.d(STEP_TAG, "Get the current video position.")
         val firstPositionText = getVideoPosition(R.id.exo_position)
 
         Log.d(STEP_TAG, "Click play/pause button to resume video playback, wait for video to play for 2 seconds then click play/pause button to pause again.")
-        inboxDetailsPage.clickPlayPauseButton()
+        videoPlayerPage.clickPlayPauseButton()
         sleep(2000)
-        inboxDetailsPage.clickPlayPauseButton()
+        videoPlayerPage.clickPlayPauseButton()
 
         Log.d(STEP_TAG, "Get the video position again.")
         val secondPositionText = getVideoPosition(R.id.exo_position)
@@ -1110,4 +1115,74 @@ class InboxE2ETest : TeacherComposeTest() {
         inboxDetailsPage.assertMessageDisplayed(conversationBody)
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.INBOX, TestCategory.E2E)
+    fun testSendMessageFromAllSubmissionsPageE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 2, teachers = 1, courses = 1)
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+        val student1 = data.studentsList[0]
+        val student2 = data.studentsList[1]
+
+        Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.")
+        val assignment = seedAssignments(
+            courseId = course.id,
+            dueAt = 1.days.fromNow.iso8601,
+            submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY),
+            teacherToken = teacher.token,
+            pointsPossible = 10.0
+        )
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open '${course.name}' course and navigate to the Assignments page.")
+        dashboardPage.openCourse(course)
+        courseBrowserPage.openAssignmentsTab()
+
+        Log.d(STEP_TAG, "Navigate to All Submissions page for '${assignment[0].name}' assignment.")
+        assignmentListPage.clickAssignment(assignment[0])
+        assignmentDetailsPage.clickAllSubmissions()
+
+        Log.d(ASSERTION_TAG, "Assert that both '${student1.name}' and '${student2.name}' are listed on the All Submissions page.")
+        assignmentSubmissionListPage.assertHasSubmission(2)
+        assignmentSubmissionListPage.assertHasStudentSubmission(student1)
+        assignmentSubmissionListPage.assertHasStudentSubmission(student2)
+
+        Log.d(STEP_TAG, "Click the 'Add Message' button on the toolbar.")
+        assignmentSubmissionListPage.clickAddMessage()
+
+        Log.d(ASSERTION_TAG, "Assert that both students are pre-populated as recipients.")
+        inboxComposePage.assertRecipientSelected(student1.shortName)
+        inboxComposePage.assertRecipientSelected(student2.shortName)
+
+        val body = "This message was sent from the All Submissions page."
+        Log.d(STEP_TAG, "Type body '$body' and send the message.")
+        inboxComposePage.typeBody(body)
+        inboxComposePage.pressSendButton()
+
+        Log.d(STEP_TAG, "Navigate back from All Submissions to the Dashboard.")
+        pressBackButton(4)
+
+        Log.d(STEP_TAG, "Open Inbox.")
+        dashboardPage.openInbox()
+
+        Log.d(STEP_TAG, "Filter the Inbox by selecting 'Sent' category.")
+        inboxPage.filterInbox("Sent")
+
+        val subject = "All Submissions on ${assignment[0].name}"
+        Log.d(ASSERTION_TAG, "Assert that the sent conversation with subject '$subject' is displayed.")
+        inboxPage.assertConversationDisplayed(subject)
+
+        Log.d(STEP_TAG, "Open the '$subject' conversation.")
+        inboxPage.openConversation(subject)
+
+        Log.d(ASSERTION_TAG, "Assert that the message body '$body' is displayed in the conversation.")
+        inboxDetailsPage.assertMessageDisplayed(body)
+    }
+
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/SpeedGraderE2ETest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/SpeedGraderE2ETest.kt
index ee3e1e8d11..51c4577218 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/SpeedGraderE2ETest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/SpeedGraderE2ETest.kt
@@ -17,7 +17,6 @@
 package com.instructure.teacher.ui.e2e.compose
 
 import android.util.Log
-import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.test.espresso.Espresso
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
@@ -26,10 +25,14 @@ import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.annotations.E2E
 import com.instructure.canvas.espresso.pressBackButton
 import com.instructure.canvas.espresso.refresh
+import com.instructure.dataseeding.api.LatePolicyApi
 import com.instructure.dataseeding.api.SubmissionsApi
+import com.instructure.dataseeding.model.LatePolicy
 import com.instructure.dataseeding.model.SubmissionType
+import com.instructure.dataseeding.util.ago
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
+import com.instructure.dataseeding.util.hours
 import com.instructure.dataseeding.util.iso8601
 import com.instructure.espresso.page.getStringFromResource
 import com.instructure.espresso.retry
@@ -51,7 +54,6 @@ class SpeedGraderE2ETest : TeacherComposeTest() {
 
     override fun enableAndConfigureAccessibilityChecks() = Unit
 
-    @OptIn(ExperimentalTestApi::class)
     @E2E
     @Test
     @TestMetaData(Priority.MANDATORY, FeatureCategory.GRADES, TestCategory.E2E)
@@ -101,6 +103,7 @@ class SpeedGraderE2ETest : TeacherComposeTest() {
 
         Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
         tokenLogin(teacher)
+        dashboardPage.waitForRender()
 
         Log.d(STEP_TAG, "Open '${course.name}' course and navigate to Assignments Page.")
         dashboardPage.openCourse(course)
@@ -130,10 +133,8 @@ class SpeedGraderE2ETest : TeacherComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the '${noSubStudent.name}' student has '-' as score as it's submission is not submitted yet.")
         assignmentSubmissionListPage.assertStudentScoreText(noSubStudent.name, "-")
 
-        Log.d(STEP_TAG, "Navigate back to the Assignment Details Page.")
+        Log.d(STEP_TAG, "Navigate back to the Assignment Details Page and click on 'View All Submission' arrow icon.")
         Espresso.pressBack()
-
-        Log.d(STEP_TAG, "Click on 'View All Submission' arrow icon.")
         assignmentDetailsPage.clickAllSubmissions()
 
         Log.d(STEP_TAG, "Click on '${student.name}' student's avatar.")
@@ -254,7 +255,254 @@ class SpeedGraderE2ETest : TeacherComposeTest() {
             assignmentSubmissionListPage.assertGradesHidden(gradedStudent.name)
             assignmentSubmissionListPage.assertGradesHidden(student.name)
         }
+    }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.E2E)
+    fun testSpeedGraderQuickAccessButtonAndSwipeE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(teachers = 1, courses = 1, students = 3, favoriteCourses = 1)
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+        val sortedStudents = data.studentsList.sortedBy { it.sortableName.lowercase() }
+        val firstSubmittedStudent = sortedStudents[0]
+        val secondGradedStudent = sortedStudents[1]
+        val thirdNoSubmissionStudent = sortedStudents[2]
+
+        Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course.")
+        val assignment = seedAssignments(
+            courseId = course.id,
+            dueAt = 1.days.fromNow.iso8601,
+            submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY),
+            teacherToken = teacher.token,
+            pointsPossible = 15.0
+        )
+
+        Log.d(PREPARATION_TAG, "Seed a submission for '${assignment[0].name}' assignment with '${firstSubmittedStudent.name}' student.")
+        seedAssignmentSubmission(
+            submissionSeeds = listOf(
+                SubmissionsApi.SubmissionSeedInfo(
+                    amount = 1,
+                    submissionType = SubmissionType.ONLINE_TEXT_ENTRY
+                )
+            ),
+            assignmentId = assignment[0].id,
+            courseId = course.id,
+            studentToken = firstSubmittedStudent.token
+        )
+
+        Log.d(PREPARATION_TAG, "Seed a submission for '${assignment[0].name}' assignment with '${secondGradedStudent.name}' student.")
+        seedAssignmentSubmission(
+            submissionSeeds = listOf(
+                SubmissionsApi.SubmissionSeedInfo(
+                    amount = 1,
+                    submissionType = SubmissionType.ONLINE_TEXT_ENTRY
+                )
+            ),
+            assignmentId = assignment[0].id,
+            courseId = course.id,
+            studentToken = secondGradedStudent.token
+        )
+
+        Log.d(PREPARATION_TAG, "Grade the previously seeded submission for '${secondGradedStudent.name}' student.")
+        SubmissionsApi.gradeSubmission(
+            teacher.token,
+            course.id,
+            assignment[0].id,
+            secondGradedStudent.id,
+            postedGrade = "15"
+        )
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open '${course.name}' course and navigate to Assignments Page.")
+        dashboardPage.openCourse(course)
+        courseBrowserPage.openAssignmentsTab()
+
+        Log.d(STEP_TAG, "Click on '${assignment[0].name}' assignment.")
+        assignmentListPage.clickAssignment(assignment[0])
+
+        Log.d(STEP_TAG, "Open the SpeedGrader by clicking on the SpeedGrader quick access button.")
+        assignmentDetailsPage.openSpeedGrader()
+
+        Log.d(ASSERTION_TAG, "Assert that the the initial (first) student is '${firstSubmittedStudent.name}'.")
+        speedGraderPage.assertCurrentStudent(firstSubmittedStudent.name)
+        speedGraderPage.assertCurrentStudentStatus("Submitted")
+
+        Log.d(STEP_TAG, "Swipe to the next (second) student.")
+        speedGraderPage.swipeToNextStudent()
+
+        Log.d(ASSERTION_TAG, "Assert that the current student is '${secondGradedStudent.name}'.")
+        speedGraderPage.assertCurrentStudent(secondGradedStudent.name)
+        speedGraderPage.assertCurrentStudentStatus("Graded")
+
+        Log.d(STEP_TAG, "Swipe to the next (third) student.")
+        speedGraderPage.swipeToNextStudent()
+
+        Log.d(ASSERTION_TAG, "Assert that the current student is '${thirdNoSubmissionStudent.name}'.")
+        speedGraderPage.assertCurrentStudent(thirdNoSubmissionStudent.name)
+        speedGraderPage.assertCurrentStudentStatus("Not Submitted")
+    }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.E2E)
+    fun testSpeedGraderLatePenaltyE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(teachers = 1, courses = 1, students = 1, favoriteCourses = 1)
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+        val student = data.studentsList[0]
+
+        Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course with a due date 12 hours in the past.")
+        val assignment = seedAssignments(
+            courseId = course.id,
+            dueAt = 12.hours.ago.iso8601,
+            submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY),
+            teacherToken = teacher.token,
+            pointsPossible = 100.0
+        )
+
+        Log.d(PREPARATION_TAG, "Creating a late policy for '${course.name}' course: 10% deduction per day.")
+        LatePolicyApi.createLatePolicy(
+            courseId = course.id,
+            latePolicy = LatePolicy(
+                missingSubmissionDeductionEnabled = false,
+                missingSubmissionDeduction = 0,
+                lateSubmissionDeductionEnabled = true,
+                lateSubmissionDeduction = 10,
+                lateSubmissionInterval = "day",
+                lateSubmissionMinimumPercentEnabled = false,
+                lateSubmissionMinimumPercent = 0
+            ),
+            teacherToken = teacher.token
+        )
+
+        Log.d(PREPARATION_TAG, "Seeding a late submission for '${assignment[0].name}' assignment with '${student.name}' student.")
+        seedAssignmentSubmission(
+            submissionSeeds = listOf(SubmissionsApi.SubmissionSeedInfo(
+                amount = 1,
+                submissionType = SubmissionType.ONLINE_TEXT_ENTRY
+            )),
+            assignmentId = assignment[0].id,
+            courseId = course.id,
+            studentToken = student.token
+        )
+
+        Log.d(PREPARATION_TAG, "Grading the late submission for '${student.name}' student with 100 points.")
+        SubmissionsApi.gradeSubmission(teacher.token, course.id, assignment[0].id, student.id, postedGrade = "100")
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open '${course.name}' course and navigate to Assignments Page.")
+        dashboardPage.openCourse(course)
+        courseBrowserPage.openAssignmentsTab()
+
+        Log.d(STEP_TAG, "Click on '${assignment[0].name}' assignment.")
+        assignmentListPage.clickAssignment(assignment[0])
+
+        Log.d(STEP_TAG, "Open (all) submissions and click on '${student.name}' student's submission.")
+        assignmentDetailsPage.clickAllSubmissions()
+        assignmentSubmissionListPage.clickSubmission(student)
+
+        Log.d(ASSERTION_TAG, "Assert that the submission of '${student.name}' student is displayed in SpeedGrader.")
+        speedGraderPage.assertDisplaysTextSubmissionViewWithStudentName(student.name)
+
+        Log.d(STEP_TAG, "Click on the 'Expand Panel Button' to show the grade panel.")
+        speedGraderPage.clickExpandPanelButton()
+
+        Log.d(ASSERTION_TAG, "Assert that the entered score is '100'.")
+        speedGraderGradePage.assertCurrentEnteredScore("100")
+
+        Log.d(ASSERTION_TAG, "Assert that the submission is 0.5 days late (12 hours).")
+        speedGraderGradePage.assertDaysLate("0.5")
+
+        Log.d(ASSERTION_TAG, "Assert that the late penalty value is '10' (10% per day × 1 interval × 100 pts).")
+        speedGraderGradePage.assertLatePenaltyValueDisplayed("10")
+
+        Log.d(ASSERTION_TAG, "Assert that the Points row shows '100 / 100 pts' (the raw entered grade before penalty).")
+        speedGraderGradePage.assertFinalGradePointsValueDisplayed("100 / 100 pts")
+
+        Log.d(ASSERTION_TAG, "Assert that the final grade is displayed as '90 / 100 pts'.")
+        speedGraderGradePage.assertFinalGradeIsDisplayed("90 / 100 pts")
+    }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.GRADES, TestCategory.E2E)
+    fun testSpeedGraderOvergradingE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(teachers = 1, courses = 1, students = 1, favoriteCourses = 1)
+        val teacher = data.teachersList[0]
+        val course = data.coursesList[0]
+        val student = data.studentsList[0]
+
+        Log.d(PREPARATION_TAG, "Seeding 'Text Entry' assignment for '${course.name}' course with 10 max points.")
+        val assignment = seedAssignments(
+            courseId = course.id,
+            dueAt = 1.days.fromNow.iso8601,
+            submissionTypes = listOf(SubmissionType.ONLINE_TEXT_ENTRY),
+            teacherToken = teacher.token,
+            pointsPossible = 10.0
+        )
+
+        Log.d(PREPARATION_TAG, "Seed a submission for '${assignment[0].name}' assignment with '${student.name}' student.")
+        seedAssignmentSubmission(
+            submissionSeeds = listOf(SubmissionsApi.SubmissionSeedInfo(
+                amount = 1,
+                submissionType = SubmissionType.ONLINE_TEXT_ENTRY
+            )),
+            assignmentId = assignment[0].id,
+            courseId = course.id,
+            studentToken = student.token
+        )
+
+        Log.d(STEP_TAG, "Login with user: '${teacher.name}', login id: '${teacher.loginId}'.")
+        tokenLogin(teacher)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open '${course.name}' course and navigate to Assignments Page.")
+        dashboardPage.openCourse(course)
+        courseBrowserPage.openAssignmentsTab()
+
+        Log.d(STEP_TAG, "Click on '${assignment[0].name}' assignment.")
+        assignmentListPage.clickAssignment(assignment[0])
+
+        Log.d(STEP_TAG, "Open (all) submissions and click on '${student.name}' student's submission.")
+        assignmentDetailsPage.clickAllSubmissions()
+        assignmentSubmissionListPage.clickSubmission(student)
+
+        Log.d(ASSERTION_TAG, "Assert that the submission of '${student.name}' student is displayed in SpeedGrader.")
+        speedGraderPage.assertDisplaysTextSubmissionViewWithStudentName(student.name)
+
+        Log.d(STEP_TAG, "Click on the 'Expand Panel Button' to show the grade panel.")
+        speedGraderPage.clickExpandPanelButton()
+
+        Log.d(ASSERTION_TAG, "Assert that the assignment's max points is '10'.")
+        speedGraderGradePage.assertPointsPossible("10")
+
+        Log.d(ASSERTION_TAG, "Assert that the status is 'None' (submission is on-time, no late penalty applies).")
+        speedGraderGradePage.assertSelectedStatusText("None")
+
+        Log.d(STEP_TAG, "Enter '15' as the new grade (above the max of 10 points).")
+        speedGraderGradePage.enterNewGrade("15")
+
+        Log.d(ASSERTION_TAG, "Assert that the entered score is '15'.")
+        speedGraderGradePage.assertCurrentEnteredScore("15")
+
+        Log.d(ASSERTION_TAG, "Assert that the final grade points value is '15 / 10 pts' (overgraded above the 10 pts maximum).")
+        speedGraderGradePage.assertFinalGradePointsValueDisplayed("15 / 10 pts")
 
+        Log.d(ASSERTION_TAG, "Assert that the final grade is displayed as '15 / 10 pts'.")
+        speedGraderGradePage.assertFinalGradeIsDisplayed("15 / 10 pts")
     }
 
 }
\ No newline at end of file
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/AssignmentDueDatesInteractionTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/AssignmentDueDatesInteractionTest.kt
index aa844bc695..a2375e49dc 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/AssignmentDueDatesInteractionTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/AssignmentDueDatesInteractionTest.kt
@@ -80,7 +80,7 @@ class AssignmentDueDatesInteractionTest : TeacherComposeTest() {
         dashboardPage.openCourse(course)
         courseBrowserPage.openAssignmentsTab()
         assignmentListPage.clickAssignment(assignment)
-        assignmentDetailsPage.openAllDatesPage()
+        assignmentDetailsPage.openDueDatesPage()
 
         return assignment
     }
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/CommentLibraryInteractionTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/CommentLibraryInteractionTest.kt
index 2b26f40a90..f3ed287b2e 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/CommentLibraryInteractionTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/interaction/CommentLibraryInteractionTest.kt
@@ -20,6 +20,7 @@ import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.annotations.StubLandscape
 import com.instructure.canvas.espresso.mockcanvas.MockCanvas
 import com.instructure.canvas.espresso.mockcanvas.addAssignment
 import com.instructure.canvas.espresso.mockcanvas.addCoursePermissions
@@ -138,6 +139,7 @@ class CommentLibraryInteractionTest : TeacherComposeTest() {
 
     @Test
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.SPEED_GRADER, TestCategory.INTERACTION)
+    @StubLandscape
     fun selectCommentLibrarySuggestionComment() {
         createCommentLibraryMockData()
         goToSpeedGraderCommentsPage()
@@ -155,6 +157,7 @@ class CommentLibraryInteractionTest : TeacherComposeTest() {
 
     @Test
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.SPEED_GRADER, TestCategory.INTERACTION)
+    @StubLandscape
     fun selectCommentLibrarySuggestionAndSendComment() {
         createCommentLibraryMockData()
         goToSpeedGraderCommentsPage()
@@ -194,6 +197,7 @@ class CommentLibraryInteractionTest : TeacherComposeTest() {
 
     @Test
     @TestMetaData(Priority.IMPORTANT, FeatureCategory.SPEED_GRADER, TestCategory.INTERACTION)
+    @StubLandscape
     fun reopenCommentLibraryWhenTextIsModified() {
         createCommentLibraryMockData()
         goToSpeedGraderCommentsPage()
@@ -227,6 +231,7 @@ class CommentLibraryInteractionTest : TeacherComposeTest() {
 
     @Test
     @TestMetaData(Priority.COMMON, FeatureCategory.SPEED_GRADER, TestCategory.INTERACTION)
+    @StubLandscape
     fun selectCommentLibrarySuggestionFromMultipleItemResult() {
         createCommentLibraryMockData()
         goToSpeedGraderCommentsPage()
@@ -247,6 +252,7 @@ class CommentLibraryInteractionTest : TeacherComposeTest() {
 
     @Test
     @TestMetaData(Priority.COMMON, FeatureCategory.SPEED_GRADER, TestCategory.INTERACTION)
+    @StubLandscape
     fun showAllCommentLibraryItemsAfterClearingCommentFieldFilter() {
         val commentLibraryItems = createCommentLibraryMockData()
         goToSpeedGraderCommentsPage()
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/AssignmentDetailsPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/AssignmentDetailsPage.kt
index fd9a5cdabc..be6bf72add 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/AssignmentDetailsPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/AssignmentDetailsPage.kt
@@ -70,6 +70,7 @@ class AssignmentDetailsPage(val moduleItemInteractions: ModuleItemInteractions)
     private val submissionTypesTextView by OnViewWithId(R.id.submissionTypesTextView)
     private val instructionsSectionLabel by OnViewWithId(R.id.instructionsSectionLabel, autoAssert = false)
     private val editButton by OnViewWithId(R.id.menu_edit)
+    private val speedGraderQuickAccessButton by OnViewWithId(R.id.menu_speedGrader)
     private val dueDatesLayout by OnViewWithId(R.id.dueLayout)
     private val submissionsLayout by OnViewWithId(R.id.submissionsLayout)
     private val viewAllSubmissions by OnViewWithId(R.id.viewAllSubmissions)
@@ -101,10 +102,10 @@ class AssignmentDetailsPage(val moduleItemInteractions: ModuleItemInteractions)
     }
 
     /**
-     * Open all dates page (by clicking on the due dates layout).
+     * Open Due Dates page (by clicking on the due dates layout).
      *
      */
-    fun openAllDatesPage() {
+    fun openDueDatesPage() {
         dueDatesLayout.click()
     }
 
@@ -116,6 +117,14 @@ class AssignmentDetailsPage(val moduleItemInteractions: ModuleItemInteractions)
         editButton.click()
     }
 
+    /**
+     * Open the SpeedGrader page (by clicking on the SpeedGrader quick access button).
+     *
+     */
+    fun openSpeedGrader() {
+        speedGraderQuickAccessButton.click()
+    }
+
     /**
      * Open 'All Submissions Page' (by clicking on the 'All' button).
      *
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/CourseBrowserPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/CourseBrowserPage.kt
index a8311a954a..f9e3b19bdd 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/CourseBrowserPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/CourseBrowserPage.kt
@@ -131,6 +131,13 @@ class CourseBrowserPage : BasePage() {
         waitForViewWithText("Syllabus").scrollTo().click()
     }
 
+    /**
+     * Opens the files tab in the course browser.
+     */
+    fun openFilesTab() {
+        scrollOpen("Files", scrollPosition = magicNumberForScroll)
+    }
+
     /**
      * Opens the modules tab in the course browser.
      */
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/FileListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/FileListPage.kt
index b343143c9f..475e1925f0 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/FileListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/FileListPage.kt
@@ -84,6 +84,20 @@ class FileListPage(val searchable: Searchable) : BasePage(R.id.fileListPage) {
         onView(matcher).check(doesNotExist())
     }
 
+    /**
+     * Clicks the add (+) FAB button to reveal upload/folder options.
+     */
+    fun clickAddButton() {
+        onView(allOf(withId(R.id.addFab), isDisplayed())).perform(click())
+    }
+
+    /**
+     * Clicks the upload file FAB button.
+     */
+    fun clickUploadFileButton() {
+        onView(allOf(withId(R.id.addFileFab), isDisplayed())).perform(click())
+    }
+
     /**
      * Selects the specified item in the file list.
      *
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/StudentContextPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/StudentContextPage.kt
index 2809cf3af9..e8e7d2d21e 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/StudentContextPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/StudentContextPage.kt
@@ -12,6 +12,7 @@
  *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
+ *
  */
 @file:Suppress("unused")
 
@@ -20,6 +21,7 @@ package com.instructure.teacher.ui.pages.classic
 import com.instructure.espresso.WaitForViewWithId
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.assertHasText
+import com.instructure.espresso.assertNotDisplayed
 import com.instructure.espresso.click
 import com.instructure.espresso.page.onView
 import com.instructure.espresso.page.plus
@@ -63,6 +65,23 @@ class StudentContextPage : PersonContextPage() {
         onView(withId(R.id.gradeBeforePosting)).assertHasText(grade)
     }
 
+    /**
+     * Asserts the student's grade after posting on the Student Context page.
+     *
+     * @param grade The expected grade after posting.
+     */
+    fun assertStudentGradeAfterPosting(grade: String) {
+        onView(withId(R.id.gradeAfterPosting)).assertHasText(grade)
+    }
+
+    /**
+     * Asserts that the 'Grade after posting' container is not displayed, which is the case
+     * when the grade is posted (both before/after values are equal and only one box is shown).
+     */
+    fun assertGradeAfterPostingNotDisplayed() {
+        onView(withId(R.id.gradeAfterPostingContainer)).assertNotDisplayed()
+    }
+
     /**
      * Asserts the student's submission count on the Student Context page.
      *
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/AssignmentSubmissionListPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/AssignmentSubmissionListPage.kt
index 812b0041e1..ff114b3140 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/AssignmentSubmissionListPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/AssignmentSubmissionListPage.kt
@@ -15,7 +15,6 @@
  */
 package com.instructure.teacher.ui.pages.compose
 
-
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.assertCountEquals
@@ -105,6 +104,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
      */
     fun clearSearch() {
         composeTestRule.onNodeWithTag("clearButton").performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -130,6 +130,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
      */
     fun clickOnPostPolicies() {
         composeTestRule.onNodeWithTag("postPolicyButton").performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -167,6 +168,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
         )
             .performScrollTo()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -180,6 +182,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
         )
             .performScrollTo()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -190,8 +193,10 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
         composeTestRule.onNode(
             hasTestTag("statusCheckBox") and hasAnySibling(hasText("Needs Grading")),
             useUnmergedTree = true
-        ).performScrollTo()
+        )
+            .performScrollTo()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -211,7 +216,8 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
                 )
             ),
             useUnmergedTree = true
-        ).performScrollTo()
+        )
+            .performScrollTo()
             .performClick()
         composeTestRule.waitForIdle()
     }
@@ -267,6 +273,10 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
      * @param expectedCount
      */
     fun assertHasSubmission(expectedCount: Int = 1) {
+        composeTestRule.waitUntil(timeoutMillis = 10000) {
+            composeTestRule.onAllNodes(hasTestTag("submissionListItem"), useUnmergedTree = true)
+                .fetchSemanticsNodes().isNotEmpty()
+        }
         composeTestRule.onAllNodes(hasTestTag("submissionListItem"), useUnmergedTree = true)
             .assertCountEquals(expectedCount)
     }
@@ -327,6 +337,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
     fun clickAddMessage() {
         composeTestRule.onNodeWithTag("addMessageButton")
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -383,6 +394,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
         )
             .performScrollTo()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -399,6 +411,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
         )
             .performScrollTo()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -420,6 +433,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
         )
             .performScrollTo()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
@@ -440,6 +454,7 @@ class AssignmentSubmissionListPage(private val composeTestRule: ComposeTestRule)
         composeTestRule.onNodeWithText(sortOrderName, useUnmergedTree = true)
             .performScrollTo()
             .performClick()
+        composeTestRule.waitForIdle()
     }
 
     /**
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/SpeedGraderPage.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/SpeedGraderPage.kt
index f12c3e5141..1fec868ba4 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/SpeedGraderPage.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/compose/SpeedGraderPage.kt
@@ -37,6 +37,8 @@ import androidx.compose.ui.test.performTextClearance
 import androidx.compose.ui.test.performTextInput
 import androidx.compose.ui.test.performTextReplacement
 import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipeLeft
+import androidx.compose.ui.test.swipeRight
 import androidx.compose.ui.test.swipeUp
 import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
@@ -168,7 +170,8 @@ class SpeedGraderPage(private val composeTestRule: ComposeTestRule) : BasePage()
     }
 
     /**
-     * Selects the "Grades & Rubric" tab.
+     * Selects the specified tab (e.g., "Grades", "Comments") in the SpeedGrader page.
+     * @param tabTitle The tab's name which will be selected.
      */
     fun selectTab(tabTitle: String) {
         composeTestRule.onNode(hasTestTag("speedGraderTab-${tabTitle}"), useUnmergedTree = true)
@@ -308,7 +311,7 @@ class SpeedGraderPage(private val composeTestRule: ComposeTestRule) : BasePage()
         composeTestRule.waitForIdle()
         swipeUpGradeAndRubric()
         waitForView(withId(R.id.recordAudioButton)).click()
-        Thread.sleep(3000) // Let the audio recording go for a bit
+        Thread.sleep(5000) // Let the audio recording go for a bit
         waitForView(withId(R.id.stopButton)).click()
         waitForView(withId(R.id.sendAudioButton)).click()
         composeTestRule.waitForIdle()
@@ -333,7 +336,7 @@ class SpeedGraderPage(private val composeTestRule: ComposeTestRule) : BasePage()
         composeTestRule.waitForIdle()
         swipeUpGradeAndRubric()
         waitForView(withId(R.id.startRecordingButton)).click()
-        Thread.sleep(3000) // Let the video recording go for a bit
+        Thread.sleep(5000) // Let the video recording go for a bit
         waitForView(withId(R.id.endRecordingButton)).click()
         waitForView(withId(R.id.sendButton)).click()
         composeTestRule.waitForIdle()
@@ -508,11 +511,47 @@ class SpeedGraderPage(private val composeTestRule: ComposeTestRule) : BasePage()
             .check(webMatches(getText(), Matchers.containsString(student.shortName)))
     }
 
+    /**
+     * Asserts the current student name displayed in the SpeedGrader page.
+     *
+     * @param studentName The expected name of the current student to be displayed.
+     */
+    fun assertCurrentStudent(studentName: String) {
+        composeTestRule.onNode(hasTestTag("speedGraderUserName") and hasText(studentName), useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    /**
+     * Asserts the current student submission status.
+     *
+     * @param status The expected submission status to be displayed.
+     */
+    fun assertCurrentStudentStatus(status: String) {
+        composeTestRule.onNode(hasTestTag("submissionStatusLabel") and hasText(status), useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    /**
+     * Swipes left to navigate to the next student in the SpeedGrader page.
+     */
+    fun swipeToNextStudent() {
+        composeTestRule.onNodeWithTag("speedGraderPager")
+            .performTouchInput { swipeLeft() }
+        composeTestRule.waitForIdle()
+    }
+
+    /**
+     * Swipes right to navigate to the previous student in the SpeedGrader page.
+     */
+    fun swipeToPreviousStudent() {
+        composeTestRule.onNodeWithTag("speedGraderPager")
+            .performTouchInput { swipeRight() }
+        composeTestRule.waitForIdle()
+    }
+
     /**
      * Clicks the back button.
      */
     fun clickBackButton() {
-        composeTestRule.onNode(hasTestTag("navigationButton")).performClick()
+        composeTestRule.onNode(hasTestTag("navigationButton") and hasAnyAncestor(hasTestTag("speedGraderAppBar")), useUnmergedTree = true).performClick()
         composeTestRule.waitForIdle()
     }
 
diff --git a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherComposeTest.kt b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherComposeTest.kt
index ffa88fdb1e..8fde5058c3 100644
--- a/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherComposeTest.kt
+++ b/apps/teacher/src/androidTest/java/com/instructure/teacher/ui/utils/TeacherComposeTest.kt
@@ -15,10 +15,10 @@
  *
  *
  */
-
 package com.instructure.teacher.ui.utils
 
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import com.instructure.canvas.espresso.common.pages.VideoPlayerPage
 import com.instructure.canvas.espresso.common.pages.compose.AssignmentListPage
 import com.instructure.canvas.espresso.common.pages.compose.CalendarEventCreateEditPage
 import com.instructure.canvas.espresso.common.pages.compose.CalendarEventDetailsPage
@@ -37,7 +37,6 @@ import com.instructure.teacher.ui.pages.compose.AssignmentSubmissionListPage
 import com.instructure.teacher.ui.pages.compose.ProgressPage
 import com.instructure.teacher.ui.pages.compose.SpeedGraderGradePage
 import com.instructure.teacher.ui.pages.compose.SpeedGraderPage
-
 import org.junit.Rule
 
 abstract class TeacherComposeTest : TeacherTest() {
@@ -63,4 +62,5 @@ abstract class TeacherComposeTest : TeacherTest() {
     val inboxSignatureSettingsPage = InboxSignatureSettingsPage(composeTestRule)
     val speedGraderPage = SpeedGraderPage(composeTestRule)
     val speedGraderGradePage = SpeedGraderGradePage(composeTestRule)
+    val videoPlayerPage = VideoPlayerPage()
 }
\ No newline at end of file
diff --git a/apps/teacher/src/main/AndroidManifest.xml b/apps/teacher/src/main/AndroidManifest.xml
index 093b17596a..c3f7fc090e 100644
--- a/apps/teacher/src/main/AndroidManifest.xml
+++ b/apps/teacher/src/main/AndroidManifest.xml
@@ -58,6 +58,10 @@
         android:networkSecurityConfig="@xml/network_security_config"
         tools:replace="android:icon">
 
+        <meta-data
+            android:name="nutrient_automatic_initialize"
+            android:value="false" />
+
         <activity android:name="sdk.pendo.io.activities.PendoGateActivity" android:launchMode="singleInstance" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/PSPDFKit/AnnotationComments/AnnotationCommentListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/PSPDFKit/AnnotationComments/AnnotationCommentListFragment.kt
index 7521e40495..8ece81d107 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/PSPDFKit/AnnotationComments/AnnotationCommentListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/PSPDFKit/AnnotationComments/AnnotationCommentListFragment.kt
@@ -95,6 +95,13 @@ class AnnotationCommentListFragment : BaseListFragment<
         setupToolbar()
         presenter.loadData(false)
         setupCommentInput()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
+        annotationCommentsRecyclerView.applyImeAndSystemBarInsets()
+        commentInputContainer.applyImeAndSystemBarInsets()
     }
 
     fun setupToolbar() {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/activities/FullscreenActivity.kt b/apps/teacher/src/main/java/com/instructure/teacher/activities/FullscreenActivity.kt
index d466bae92f..acf03ee5d1 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/activities/FullscreenActivity.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/activities/FullscreenActivity.kt
@@ -20,6 +20,9 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import com.instructure.canvasapi2.managers.CourseManager
 import com.instructure.canvasapi2.managers.GroupManager
@@ -53,6 +56,8 @@ open class FullscreenActivity : BaseAppCompatActivity(), FullScreenInteractions
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
+        setupWindowInsets()
+
         if (savedInstanceState == null) {
             mRoute = intent.extras!!.getParcelable(Route.ROUTE)
             mRoute?.let { handleRoute(it) }
@@ -63,6 +68,45 @@ open class FullscreenActivity : BaseAppCompatActivity(), FullScreenInteractions
         }
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.container) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+            val leftPadding = maxOf(navigationBars.left, displayCutout.left)
+            val rightPadding = maxOf(navigationBars.right, displayCutout.right)
+
+            view.setPadding(
+                leftPadding,
+                0,
+                rightPadding,
+                0
+            )
+
+            // Consume horizontal insets so child ComposeViews don't apply them again
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.navigationBars(),
+                    Insets.of(
+                        0, // Consume left
+                        navigationBars.top,
+                        0, // Consume right
+                        navigationBars.bottom
+                    )
+                )
+                .setInsets(
+                    WindowInsetsCompat.Type.displayCutout(),
+                    Insets.of(
+                        0, // Consume left
+                        displayCutout.top,
+                        0, // Consume right
+                        displayCutout.bottom
+                    )
+                )
+                .build()
+        }
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         groupApiCall?.cancel()
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/activities/InitActivity.kt b/apps/teacher/src/main/java/com/instructure/teacher/activities/InitActivity.kt
index dcd50bd5c6..71d0a22c36 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/activities/InitActivity.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/activities/InitActivity.kt
@@ -26,14 +26,19 @@ import android.util.Log
 import android.view.View
 import android.view.accessibility.AccessibilityNodeInfo
 import android.widget.CompoundButton
+import android.widget.RelativeLayout
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.IdRes
 import androidx.annotation.PluralsRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
+import androidx.core.graphics.Insets
 import androidx.core.view.GravityCompat
 import androidx.core.view.MenuItemCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -88,6 +93,7 @@ import com.instructure.pandautils.utils.AppType
 import com.instructure.pandautils.utils.CanvasFont
 import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.FeatureFlagProvider
 import com.instructure.pandautils.utils.LocaleUtils
 import com.instructure.pandautils.utils.ProfileUtils
@@ -99,6 +105,7 @@ import com.instructure.pandautils.utils.isAccessibilityEnabled
 import com.instructure.pandautils.utils.items
 import com.instructure.pandautils.utils.setGone
 import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.toPx
 import com.instructure.pandautils.utils.toast
 import com.instructure.teacher.BuildConfig
 import com.instructure.teacher.R
@@ -215,6 +222,7 @@ class InitActivity : BasePresenterActivity<InitActivityPresenter, InitActivityVi
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
 
         val nightModeFlags: Int = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
         ColorKeeper.darkTheme = nightModeFlags == Configuration.UI_MODE_NIGHT_YES
@@ -229,7 +237,12 @@ class InitActivity : BasePresenterActivity<InitActivityPresenter, InitActivityVi
         typefaceBehaviour.overrideFont(CanvasFont.REGULAR)
         LoggingUtility.log(this.javaClass.simpleName + " --> On Create")
 
-        val masqueradingUserId: Long = intent.getLongExtra(Const.QR_CODE_MASQUERADE_ID, 0L)
+        val intentMasqueradeId = intent.getLongExtra(Const.QR_CODE_MASQUERADE_ID, 0L)
+        val masqueradingUserId: Long = when {
+            intentMasqueradeId != 0L -> intentMasqueradeId
+            !ApiPrefs.isMasquerading && ApiPrefs.isMasqueradingFromQRCode && ApiPrefs.masqueradeId > 0L -> ApiPrefs.masqueradeId
+            else -> 0L
+        }
         if (masqueradingUserId != 0L) {
             MasqueradeHelper.startMasquerading(masqueradingUserId, ApiPrefs.domain, InitActivity::class.java)
             finish()
@@ -238,6 +251,8 @@ class InitActivity : BasePresenterActivity<InitActivityPresenter, InitActivityVi
         navigationDrawerBinding = NavigationDrawerBinding.bind(binding.root)
         setContentView(binding.root)
 
+        setupWindowInsets()
+
         selectedTab = savedInstanceState?.getInt(SELECTED_TAB) ?: 0
 
         if (savedInstanceState == null) {
@@ -270,6 +285,95 @@ class InitActivity : BasePresenterActivity<InitActivityPresenter, InitActivityVi
     override fun onResume() {
         super.onResume()
         webViewAuthenticator.authenticateWebViews(lifecycleScope, this)
+        updateStatusBarAppearanceForDrawer()
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        updateStatusBarAppearanceForDrawer()
+    }
+
+    private fun updateStatusBarAppearanceForDrawer() {
+        // Check if drawer is open and update status bar appearance accordingly (handles config changes)
+        // Post to ensure drawer state is checked after current layout pass
+        binding.drawerLayout.post {
+            if (binding.drawerLayout.isDrawerOpen(GravityCompat.START) && !ColorKeeper.darkTheme) {
+                window?.let { window ->
+                    val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                    controller?.isAppearanceLightStatusBars = true
+                }
+            } else if (!ColorKeeper.darkTheme) {
+                window?.let { window ->
+                    val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                    controller?.isAppearanceLightStatusBars = false
+                }
+            }
+        }
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        ViewCompat.setOnApplyWindowInsetsListener(container) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+
+            // Apply both navigation bar and display cutout insets
+            // This ensures content is not hidden behind the navigation bar OR the hole punch camera
+            val leftPadding = maxOf(navigationBars.left, displayCutout.left)
+            val rightPadding = maxOf(navigationBars.right, displayCutout.right)
+
+            view.setPadding(
+                leftPadding,
+                0,
+                rightPadding,
+                0
+            )
+
+            // Consume horizontal insets so child ComposeViews don't apply them again
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.navigationBars(),
+                    Insets.of(
+                        0, // Consume left
+                        navigationBars.top,
+                        0, // Consume right
+                        navigationBars.bottom
+                    )
+                )
+                .setInsets(
+                    WindowInsetsCompat.Type.displayCutout(),
+                    Insets.of(
+                        0, // Consume left
+                        displayCutout.top,
+                        0, // Consume right
+                        displayCutout.bottom
+                    )
+                )
+                .build()
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(bottomBar) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            bottomBarContainer.updateLayoutParams<RelativeLayout.LayoutParams> {
+                height = 56.toPx + navigationBars.bottom
+            }
+            insets
+        }
+
+        ViewCompat.setOnApplyWindowInsetsListener(navigationDrawerBinding.navigationDrawer) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+
+            if (isLandscape) {
+                // In landscape, navigation bar is on the left side (where drawer opens from)
+                // Apply left padding only to prevent overlap with nav bar
+                view.setPadding(insets.left, insets.top, 0, 0)
+            } else {
+                view.setPadding(insets.left, insets.top, insets.right, insets.bottom)
+            }
+            windowInsets
+        }
     }
 
     private fun requestNotificationsPermission() {
@@ -460,6 +564,24 @@ class InitActivity : BasePresenterActivity<InitActivityPresenter, InitActivityVi
         binding.drawerLayout.addDrawerListener(object : SimpleDrawerListener() {
             override fun onDrawerOpened(drawerView: View) {
                 setCloseDrawerVisibility()
+                // Set status bar icons to dark only in light mode (for visibility on white drawer background)
+                if (!ColorKeeper.darkTheme) {
+                    window?.let { window ->
+                        val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                        controller?.isAppearanceLightStatusBars = true
+                    }
+                }
+            }
+
+            override fun onDrawerClosed(drawerView: View) {
+                super.onDrawerClosed(drawerView)
+                // Restore status bar icons to light only in light mode (for dark toolbar)
+                if (!ColorKeeper.darkTheme) {
+                    window?.let { window ->
+                        val controller = ViewCompat.getWindowInsetsController(window.decorView)
+                        controller?.isAppearanceLightStatusBars = false
+                    }
+                }
             }
         })
 
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/activities/InternalWebViewActivity.kt b/apps/teacher/src/main/java/com/instructure/teacher/activities/InternalWebViewActivity.kt
index fe89585e7c..4cf17147d1 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/activities/InternalWebViewActivity.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/activities/InternalWebViewActivity.kt
@@ -19,10 +19,15 @@ package com.instructure.teacher.activities
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.interactions.router.Route
 import com.instructure.pandautils.activities.BasePresenterActivity
 import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
 import com.instructure.teacher.R
 import com.instructure.teacher.factory.InternalWebViewPresenterFactory
 import com.instructure.teacher.fragments.InternalWebViewFragment
@@ -39,10 +44,26 @@ class InternalWebViewActivity : BasePresenterActivity<InternalWebViewPresenter,
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         setContentView(R.layout.activity_internal_webview)
+        setupWindowInsets()
         handleIntentExtras(intent.getBundleExtra(Const.EXTRAS))
     }
 
+    private fun setupWindowInsets() {
+        val root = findViewById<android.view.View>(R.id.internalWebViewContainer)
+        ViewCompat.setOnApplyWindowInsetsListener(root) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            view.updatePadding(
+                left = insets.left,
+                right = insets.right
+            )
+            windowInsets
+        }
+    }
+
     override fun onReadySetGo(presenter: InternalWebViewPresenter) = setupViews()
 
     override fun onPresenterPrepared(presenter: InternalWebViewPresenter) = Unit
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt b/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt
index b5b653c514..d05a3977b3 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/activities/MasterDetailActivity.kt
@@ -24,6 +24,8 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
 import android.view.ViewTreeObserver
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.percentlayout.widget.PercentLayoutHelper
 import com.instructure.canvasapi2.StatusCallback
@@ -37,6 +39,7 @@ import com.instructure.interactions.MasterDetailInteractions
 import com.instructure.interactions.router.Route
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.interfaces.NavigationCallbacks
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.setGone
@@ -67,10 +70,13 @@ class MasterDetailActivity : BaseAppCompatActivity(), MasterDetailInteractions {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) = with(binding) {
+        EdgeToEdgeHelper.enableEdgeToEdge(this@MasterDetailActivity)
         super.onCreate(savedInstanceState)
 
         setContentView(binding.root)
 
+        setupWindowInsets()
+
         mRoute = intent.extras!!.getParcelable(Route.ROUTE)
 
         if (mRoute == null) {
@@ -119,6 +125,20 @@ class MasterDetailActivity : BaseAppCompatActivity(), MasterDetailInteractions {
         }
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.rootView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setPadding(
+                systemBars.left,
+                0,
+                systemBars.right,
+                0
+            )
+            // Don't consume the insets - let them propagate to child fragments
+            insets
+        }
+    }
+
     private fun setupWithCanvasContext(course: Course?) {
         if(course != null) {
             //we have a route, get the fragment
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/activities/RouteValidatorActivity.kt b/apps/teacher/src/main/java/com/instructure/teacher/activities/RouteValidatorActivity.kt
index 4673925316..1d662d7c8c 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/activities/RouteValidatorActivity.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/activities/RouteValidatorActivity.kt
@@ -118,6 +118,7 @@ class RouteValidatorActivity : BaseCanvasActivity() {
                     val intent = if (tokenResponse.realUser != null && tokenResponse.user != null) {
                         // We need to set the masquerade request to the user (masqueradee), the real user it the admin user currently masquerading
                         ApiPrefs.isMasqueradingFromQRCode = true
+                        ApiPrefs.masqueradeId = tokenResponse.user!!.id
                         val extras = Bundle()
                         extras.putLong(Const.QR_CODE_MASQUERADE_ID, tokenResponse.user!!.id)
                         LoginActivity.createLaunchApplicationMainActivityIntent(this@RouteValidatorActivity, extras)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/adapters/StudentContextFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/adapters/StudentContextFragment.kt
index 0a7ee54dc6..32e6ea5ca0 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/adapters/StudentContextFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/adapters/StudentContextFragment.kt
@@ -50,6 +50,9 @@ import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.ProfileUtils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.asStateList
 import com.instructure.pandautils.utils.children
 import com.instructure.pandautils.utils.color
@@ -150,6 +153,10 @@ class StudentContextFragment : PresenterFragment<StudentContextPresenter, Studen
         setupScrollListener()
 
         // Toolbar setup
+        toolbar.applyTopSystemBarInsets()
+        contentContainer.applyBottomSystemBarInsets()
+        contentContainer.clipToPadding = false
+
         if (activity is MasterDetailInteractions) {
             toolbar.setupBackButtonWithExpandCollapseAndBack(this@StudentContextFragment) {
                 toolbar.updateToolbarExpandCollapseIcon(this@StudentContextFragment)
@@ -166,6 +173,8 @@ class StudentContextFragment : PresenterFragment<StudentContextPresenter, Studen
         // Message FAB
         messageButton.setVisible()
         ViewStyler.themeFAB(messageButton)
+        messageButton.applyBottomSystemBarMargin()
+
         messageButton.setOnClickListener {
             val recipient = Recipient(
                 stringId = student.id,
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/details/AssignmentDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/details/AssignmentDetailsFragment.kt
index 0f6ec0f24c..7c4a7525e7 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/details/AssignmentDetailsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/details/AssignmentDetailsFragment.kt
@@ -46,12 +46,16 @@ import com.instructure.pandautils.features.speedgrader.SpeedGraderFragment
 import com.instructure.pandautils.features.speedgrader.SubmissionListFilter
 import com.instructure.pandautils.fragments.BasePresenterFragment
 import com.instructure.pandautils.utils.AssignmentGradedEvent
+import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.FeatureFlagProvider
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.accessibilityClassName
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.loadHtmlWithIframes
@@ -107,6 +111,7 @@ class AssignmentDetailsFragment : BasePresenterFragment<
     private var assignment: Assignment by ParcelableArg(Assignment(), ASSIGNMENT)
     private var course: Course by ParcelableArg(Course())
     private var assignmentId: Long by LongArg(0L, ASSIGNMENT_ID)
+    private var isInModulesPager: Boolean by BooleanArg(key = IS_IN_MODULES_PAGER, default = false)
 
     private var needToForceNetwork = false
 
@@ -164,9 +169,13 @@ class AssignmentDetailsFragment : BasePresenterFragment<
 
     override fun getPresenterFactory() = AssignmentDetailPresenterFactory(assignment, assignmentsApi)
 
-    override fun onPresenterPrepared(presenter: AssignmentDetailsPresenter) {}
+    override fun onPresenterPrepared(presenter: AssignmentDetailsPresenter) {
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        binding.root.applyDisplayCutoutInsets()
+    }
 
     private fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupBackButtonWithExpandCollapseAndBack(this@AssignmentDetailsFragment) {
             toolbar.updateToolbarExpandCollapseIcon(this@AssignmentDetailsFragment)
             ViewStyler.themeToolbarColored(requireActivity(), toolbar, course.color, requireContext().getColor(R.color.textLightest))
@@ -181,6 +190,10 @@ class AssignmentDetailsFragment : BasePresenterFragment<
     }
 
     private fun setupViews(assignment: Assignment) = with(binding) {
+        if (!isInModulesPager) {
+            viewDiscussionButton.applyBottomSystemBarMargin()
+        }
+
         swipeRefreshLayout.setOnRefreshListener {
             presenter.loadData(true)
 
@@ -375,6 +388,7 @@ class AssignmentDetailsFragment : BasePresenterFragment<
             viewDiscussionButton.setTextColor(ThemePrefs.buttonTextColor)
             viewDiscussionButton.setVisible()
         } else {
+            swipeRefreshLayout.applyBottomSystemBarMargin()
             viewDiscussionButton.setGone()
         }
     }
@@ -484,6 +498,10 @@ class AssignmentDetailsFragment : BasePresenterFragment<
     override fun onResume() {
         super.onResume()
         setupToolbar()
+        if (needToForceNetwork) {
+            needToForceNetwork = false
+            presenter.loadData(true)
+        }
     }
 
     override fun onStart() {
@@ -527,20 +545,23 @@ class AssignmentDetailsFragment : BasePresenterFragment<
     companion object {
         @JvmStatic val ASSIGNMENT = "assignment"
         @JvmStatic val ASSIGNMENT_ID = "assignmentId"
+        private const val IS_IN_MODULES_PAGER = "isInModulesPager"
 
         fun newInstance(course: Course, args: Bundle) = AssignmentDetailsFragment().withArgs(args).apply {
             this.course = course
         }
 
-        fun makeBundle(assignment: Assignment): Bundle {
+        fun makeBundle(assignment: Assignment, isInModulesPager: Boolean = false): Bundle {
             val args = Bundle()
             args.putParcelable(ASSIGNMENT, assignment)
+            args.putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
             return args
         }
 
-        fun makeBundle(assignmentId: Long): Bundle {
+        fun makeBundle(assignmentId: Long, isInModulesPager: Boolean = false): Bundle {
             val args = Bundle()
             args.putLong(ASSIGNMENT_ID, assignmentId)
+            args.putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
             return args
         }
 
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListFiltersScreen.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListFiltersScreen.kt
index 7c7b1034b0..8d047ae613 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListFiltersScreen.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListFiltersScreen.kt
@@ -32,7 +32,6 @@ import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -51,8 +50,8 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Section
 import com.instructure.canvasapi2.utils.NumberHelper
 import com.instructure.pandautils.compose.composables.BasicTextFieldWithHintDecoration
-import com.instructure.pandautils.compose.composables.CanvasAppBar
 import com.instructure.pandautils.compose.composables.CanvasDivider
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.CheckboxText
 import com.instructure.pandautils.compose.composables.FullScreenDialog
 import com.instructure.pandautils.compose.composables.RadioButtonText
@@ -120,7 +119,7 @@ private fun SubmissionFilterScreenContent(
     Scaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
         topBar = {
-            CanvasAppBar(
+            CanvasThemedAppBar(
                 title = stringResource(R.string.preferences),
                 subtitle = uiState.assignmentName,
                 navigationActionClick = {
@@ -129,7 +128,7 @@ private fun SubmissionFilterScreenContent(
                 navIconContentDescription = stringResource(R.string.close),
                 navIconRes = R.drawable.ic_close,
                 backgroundColor = uiState.courseColor,
-                textColor = colorResource(id = R.color.textLightest),
+                contentColor = colorResource(id = R.color.textLightest),
                 actions = {
                     TextButton(
                         modifier = Modifier.testTag("appBarDoneButton"),
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListScreen.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListScreen.kt
index 725aaef54a..47ba152f58 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListScreen.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/assignment/submission/SubmissionListScreen.kt
@@ -25,16 +25,20 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
@@ -42,7 +46,6 @@ import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -57,8 +60,9 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.instructure.pandautils.compose.composables.CanvasAppBar
 import com.instructure.pandautils.compose.composables.CanvasDivider
+import com.instructure.pandautils.compose.composables.CanvasScaffold
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.EmptyContent
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.Loading
@@ -71,17 +75,17 @@ import com.instructure.teacher.R
 fun SubmissionListScreen(uiState: SubmissionListUiState, navigationIconClick: () -> Unit) {
     var showFilterDialog by rememberSaveable { mutableStateOf(false) }
 
-    Scaffold(
+    CanvasScaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
         topBar = {
-            CanvasAppBar(
+            CanvasThemedAppBar(
                 title = stringResource(R.string.submissions),
                 subtitle = uiState.filtersUiState.assignmentName,
                 navigationActionClick = { navigationIconClick() },
                 navIconContentDescription = stringResource(R.string.back),
                 navIconRes = R.drawable.ic_back_arrow,
                 backgroundColor = uiState.filtersUiState.courseColor,
-                textColor = colorResource(id = R.color.textLightest),
+                contentColor = colorResource(id = R.color.textLightest),
                 actions = {
                     IconButton(
                         modifier = Modifier.testTag("filterButton"),
@@ -180,6 +184,7 @@ private fun SubmissionListContent(
     })
     Box(
         modifier = Modifier
+            .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
             .fillMaxSize()
             .pullRefresh(pullRefreshState)
     ) {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/files/details/FileDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/files/details/FileDetailsFragment.kt
index c307bfdab9..c7807e0b92 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/files/details/FileDetailsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/files/details/FileDetailsFragment.kt
@@ -28,6 +28,7 @@ import androidx.fragment.app.viewModels
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.utils.tryOrNull
 import com.instructure.pandautils.binding.viewBinding
+import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.makeBundle
@@ -46,6 +47,7 @@ class FileDetailsFragment : BaseCanvasFragment() {
 
     private val viewModel: FileDetailsViewModel by viewModels()
     private val binding by viewBinding(FragmentFileDetailsBinding::bind)
+    private var isInModulesPager: Boolean by BooleanArg(key = IS_IN_MODULES_PAGER, default = false)
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return inflater.inflate(R.layout.fragment_file_details, container, false)
@@ -75,17 +77,17 @@ class FileDetailsFragment : BaseCanvasFragment() {
                 fileData.url,
                 toolbarColor,
                 fileData.editableFile,
-                true
+                isInModulesPager
             )
 
             is FileViewData.Media -> ViewMediaFragment.newInstance(
-                Uri.parse(fileData.url),
-                fileData.thumbnailUrl,
-                fileData.contentType,
-                fileData.displayName,
-                true,
-                toolbarColor,
-                fileData.editableFile
+                uri = Uri.parse(fileData.url),
+                thumbnailUrl = fileData.thumbnailUrl,
+                contentType = fileData.contentType,
+                displayName = fileData.displayName,
+                toolbarColor = toolbarColor,
+                editableFile = fileData.editableFile,
+                isInModulesPager = isInModulesPager
             )
 
             is FileViewData.Image -> ViewImageFragment.newInstance(
@@ -95,7 +97,7 @@ class FileDetailsFragment : BaseCanvasFragment() {
                 true,
                 toolbarColor,
                 fileData.editableFile,
-                true
+                isInModulesPager
             )
 
             is FileViewData.Html -> ViewHtmlFragment.newInstance(
@@ -104,7 +106,7 @@ class FileDetailsFragment : BaseCanvasFragment() {
                     fileData.fileName,
                     toolbarColor,
                     fileData.editableFile,
-                    true
+                    isInModulesPager
                 )
             )
 
@@ -116,14 +118,19 @@ class FileDetailsFragment : BaseCanvasFragment() {
                 R.drawable.ic_document,
                 toolbarColor,
                 fileData.editableFile,
-                true
+                isInModulesPager
             )
         }
     }
 
     companion object {
-        fun makeBundle(canvasContext: CanvasContext, fileUrl: String): Bundle {
-            return canvasContext.makeBundle { putString(Const.FILE_URL, fileUrl) }
+        private const val IS_IN_MODULES_PAGER = "isInModulesPager"
+
+        fun makeBundle(canvasContext: CanvasContext, fileUrl: String, isInModulesPager: Boolean = false): Bundle {
+            return canvasContext.makeBundle {
+                putString(Const.FILE_URL, fileUrl)
+                putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
+            }
         }
 
         fun newInstance(bundle: Bundle) = FileDetailsFragment().withArgs(bundle)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/files/search/FileSearchFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/files/search/FileSearchFragment.kt
index 8b65117d7a..57c784da6c 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/files/search/FileSearchFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/files/search/FileSearchFragment.kt
@@ -19,6 +19,9 @@ package com.instructure.teacher.features.files.search
 import android.view.View
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.ColorUtils
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.models.CanvasContext
@@ -34,6 +37,8 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.NullableParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getDrawableCompat
 import com.instructure.pandautils.utils.isUser
@@ -107,6 +112,22 @@ class FileSearchFragment : BaseSyncFragment<
     override fun onReadySetGo(presenter: FileSearchPresenter) {
         if (recyclerView.adapter == null) binding.fileSearchRecyclerView.adapter = createAdapter()
         setupViews()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        root.applyDisplayCutoutInsets()
+        searchHeader.applyTopSystemBarInsets()
+        ViewCompat.setOnApplyWindowInsetsListener(fileSearchRecyclerView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+            view.updatePadding(bottom = maxOf(systemBars.bottom, ime.bottom))
+            insets
+        }
+        fileSearchRecyclerView.clipToPadding = false
+        if (fileSearchRecyclerView.isAttachedToWindow) {
+            ViewCompat.requestApplyInsets(fileSearchRecyclerView)
+        }
     }
 
     override fun createAdapter(): FileSearchAdapter = searchAdapter
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/inbox/list/TeacherInboxRouter.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/inbox/list/TeacherInboxRouter.kt
index 29d16bcd98..267d810abc 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/inbox/list/TeacherInboxRouter.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/inbox/list/TeacherInboxRouter.kt
@@ -43,7 +43,7 @@ import com.instructure.teacher.utils.setupBackButtonAsBackPressedOnly
 class TeacherInboxRouter(private val activity: FragmentActivity, private val fragment: Fragment) : InboxRouter {
 
     override fun openConversation(conversation: Conversation, scope: InboxApi.Scope) {
-        val route = InboxDetailsFragment.makeRoute(conversation.id, conversation.workflowState == Conversation.WorkflowState.UNREAD)
+        val route = InboxDetailsFragment.makeRoute(conversation.id, conversation.workflowState == Conversation.WorkflowState.UNREAD, scope)
         RouteMatcher.route(activity, route)
     }
 
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/modules/list/ui/ModuleListView.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/modules/list/ui/ModuleListView.kt
index b764dffaa6..8c32a49f18 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/modules/list/ui/ModuleListView.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/modules/list/ui/ModuleListView.kt
@@ -30,6 +30,9 @@ import com.instructure.pandarecycler.PaginatedScrollListener
 import com.instructure.pandautils.features.progress.ProgressDialogFragment
 import com.instructure.pandautils.room.appdatabase.entities.ModuleBulkProgressEntity
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.showThemed
 import com.instructure.teacher.R
 import com.instructure.teacher.databinding.FragmentModuleListBinding
@@ -134,6 +137,7 @@ class ModuleListView(
     init {
         // Toolbar setup
         binding.toolbar.apply {
+            applyTopSystemBarInsets()
             subtitle = course.name
             setupBackButton(activity)
             ViewStyler.themeToolbarColored(activity, this, course)
@@ -191,14 +195,20 @@ class ModuleListView(
             }
         }
 
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        binding.root.applyDisplayCutoutInsets()
+
         binding.recyclerView.apply {
             layoutManager = this@ModuleListView.layoutManager
             adapter = this@ModuleListView.adapter
             addOnScrollListener(scrollListener)
         }
 
-        binding.swipeRefreshLayout.setOnRefreshListener {
-            consumer?.accept(ModuleListEvent.PullToRefresh)
+        binding.swipeRefreshLayout.apply {
+            setOnRefreshListener {
+                consumer?.accept(ModuleListEvent.PullToRefresh)
+            }
+            applyBottomSystemBarInsets()
         }
     }
 
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/modules/progression/ModuleProgressionFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/modules/progression/ModuleProgressionFragment.kt
index 37c4a66c69..6ec7802cb2 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/modules/progression/ModuleProgressionFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/modules/progression/ModuleProgressionFragment.kt
@@ -34,6 +34,7 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.setHidden
 import com.instructure.teacher.R
@@ -68,6 +69,10 @@ class ModuleProgressionFragment : BaseCanvasFragment() {
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
 
+        binding.previous.applyBottomSystemBarMargin()
+        binding.moduleName.applyBottomSystemBarMargin()
+        binding.next.applyBottomSystemBarMargin()
+
         viewModel.data.observe(viewLifecycleOwner) {
             setupPager(it)
         }
@@ -107,19 +112,19 @@ class ModuleProgressionFragment : BaseCanvasFragment() {
 
     private fun createFragment(item: ModuleItemViewData) = when (item) {
         is ModuleItemViewData.Page -> PageDetailsFragment.newInstance(
-            canvasContext, PageDetailsFragment.makeBundle(item.pageUrl)
+            canvasContext, PageDetailsFragment.makeBundle(item.pageUrl, isInModulesPager = true)
         )
 
         is ModuleItemViewData.Assignment -> AssignmentDetailsFragment.newInstance(
-            canvasContext as Course, AssignmentDetailsFragment.makeBundle(item.assignmentId)
+            canvasContext as Course, AssignmentDetailsFragment.makeBundle(item.assignmentId, isInModulesPager = true)
         )
 
         is ModuleItemViewData.Discussion -> DiscussionDetailsWebViewFragment.newInstance(
-            DiscussionDetailsWebViewFragment.makeRoute(canvasContext, item.discussionTopicHeaderId)
+            DiscussionDetailsWebViewFragment.makeRoute(canvasContext, item.discussionTopicHeaderId, isInModulesPager = true)
         )!!
 
         is ModuleItemViewData.Quiz -> QuizDetailsFragment.newInstance(
-            canvasContext as Course, QuizDetailsFragment.makeBundle(item.quizId)
+            canvasContext as Course, QuizDetailsFragment.makeBundle(item.quizId, isInModulesPager = true)
         )
 
         is ModuleItemViewData.External -> InternalWebViewFragment.newInstance(
@@ -134,7 +139,7 @@ class ModuleProgressionFragment : BaseCanvasFragment() {
         )
 
         is ModuleItemViewData.File -> FileDetailsFragment.newInstance(
-            FileDetailsFragment.makeBundle(canvasContext, item.fileUrl)
+            FileDetailsFragment.makeBundle(canvasContext, item.fileUrl, isInModulesPager = true)
         )
     }
 
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/postpolicies/ui/PostPolicyFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/postpolicies/ui/PostPolicyFragment.kt
index 506f4eda7a..ae48966260 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/postpolicies/ui/PostPolicyFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/postpolicies/ui/PostPolicyFragment.kt
@@ -21,6 +21,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
@@ -33,6 +36,7 @@ import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.withArgs
 import com.instructure.teacher.R
@@ -56,6 +60,18 @@ class PostPolicyFragment : BaseCanvasFragment() {
         val titles = listOf(getString(R.string.postGradesTab), getString(R.string.hideGradesTab))
         binding.postPolicyPager.adapter = PostPolicyPagerAdapter(assignment, childFragmentManager, titles)
         binding.postPolicyTabLayout.setupWithViewPager(binding.postPolicyPager, true)
+
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        postPolicyToolbar.applyTopSystemBarInsets()
+
+        ViewCompat.setOnApplyWindowInsetsListener(postPolicyPager) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
     }
 
     override fun onResume() {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/PdfTeacherSubmissionView.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/PdfTeacherSubmissionView.kt
index d7c64a17c7..394919a4f4 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/PdfTeacherSubmissionView.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/PdfTeacherSubmissionView.kt
@@ -50,8 +50,9 @@ import com.instructure.teacher.view.AnnotationCommentDeleteAcknowledged
 import com.instructure.teacher.view.AnnotationCommentDeleted
 import com.instructure.teacher.view.AnnotationCommentEdited
 import com.pspdfkit.preferences.PSPDFKitPreferences
+import com.pspdfkit.ui.annotations.OnAnnotationCreationModeChangeListener
+import com.pspdfkit.ui.annotations.OnAnnotationEditingModeChangeListener
 import com.pspdfkit.ui.inspector.PropertyInspectorCoordinatorLayout
-import com.pspdfkit.ui.special_mode.manager.AnnotationManager
 import com.pspdfkit.ui.toolbar.ToolbarCoordinatorLayout
 import kotlinx.coroutines.Job
 import okhttp3.ResponseBody
@@ -69,8 +70,8 @@ class PdfTeacherSubmissionView(
     private val studentAnnotationSubmit: Boolean = false,
     private val studentAnnotationView: Boolean = false
 ) : PdfSubmissionView(activity, studentAnnotationView, courseId),
-    AnnotationManager.OnAnnotationCreationModeChangeListener,
-    AnnotationManager.OnAnnotationEditingModeChangeListener {
+    OnAnnotationCreationModeChangeListener,
+    OnAnnotationEditingModeChangeListener {
 
     private val binding: ViewPdfTeacherSubmissionBinding
 
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/commentlibrary/CommentLibraryFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/commentlibrary/CommentLibraryFragment.kt
index 874964767a..f3fef0de3d 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/commentlibrary/CommentLibraryFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/speedgrader/commentlibrary/CommentLibraryFragment.kt
@@ -27,6 +27,8 @@ import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.teacher.databinding.FragmentCommentLibraryBinding
 import com.instructure.teacher.utils.setupCloseButton
 import dagger.hilt.android.AndroidEntryPoint
@@ -56,9 +58,17 @@ class CommentLibraryFragment : BaseCanvasFragment() {
             }
         }
 
+        setupWindowInsets()
+
         return binding.root
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        commentLibraryToolbar.applyTopSystemBarInsets()
+        commentLibraryRecyclerView.applyImeAndSystemBarInsets()
+        commentInputContainer.root.applyImeAndSystemBarInsets()
+    }
+
     override fun onResume() {
         super.onResume()
         setupToolbar()
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/edit/EditSyllabusView.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/edit/EditSyllabusView.kt
index 16a964a8ec..d650f70f5f 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/edit/EditSyllabusView.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/edit/EditSyllabusView.kt
@@ -28,6 +28,7 @@ import com.instructure.canvasapi2.models.Course
 import com.instructure.pandautils.dialogs.UnsavedChangesExitDialog
 import com.instructure.pandautils.discussions.DiscussionUtils
 import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.views.CanvasWebView
 import com.instructure.teacher.R
 import com.instructure.teacher.databinding.FragmentEditSyllabusBinding
@@ -58,6 +59,7 @@ class EditSyllabusView(
 
     fun setupToolbar() = with(binding) {
         val activity = context as? FragmentActivity
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupCloseButton { activity?.onBackPressed() }
         toolbar.setupMenu(R.menu.menu_edit_syllabus) { menuItem ->
             when (menuItem.itemId) {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusRepositoryFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusRepositoryFragment.kt
index fe0e59eeaf..ca6fca3fd8 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusRepositoryFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusRepositoryFragment.kt
@@ -17,6 +17,7 @@
 
 package com.instructure.teacher.features.syllabus.ui
 
+import android.os.Bundle
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
 import com.instructure.pandautils.utils.Const
@@ -31,6 +32,11 @@ class SyllabusRepositoryFragment : SyllabusFragment() {
     @Inject
     lateinit var syllabusRepository: SyllabusRepository
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        retainInstance = false
+    }
+
     override fun getRepository() = syllabusRepository
 
     companion object {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusView.kt b/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusView.kt
index 4fb9f3c288..291dc295a0 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusView.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/features/syllabus/ui/SyllabusView.kt
@@ -33,6 +33,9 @@ import com.instructure.canvasapi2.utils.exhaustive
 import com.instructure.interactions.router.Route
 import com.instructure.pandautils.features.calendarevent.details.EventFragment
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getDrawableCompat
 import com.instructure.pandautils.utils.onClick
@@ -89,6 +92,12 @@ class SyllabusView(
     }
 
     init {
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.swipeRefreshLayout.applyBottomSystemBarInsets()
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        binding.root.applyDisplayCutoutInsets()
+
         binding.toolbar.setupMenu(R.menu.menu_edit_generic) { consumer?.accept(SyllabusEvent.EditClicked) }
         setEditVisibility(false)
         ViewStyler.themeToolbarColored(activity, binding.toolbar, canvasContext)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/AssigneeListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/AssigneeListFragment.kt
index 0e770799f8..142176f729 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/AssigneeListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/AssigneeListFragment.kt
@@ -22,6 +22,10 @@ import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
 import android.view.View
 import android.widget.TextView
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.instructure.canvasapi2.models.CanvasComparable
@@ -33,7 +37,13 @@ import com.instructure.pandautils.analytics.SCREEN_VIEW_ASSIGNEE_LIST
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.fragments.BaseExpandableSyncFragment
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.IntArg
+import com.instructure.pandautils.utils.ParcelableArrayListArg
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.bind
+import com.instructure.pandautils.utils.setVisible
 import com.instructure.pandautils.views.EmptyView
 import com.instructure.teacher.R
 import com.instructure.teacher.adapters.AssigneeListAdapter
@@ -42,7 +52,11 @@ import com.instructure.teacher.factory.AssigneeListPresenterFactory
 import com.instructure.teacher.holders.AssigneeViewHolder
 import com.instructure.teacher.models.AssigneeCategory
 import com.instructure.teacher.presenters.AssigneeListPresenter
-import com.instructure.teacher.utils.*
+import com.instructure.teacher.utils.EditDateGroups
+import com.instructure.teacher.utils.RecyclerViewUtils
+import com.instructure.teacher.utils.getColorCompat
+import com.instructure.teacher.utils.setupCloseButton
+import com.instructure.teacher.utils.setupMenu
 import com.instructure.teacher.viewinterface.AssigneeListView
 
 @ScreenView(SCREEN_VIEW_ASSIGNEE_LIST)
@@ -72,7 +86,16 @@ class AssigneeListFragment : BaseExpandableSyncFragment<
     override fun withPagination() = false
     override fun perPageCount() = ApiPrefs.perPageCount
     override fun getPresenterFactory() = AssigneeListPresenterFactory(mDateGroups, mTargetIdx, sections, groups, students)
-    override fun onCreateView(view: View) {}
+    override fun onCreateView(view: View) {
+        view.findViewById<Toolbar>(R.id.toolbar)?.applyTopSystemBarInsets()
+
+        val recyclerView = view.findViewById<RecyclerView>(R.id.recyclerView)
+        ViewCompat.setOnApplyWindowInsetsListener(recyclerView) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
+    }
 
     private fun performSave() {
         presenter.save()
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/AttendanceListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/AttendanceListFragment.kt
index 40a728eaeb..067060803d 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/AttendanceListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/AttendanceListFragment.kt
@@ -51,6 +51,7 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
 import com.instructure.pandautils.utils.isTablet
@@ -113,6 +114,7 @@ class AttendanceListFragment : BaseSyncFragment<
 
     private fun setupViews() = with(binding) {
         webView.enableAlgorithmicDarkening()
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupMenu(R.menu.menu_attendance) { menuItem ->
             when(menuItem.itemId) {
                 R.id.menuFilterSections -> { /* Do Nothing */ }
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ChooseRecipientsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ChooseRecipientsFragment.kt
index 0088707ca9..f7b5762879 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ChooseRecipientsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ChooseRecipientsFragment.kt
@@ -21,6 +21,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Recipient
@@ -31,6 +34,7 @@ import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.fragments.BaseSyncFragment
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.nonNullArgs
 import com.instructure.teacher.R
 import com.instructure.teacher.adapters.ChooseMessageRecipientRecyclerAdapter
@@ -106,12 +110,23 @@ class ChooseRecipientsFragment : BaseSyncFragment<Recipient, ChooseRecipientsPre
 
         setupToolbar(view)
         view.findViewById<TextView>(R.id.menuDone).setTextColor(ThemePrefs.textButtonColor)
+
+        view.findViewById<Toolbar>(R.id.toolbar).applyTopSystemBarInsets()
+
         return view
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         swipeRefreshLayoutContainerBinding = RecyclerSwipeRefreshLayoutBinding.bind(view)
         super.onViewCreated(view, savedInstanceState)
+
+        mRecyclerView?.let { recyclerView ->
+            ViewCompat.setOnApplyWindowInsetsListener(recyclerView) { v, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                v.updatePadding(bottom = systemBars.bottom)
+                insets
+            }
+        }
     }
 
     override fun layoutResId(): Int = R.layout.fragment_choose_recipients
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseBrowserFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseBrowserFragment.kt
index 6c6389925d..b4391cd825 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseBrowserFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseBrowserFragment.kt
@@ -22,6 +22,9 @@ import android.net.Uri
 import android.view.MenuItem
 import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import com.instructure.canvasapi2.models.CanvasContext
@@ -43,9 +46,12 @@ import com.instructure.pandautils.fragments.BaseSyncFragment
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.Const.CANVAS_STUDENT_ID
 import com.instructure.pandautils.utils.Const.MARKET_URI_PREFIX
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.a11yManager
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isSwitchAccessEnabled
 import com.instructure.pandautils.utils.isTablet
@@ -143,6 +149,9 @@ class CourseBrowserFragment : BaseSyncFragment<
         )
         appBarLayout.addOnOffsetChangedListener(this@CourseBrowserFragment)
         collapsingToolbarLayout.isTitleEnabled = false
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        rootView.applyDisplayCutoutInsets()
     }
 
     override fun onReadySetGo(presenter: CourseBrowserPresenter) {
@@ -162,6 +171,14 @@ class CourseBrowserFragment : BaseSyncFragment<
         binding.courseBrowserSubtitle.text = (presenter.canvasContext as? Course)?.term?.name.orEmpty()
         courseBrowserHeader.setTitleAndSubtitle(presenter.canvasContext.name.orEmpty(), (presenter.canvasContext as? Course)?.term?.name.orEmpty())
         setupToolbar()
+
+        // Force status bar to course color after all other initialization
+        requireActivity().window?.let { window ->
+            EdgeToEdgeHelper.setStatusBarColor(window, presenter.canvasContext.color)
+            val controller = ViewCompat.getWindowInsetsController(window.decorView)
+            controller?.isAppearanceLightStatusBars = false
+        }
+
         if (!presenter.isEmpty) {
             checkIfEmpty()
         }
@@ -197,12 +214,58 @@ class CourseBrowserFragment : BaseSyncFragment<
             overlayToolbar
         }
 
+        appBarLayout.setBackgroundColor(presenter.canvasContext.color)
+
+        // Handle insets based on color overlay setting
+        // Skip top insets when masquerading - MasqueradeUI handles it
+        if (overlayToolbar.isVisible) {
+            // Color overlay enabled: apply padding to AppBarLayout
+            ViewCompat.setOnApplyWindowInsetsListener(appBarLayout) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                val topInset = if (ApiPrefs.isMasquerading) 0 else systemBars.top
+                view.setPadding(view.paddingLeft, topInset, view.paddingRight, view.paddingBottom)
+                insets
+            }
+            ViewCompat.requestApplyInsets(appBarLayout)
+        } else {
+            // Color overlay disabled: Update toolbar height and add padding
+            val actionBarSize = resources.getDimensionPixelSize(androidx.appcompat.R.dimen.abc_action_bar_default_height_material)
+            ViewCompat.setOnApplyWindowInsetsListener(noOverlayToolbar) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                val topInset = if (ApiPrefs.isMasquerading) 0 else systemBars.top
+
+                // Update toolbar's actual height to accommodate status bar (use fixed base height)
+                val layoutParams = view.layoutParams
+                if (layoutParams != null) {
+                    layoutParams.height = actionBarSize + topInset
+                    view.layoutParams = layoutParams
+                }
+
+                // Add padding to push content down
+                view.setPadding(view.paddingLeft, topInset, view.paddingRight, view.paddingBottom)
+                insets
+            }
+            ViewCompat.requestApplyInsets(noOverlayToolbar)
+
+            // Make AppBarLayout extend behind status bar
+            ViewCompat.setOnApplyWindowInsetsListener(appBarLayout) { view, insets ->
+                insets // Don't add padding, just extend background
+            }
+        }
+
         toolbar.setupBackButton(this@CourseBrowserFragment)
         toolbar.setupMenu(R.menu.menu_course_browser, menuItemCallback)
         ViewStyler.colorToolbarIconsAndText(requireActivity(), toolbar, requireContext().getColor(R.color.textLightest))
-        ViewStyler.setStatusBarDark(requireActivity(), presenter.canvasContext.color)
+
+        // Set status bar to course color with light icons (same as collapsed state)
+        EdgeToEdgeHelper.setStatusBarColor(requireActivity().window, presenter.canvasContext.color)
+        requireActivity().window?.let { window ->
+            val controller = ViewCompat.getWindowInsetsController(window.decorView)
+            controller?.isAppearanceLightStatusBars = false // White icons on colored background
+        }
 
         collapsingToolbarLayout.setContentScrimColor(presenter.canvasContext.color)
+        swipeRefreshLayout.applyBottomSystemBarInsets()
 
         // Hide image placeholder if color overlay is disabled and there is no valid image
         val hasImage = (presenter.canvasContext as? Course)?.imageUrl?.isValid() == true
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseSettingsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseSettingsFragment.kt
index 8c9b450ad6..d001706794 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseSettingsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/CourseSettingsFragment.kt
@@ -31,6 +31,8 @@ import com.instructure.pandautils.fragments.BasePresenterFragment
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.onClickWithRequireNetwork
 import com.instructure.pandautils.utils.setCourseImage
@@ -97,9 +99,13 @@ class CourseSettingsFragment : BasePresenterFragment<
         editCourseHomepage.root.onClickWithRequireNetwork {
             presenter.editCourseHomePageClicked(course)
         }
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        root.applyDisplayCutoutInsets()
     }
 
     private fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupBackButton(this@CourseSettingsFragment)
         toolbar.title = getString(R.string.course_settings)
         ViewStyler.themeToolbarLight(requireActivity(), toolbar)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/CreateOrEditPageDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/CreateOrEditPageDetailsFragment.kt
index 237b55bfde..5b604e6cac 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/CreateOrEditPageDetailsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/CreateOrEditPageDetailsFragment.kt
@@ -27,6 +27,9 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.Page
@@ -53,6 +56,7 @@ import com.instructure.pandautils.utils.RequestCodes
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.applyTheme
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.handleLTIPlaceHolders
 import com.instructure.pandautils.utils.hideKeyboard
 import com.instructure.pandautils.utils.onClickWithRequireNetwork
@@ -97,7 +101,15 @@ class CreateOrEditPageDetailsFragment : BasePresenterFragment<
     override val skipCheck = false
     override fun onRefreshFinished() {}
     override fun onRefreshStarted() {}
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) { }
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        binding.toolbar.applyTopSystemBarInsets()
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.scrollView) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
+    }
     override fun onPresenterPrepared(presenter: CreateOrEditPagePresenter) {}
 
     override val bindingInflater: (layoutInflater: LayoutInflater) -> FragmentCreateOrEditPageBinding = FragmentCreateOrEditPageBinding::inflate
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DashboardFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DashboardFragment.kt
index 93f0a6e499..1ebdb71530 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DashboardFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DashboardFragment.kt
@@ -23,6 +23,9 @@ import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.MotionEvent.ACTION_CANCEL
 import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.GridLayoutManager
@@ -43,6 +46,7 @@ import com.instructure.pandautils.utils.NetworkStateProvider
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.Utils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.fadeAnimationWithAction
 import com.instructure.pandautils.utils.getDrawableCompat
 import com.instructure.pandautils.utils.requestAccessibilityFocus
@@ -160,6 +164,16 @@ class DashboardFragment : BaseSyncFragment<Course, DashboardPresenter, CoursesVi
         courseRecyclerView.setPaddingRelative(padding, paddingTop, padding, padding)
         courseRecyclerView.clipToPadding = false
 
+        // Apply bottom insets to RecyclerView
+        ViewCompat.setOnApplyWindowInsetsListener(courseRecyclerView) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(bottom = padding + systemBars.bottom)
+            insets
+        }
+        if (courseRecyclerView.isAttachedToWindow) {
+            ViewCompat.requestApplyInsets(courseRecyclerView)
+        }
+
         emptyCoursesView.onClickAddCourses { routeEditDashboard() }
         setupHeader()
 
@@ -182,6 +196,7 @@ class DashboardFragment : BaseSyncFragment<Course, DashboardPresenter, CoursesVi
     }
 
     private fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupMenu(R.menu.courses_fragment, menuItemCallback)
 
         val dashboardLayoutMenuItem = toolbar.menu.findItem(R.id.menu_dashboard_cards)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt
index 645a419f48..e46e5551a3 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DiscussionsListFragment.kt
@@ -42,6 +42,10 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
+import com.instructure.pandautils.utils.applyBottomAndRightSystemBarMargin
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.color
@@ -123,6 +127,9 @@ open class DiscussionsListFragment : BaseExpandableSyncFragment<
 
         setupViews()
 
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        rootView.applyDisplayCutoutInsets()
+
         lifecycleScope.collectOneOffEvents(discussionSharedEvents.events.flowWithLifecycle(lifecycle)) { handleSharedAction(it) }
     }
 
@@ -221,6 +228,9 @@ open class DiscussionsListFragment : BaseExpandableSyncFragment<
     }
 
     private fun setupToolbar() = with(binding) {
+        discussionListToolbar.applyTopSystemBarInsets()
+        swipeRefreshLayout.applyImeAndSystemBarInsets()
+        discussionRecyclerView.clipToPadding = false
         discussionListToolbar.title = if(isAnnouncements) getString(R.string.tab_announcements) else getString(R.string.tab_discussions)
         discussionListToolbar.subtitle = canvasContext.name
         discussionListToolbar.setupBackButton(this@DiscussionsListFragment)
@@ -237,9 +247,11 @@ open class DiscussionsListFragment : BaseExpandableSyncFragment<
     }
 
     private fun setupViews() = with(binding) {
+        createNewDiscussion.applyBottomAndRightSystemBarMargin()
         createNewDiscussion.setGone()
         createNewDiscussion.backgroundTintList = ViewStyler.makeColorStateListForButton()
         createNewDiscussion.setImageDrawable(ColorUtils.colorIt(ThemePrefs.buttonTextColor, createNewDiscussion.drawable))
+
         createNewDiscussion.onClickWithRequireNetwork {
             if(isAnnouncements) {
                 val route = CreateDiscussionWebViewFragment.makeRoute(canvasContext, true)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DueDatesFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DueDatesFragment.kt
index 35e87e1b93..b174579c5f 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/DueDatesFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/DueDatesFragment.kt
@@ -18,6 +18,10 @@ package com.instructure.teacher.fragments
 
 import android.os.Bundle
 import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.instructure.canvasapi2.models.Assignment
@@ -31,6 +35,8 @@ import com.instructure.pandautils.features.discussion.create.CreateDiscussionWeb
 import com.instructure.pandautils.fragments.BaseSyncFragment
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.bind
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isTablet
@@ -66,7 +72,19 @@ class DueDatesFragment : BaseSyncFragment<DueDateGroup, DueDatesPresenter, DueDa
     override val recyclerView get() = dueDateRecyclerView
     override fun withPagination() = false
     override fun getPresenterFactory() = DueDatesPresenterFactory(mAssignment)
-    override fun onCreateView(view: View) {}
+    override fun onCreateView(view: View) {
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        view.applyDisplayCutoutInsets()
+
+        view.findViewById<Toolbar>(R.id.toolbar)?.applyTopSystemBarInsets()
+
+        val recyclerView = view.findViewById<RecyclerView>(R.id.recyclerView)
+        ViewCompat.setOnApplyWindowInsetsListener(recyclerView) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
+    }
 
     override fun onResume() {
         super.onResume()
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditAssignmentDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditAssignmentDetailsFragment.kt
index 5be1cbca48..369bff8f75 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditAssignmentDetailsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditAssignmentDetailsFragment.kt
@@ -37,13 +37,17 @@ import com.instructure.canvasapi2.managers.AssignmentManager
 import com.instructure.canvasapi2.managers.GroupCategoriesManager
 import com.instructure.canvasapi2.managers.SectionManager
 import com.instructure.canvasapi2.managers.UserManager
-import com.instructure.canvasapi2.models.*
+import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Assignment.Companion.GPA_SCALE_TYPE
 import com.instructure.canvasapi2.models.Assignment.Companion.LETTER_GRADE_TYPE
 import com.instructure.canvasapi2.models.Assignment.Companion.NOT_GRADED_TYPE
 import com.instructure.canvasapi2.models.Assignment.Companion.PASS_FAIL_TYPE
 import com.instructure.canvasapi2.models.Assignment.Companion.PERCENT_TYPE
 import com.instructure.canvasapi2.models.Assignment.Companion.POINTS_TYPE
+import com.instructure.canvasapi2.models.Course
+import com.instructure.canvasapi2.models.Group
+import com.instructure.canvasapi2.models.Section
+import com.instructure.canvasapi2.models.User
 import com.instructure.canvasapi2.models.postmodels.AssignmentPostBody
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.canvasapi2.utils.NumberHelper
@@ -61,7 +65,26 @@ import com.instructure.pandautils.dialogs.DatePickerDialogFragment
 import com.instructure.pandautils.dialogs.TimePickerDialogFragment
 import com.instructure.pandautils.discussions.DiscussionUtils
 import com.instructure.pandautils.fragments.BaseFragment
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.MediaUploadUtils
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.Placeholder
+import com.instructure.pandautils.utils.RequestCodes
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTheme
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.children
+import com.instructure.pandautils.utils.descendants
+import com.instructure.pandautils.utils.handleLTIPlaceHolders
+import com.instructure.pandautils.utils.hideKeyboard
+import com.instructure.pandautils.utils.onTextChanged
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.toast
+import com.instructure.pandautils.utils.withArgs
 import com.instructure.pandautils.views.CanvasWebView
 import com.instructure.teacher.R
 import com.instructure.teacher.databinding.FragmentEditAssignmentDetailsBinding
@@ -71,7 +94,12 @@ import com.instructure.teacher.events.AssignmentUpdatedEvent
 import com.instructure.teacher.events.post
 import com.instructure.teacher.models.DueDateGroup
 import com.instructure.teacher.router.RouteMatcher
-import com.instructure.teacher.utils.*
+import com.instructure.teacher.utils.EditDateGroups
+import com.instructure.teacher.utils.getColorCompat
+import com.instructure.teacher.utils.groupedDueDates
+import com.instructure.teacher.utils.setGroupedDueDates
+import com.instructure.teacher.utils.setupCloseButton
+import com.instructure.teacher.utils.setupMenu
 import com.instructure.teacher.view.AssignmentOverrideView
 import kotlinx.coroutines.Job
 import org.greenrobot.eventbus.EventBus
@@ -79,7 +107,7 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.text.DecimalFormat
 import java.text.ParseException
-import java.util.*
+import java.util.Date
 
 @PageView(url = "{canvasContext}/assignments/{assignmentId}")
 @ScreenView(SCREEN_VIEW_EDIT_ASSIGNMENT_DETAILS)
@@ -166,6 +194,12 @@ class EditAssignmentDetailsFragment : BaseFragment() {
 
         setupViews()
         setupToolbar()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        root.applyDisplayCutoutInsets()
+        scrollView.applyBottomSystemBarInsets()
     }
 
     override fun onStart() {
@@ -192,6 +226,7 @@ class EditAssignmentDetailsFragment : BaseFragment() {
     }
 
     private fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupCloseButton(this@EditAssignmentDetailsFragment)
         toolbar.title = getString(R.string.edit_assignment)
         toolbar.setupMenu(R.menu.menu_save_generic) { saveAssignment() }
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditFileFolderFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditFileFolderFragment.kt
index cc192db583..72c701fcfa 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditFileFolderFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditFileFolderFragment.kt
@@ -25,6 +25,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.AdapterView
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import android.widget.ArrayAdapter
 import android.widget.EditText
 import android.widget.TextView
@@ -54,6 +57,7 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ParcelableArrayListArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.descendants
 import com.instructure.pandautils.utils.postSticky
 import com.instructure.pandautils.utils.setGone
@@ -145,6 +149,19 @@ class EditFileFolderFragment : BasePresenterFragment<
         showUsageRights(presenter.usageRightsEnabled)
         setupToolbar()
         setupViews()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
+        ViewCompat.setOnApplyWindowInsetsListener(editFileFolderContentLayout) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
+        if (editFileFolderScrollView.isAttachedToWindow) {
+            ViewCompat.requestApplyInsets(editFileFolderScrollView)
+        }
     }
 
     override fun getPresenterFactory() = EditFilePresenterFactory(currentFileOrFolder, usageRightsEnabled, licenseList, courseId)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditQuizDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditQuizDetailsFragment.kt
index 28ddd801b7..2023f8004c 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditQuizDetailsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/EditQuizDetailsFragment.kt
@@ -56,7 +56,10 @@ import com.instructure.pandautils.utils.Placeholder
 import com.instructure.pandautils.utils.RequestCodes
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
 import com.instructure.pandautils.utils.applyTheme
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.children
 import com.instructure.pandautils.utils.descendants
 import com.instructure.pandautils.utils.handleLTIPlaceHolders
@@ -152,6 +155,13 @@ class EditQuizDetailsFragment : BasePresenterFragment<
         // Hide Keyboard
         requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
         setupToolbar()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        root.applyDisplayCutoutInsets()
+        toolbar.applyTopSystemBarInsets()
+        scrollView.applyBottomSystemBarInsets()
     }
 
     override fun populateQuizDetails() {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/FeatureFlagsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/FeatureFlagsFragment.kt
index ac077215c9..4c45dea40e 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/FeatureFlagsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/FeatureFlagsFragment.kt
@@ -20,12 +20,16 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.pandautils.base.BaseCanvasFragment
 import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.utils.FeatureFlagPref
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.teacher.R
@@ -45,6 +49,14 @@ class FeatureFlagsFragment : BaseCanvasFragment() {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
         binding.recyclerView.adapter = FeatureFlagAdapter()
+
+        binding.toolbar.applyTopSystemBarInsets()
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.recyclerView) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
     }
 
     private fun setupToolbar() {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/FileListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/FileListFragment.kt
index 2ecbcaf3df..b6c560a122 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/FileListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/FileListFragment.kt
@@ -50,6 +50,10 @@ import com.instructure.pandautils.utils.FileUploadEvent
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getDrawableCompat
 import com.instructure.pandautils.utils.isCourse
@@ -222,6 +226,7 @@ class FileListFragment : BaseSyncFragment<
 
         setupToolbar()
         setupViews()
+        setupWindowInsets()
     }
 
     override fun createAdapter(): FileListAdapter {
@@ -308,10 +313,12 @@ class FileListFragment : BaseSyncFragment<
     }
 
     private fun setupViews() = with(binding) {
+        swipeRefreshLayout.applyBottomSystemBarInsets()
+
         ViewStyler.themeFAB(addFab)
         ViewStyler.themeFAB(addFileFab)
         ViewStyler.themeFAB(addFolderFab)
-
+        addFab.applyBottomSystemBarMargin()
         addFab.setOnClickListener { animateFabs() }
         addFileFab.setOnClickListener {
             animateFabs()
@@ -345,6 +352,10 @@ class FileListFragment : BaseSyncFragment<
         })
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        fileListPage.applyDisplayCutoutInsets()
+    }
+
     override fun workInfoLiveDataCallback(uuid: UUID?, workInfoLiveData: LiveData<WorkInfo?>) {
         workInfoLiveData.observe(viewLifecycleOwner) {
             if (it?.state == WorkInfo.State.SUCCEEDED) {
@@ -354,6 +365,7 @@ class FileListFragment : BaseSyncFragment<
     }
 
     private fun setupToolbar() = with(binding) {
+        fileListToolbar.applyTopSystemBarInsets()
         fileListToolbar.setupBackButton(this@FileListFragment)
 
         fileListToolbar.subtitle = presenter.mCanvasContext.name
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/InternalWebViewFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/InternalWebViewFragment.kt
index fe56237bba..cfc709fd96 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/InternalWebViewFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/InternalWebViewFragment.kt
@@ -22,6 +22,9 @@ import android.os.Bundle
 import android.view.View
 import android.webkit.WebView
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.canvasapi2.managers.OAuthManager
 import com.instructure.canvasapi2.models.AuthenticatedSession
 import com.instructure.canvasapi2.models.CanvasContext
@@ -40,6 +43,8 @@ import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
 import com.instructure.pandautils.utils.setGone
@@ -102,6 +107,12 @@ open class InternalWebViewFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         toolbar = view.findViewById(R.id.toolbar)
+
+        toolbar?.applyTopSystemBarInsets()
+
+        if (!isInModulesPager) {
+            binding.canvasWebViewContainer.applyBottomSystemBarInsets()
+        }
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) = with(binding) {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/NotATeacherFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/NotATeacherFragment.kt
index 80178a5f0b..85ee021180 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/NotATeacherFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/NotATeacherFragment.kt
@@ -19,8 +19,6 @@ package com.instructure.teacher.fragments
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.View
 import com.instructure.loginapi.login.tasks.LogoutTask
 import com.instructure.pandautils.analytics.SCREEN_VIEW_NOT_A_TEACHER
@@ -28,6 +26,7 @@ import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.features.reminder.AlarmScheduler
 import com.instructure.pandautils.fragments.BaseFragment
+import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.teacher.R
 import com.instructure.teacher.databinding.FragmentNotATeacherBinding
 import com.instructure.teacher.tasks.TeacherLogoutTask
@@ -53,6 +52,9 @@ class NotATeacherFragment : BaseFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
         super.onViewCreated(view, savedInstanceState)
+        if (activity != null) {
+            ViewStyler.themeStatusBar(requireActivity())
+        }
 
         parentLink.setOnClickListener {
             openApp(PARENT_ID)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageDetailsFragment.kt
index e6c9dd05e2..81765762c2 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageDetailsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageDetailsFragment.kt
@@ -39,10 +39,13 @@ import com.instructure.pandautils.features.file.download.FileDownloadWorker
 import com.instructure.pandautils.features.lti.LtiLaunchFragment
 import com.instructure.pandautils.fragments.BasePresenterFragment
 import com.instructure.pandautils.utils.FeatureFlagProvider
+import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.PermissionUtils
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getModuleItemId
 import com.instructure.pandautils.utils.isTablet
@@ -85,6 +88,7 @@ class PageDetailsFragment : BasePresenterFragment<
     private var canvasContext: CanvasContext by ParcelableArg(default = Course())
     private var page: Page by ParcelableArg(Page(), PAGE)
     private var pageId: String by StringArg(key = PAGE_ID)
+    private var isInModulesPager: Boolean by BooleanArg(key = IS_IN_MODULES_PAGER, default = false)
 
     private var downloadUrl: String? = null
     var downloadFileName: String? = null
@@ -138,6 +142,9 @@ class PageDetailsFragment : BasePresenterFragment<
             presenter.getPage(page.url ?: "", canvasContext, true)
         }
         setupToolbar()
+        if (!isInModulesPager) {
+            canvasWebViewWraper.applyBottomSystemBarInsets()
+        }
 
         canvasWebViewWraper.webView.canvasWebViewClientCallback = object : CanvasWebView.CanvasWebViewClientCallback {
             override fun openMediaFromWebView(mime: String, url: String, filename: String) {
@@ -222,6 +229,7 @@ class PageDetailsFragment : BasePresenterFragment<
     }
 
     private fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupMenu(R.menu.menu_page_details) { openEditPage(page) }
 
         toolbar.setupBackButtonWithExpandCollapseAndBack(this@PageDetailsFragment) {
@@ -268,13 +276,18 @@ class PageDetailsFragment : BasePresenterFragment<
 
     companion object {
         const val PAGE = "pageDetailsPage"
-
         const val PAGE_ID = "pageDetailsId"
+        private const val IS_IN_MODULES_PAGER = "isInModulesPager"
 
-        fun makeBundle(page: Page): Bundle = Bundle().apply { putParcelable(PAGE, page) }
-
-        fun makeBundle(pageId: String): Bundle = Bundle().apply { putString(PAGE_ID, pageId) }
+        fun makeBundle(page: Page, isInModulesPager: Boolean = false): Bundle = Bundle().apply {
+            putParcelable(PAGE, page)
+            putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
+        }
 
+        fun makeBundle(pageId: String, isInModulesPager: Boolean = false): Bundle = Bundle().apply {
+            putString(PAGE_ID, pageId)
+            putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
+        }
 
         fun newInstance(canvasContext: CanvasContext, args: Bundle) = PageDetailsFragment().withArgs(args).apply {
             this.canvasContext = canvasContext
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageListFragment.kt
index 0dddfc2acd..9d29974bfa 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PageListFragment.kt
@@ -36,6 +36,10 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getDrawableCompat
@@ -102,6 +106,9 @@ class PageListFragment : BaseSyncFragment<Page, PageListPresenter, PageListView,
         })
 
         setupViews()
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        rootView.applyDisplayCutoutInsets()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -175,6 +182,7 @@ class PageListFragment : BaseSyncFragment<Page, PageListPresenter, PageListView,
     override fun perPageCount() = ApiPrefs.perPageCount
 
     private fun setupToolbar() = with(binding) {
+        pageListToolbar.applyTopSystemBarInsets()
         pageListToolbar.title = getString(R.string.tab_pages)
         pageListToolbar.subtitle = canvasContext.name
         pageListToolbar.setupBackButton(this@PageListFragment)
@@ -190,6 +198,9 @@ class PageListFragment : BaseSyncFragment<Page, PageListPresenter, PageListView,
     }
 
     private fun setupViews() = with(binding) {
+        pageRecyclerView.applyImeAndSystemBarInsets()
+        pageRecyclerView.clipToPadding = false
+
         createNewPage.setGone()
         createNewPage.backgroundTintList = ViewStyler.makeColorStateListForButton()
         createNewPage.setImageDrawable(ColorUtils.colorIt(ThemePrefs.buttonTextColor, createNewPage.drawable))
@@ -197,6 +208,7 @@ class PageListFragment : BaseSyncFragment<Page, PageListPresenter, PageListView,
             val args = CreateOrEditPageDetailsFragment.newInstanceCreate(canvasContext).nonNullArgs
             RouteMatcher.route(requireActivity(), Route(CreateOrEditPageDetailsFragment::class.java, null, args))
         }
+        createNewPage.applyBottomSystemBarMargin()
     }
 
     @Suppress("unused")
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PeopleListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PeopleListFragment.kt
index d6f397ff03..846a8c2025 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/PeopleListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/PeopleListFragment.kt
@@ -36,6 +36,9 @@ import com.instructure.pandautils.fragments.BaseSyncFragment
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isDesigner
@@ -114,6 +117,9 @@ class PeopleListFragment : BaseSyncFragment<User, PeopleListPresenter, PeopleLis
 
     private fun setupViews() = with(binding) {
         val canvasContext = nonNullArgs.getParcelable<CanvasContext>(Const.CANVAS_CONTEXT)
+        peopleListToolbar.applyTopSystemBarInsets()
+        swipeRefreshLayoutContainerBinding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        swipeRefreshLayoutContainerBinding.recyclerView.clipToPadding = false
         peopleListToolbar.setTitle(R.string.tab_people)
         peopleListToolbar.subtitle = canvasContext!!.name
         if (peopleListToolbar.menu.size() == 0) peopleListToolbar.inflateMenu(R.menu.menu_people_list)
@@ -199,6 +205,9 @@ class PeopleListFragment : BaseSyncFragment<User, PeopleListPresenter, PeopleLis
         RecyclerViewUtils.buildRecyclerView(rootView, requireContext(), adapter,
                 presenter, R.id.swipeRefreshLayout, R.id.recyclerView, R.id.emptyPandaView, getString(R.string.no_items_to_display_short))
         addSwipeToRefresh(swipeRefreshLayoutContainerBinding.swipeRefreshLayout)
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        rootView.applyDisplayCutoutInsets()
     }
 
     override fun createAdapter(): PeopleListRecyclerAdapter {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileEditFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileEditFragment.kt
index 08879b9f38..8dbac6dacd 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileEditFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileEditFragment.kt
@@ -58,6 +58,8 @@ import com.instructure.pandautils.utils.ProfileUtils
 import com.instructure.pandautils.utils.RequestCodes
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.onClickWithRequireNetwork
 import com.instructure.pandautils.utils.setGone
@@ -129,9 +131,11 @@ class ProfileEditFragment : BasePresenterFragment<
     override fun onResume() {
         super.onResume()
         setupToolbar()
+        setupWindowInsets()
     }
 
     fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupCloseButton(this@ProfileEditFragment)
         toolbar.title = getString(R.string.editProfile)
         toolbar.setupMenu(R.menu.menu_save_generic) { saveProfile() }
@@ -140,6 +144,10 @@ class ProfileEditFragment : BasePresenterFragment<
         saveButton?.setTextColor(ThemePrefs.textButtonColor)
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        editProfileSettingsPage.applyDisplayCutoutInsets()
+    }
+
     override fun readyToLoadUI(user: User?) = with(binding) {
         profileCameraIconWrapper.setVisible(user?.canUpdateAvatar() == true)
         profileCameraIconWrapper.onClickWithRequireNetwork {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileFragment.kt
index 521d7996c7..ac3c41d2b5 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ProfileFragment.kt
@@ -31,6 +31,8 @@ import com.instructure.pandautils.fragments.BaseFragment
 import com.instructure.pandautils.utils.ProfileUtils
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.requestAccessibilityFocus
 import com.instructure.teacher.R
@@ -62,9 +64,11 @@ class ProfileFragment : BaseFragment() {
         super.onResume()
         setupToolbar()
         setupViewableData()
+        setupWindowInsets()
     }
 
     private fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.setupMenu(R.menu.menu_settings_edit, menuItemCallback)
         toolbar.setupBackButtonAsBackPressedOnly(this@ProfileFragment)
         titleTextView.adoptToolbarStyle(toolbar)
@@ -72,6 +76,10 @@ class ProfileFragment : BaseFragment() {
         toolbar.requestAccessibilityFocus()
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        profileSettingsPage.applyDisplayCutoutInsets()
+    }
+
     private fun setupViewableData() = with(binding) {
         val user = ApiPrefs.user
         ProfileUtils.loadAvatarForUser(usersAvatar, user?.shortName, user?.avatarUrl, 0)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizDetailsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizDetailsFragment.kt
index 0f2ca43575..fbc0fc7135 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizDetailsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizDetailsFragment.kt
@@ -17,11 +17,15 @@ package com.instructure.teacher.fragments
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.widget.TextView
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.Course
@@ -44,12 +48,15 @@ import com.instructure.pandautils.features.speedgrader.SpeedGraderFragment
 import com.instructure.pandautils.features.speedgrader.SubmissionListFilter
 import com.instructure.pandautils.fragments.BasePresenterFragment
 import com.instructure.pandautils.utils.AssignmentGradedEvent
+import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.FeatureFlagProvider
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.NullableParcelableArg
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.loadHtmlWithIframes
@@ -110,6 +117,7 @@ class QuizDetailsFragment : BasePresenterFragment<
     private var course: Course by ParcelableArg(default = Course())
     private var quizId: Long by LongArg(0L, QUIZ_ID)
     private var quiz: Quiz by ParcelableArg(Quiz(), QUIZ)
+    private var isInModulesPager: Boolean by BooleanArg(key = IS_IN_MODULES_PAGER, default = false)
 
     private var needToForceNetwork = false
 
@@ -145,6 +153,22 @@ class QuizDetailsFragment : BasePresenterFragment<
 
     override fun onPresenterPrepared(presenter: QuizDetailsPresenter) = Unit
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.toolbar.applyTopSystemBarInsets()
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        binding.root.applyDisplayCutoutInsets()
+
+        if (!isInModulesPager) {
+            ViewCompat.setOnApplyWindowInsetsListener(binding.swipeRefreshLayout) { v, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                v.updatePadding(bottom = systemBars.bottom)
+                insets
+            }
+        }
+    }
+
     override fun onRefreshFinished() = Unit
 
     override fun onRefreshStarted() {
@@ -536,10 +560,17 @@ class QuizDetailsFragment : BasePresenterFragment<
     companion object {
         @JvmStatic val QUIZ_ID = "quiz_details_quiz_id"
         @JvmStatic val QUIZ = "quiz_details_quiz"
+        private const val IS_IN_MODULES_PAGER = "isInModulesPager"
 
-        fun makeBundle(quizId: Long): Bundle = Bundle().apply { putLong(QuizDetailsFragment.QUIZ_ID, quizId) }
+        fun makeBundle(quizId: Long, isInModulesPager: Boolean = false): Bundle = Bundle().apply {
+            putLong(QuizDetailsFragment.QUIZ_ID, quizId)
+            putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
+        }
 
-        fun makeBundle(quiz: Quiz): Bundle = Bundle().apply { putParcelable(QuizDetailsFragment.QUIZ, quiz) }
+        fun makeBundle(quiz: Quiz, isInModulesPager: Boolean = false): Bundle = Bundle().apply {
+            putParcelable(QuizDetailsFragment.QUIZ, quiz)
+            putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
+        }
 
         fun newInstance(course: Course, args: Bundle) = QuizDetailsFragment().withArgs(args).apply { this.course = course }
     }
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizListFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizListFragment.kt
index 6aad4ebde5..34f093b180 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizListFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/QuizListFragment.kt
@@ -34,8 +34,9 @@ import com.instructure.pandautils.fragments.BaseExpandableSyncFragment
 import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addSearch
-import com.instructure.pandautils.utils.closeSearch
-import com.instructure.pandautils.utils.getDrawableCompat
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.closeSearch
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getDrawableCompat
@@ -91,6 +92,9 @@ class QuizListFragment : BaseExpandableSyncFragment<
             emptyViewResId = R.id.emptyPandaView,
             emptyViewText = getString(R.string.noQuizzesSubtext)
         )
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        rootView.applyDisplayCutoutInsets()
     }
 
     override fun onCreateView(view: View) {
@@ -165,6 +169,9 @@ class QuizListFragment : BaseExpandableSyncFragment<
     override fun perPageCount() = ApiPrefs.perPageCount
 
     private fun setupToolbar() = with(binding) {
+        quizListToolbar.applyTopSystemBarInsets()
+        swipeRefreshLayout.applyImeAndSystemBarInsets()
+        quizRecyclerView.clipToPadding = false
         quizListToolbar.title = getString(R.string.tab_quizzes)
         quizListToolbar.subtitle = canvasContext.name
         quizListToolbar.setupBackButton(this@QuizListFragment)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderCommentsFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderCommentsFragment.kt
index 563dddce6c..5dcfe6f7b3 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderCommentsFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderCommentsFragment.kt
@@ -58,6 +58,7 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.ParcelableArrayListArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
 import com.instructure.pandautils.utils.onClick
 import com.instructure.pandautils.utils.onClickWithRequireNetwork
 import com.instructure.pandautils.utils.onTextChanged
@@ -159,6 +160,12 @@ class SpeedGraderCommentsFragment : BaseListFragment<SubmissionCommentWrapper, S
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupCommentInput()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        speedGraderCommentsRecyclerView.applyImeAndSystemBarInsets()
+        commentInputContainer.commentInputRoot.applyImeAndSystemBarInsets()
     }
 
     override fun onRefreshStarted() {}
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderFilesFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderFilesFragment.kt
index 711b08584d..4bc22492e9 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderFilesFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderFilesFragment.kt
@@ -16,6 +16,9 @@
 package com.instructure.teacher.fragments
 
 import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.Submission
@@ -59,11 +62,24 @@ class SpeedGraderFilesFragment : BaseSyncFragment<
     override val recyclerView: RecyclerView get() = binding.speedGraderFilesRecyclerView
     override fun layoutResId() = R.layout.fragment_speedgrader_files
     override fun getPresenterFactory() = SpeedGraderFilesPresenterFactory(mSubmission)
-    override fun onCreateView(view: View) = Unit
+    override fun onCreateView(view: View) {
+    }
     override fun onPresenterPrepared(presenter: SpeedGraderFilesPresenter) {
         RecyclerViewUtils.buildRecyclerView(rootView, requireContext(), adapter, presenter, R.id.swipeRefreshLayout,
                 R.id.speedGraderFilesRecyclerView, R.id.speedGraderFilesEmptyView, getString(R.string.no_items_to_display_short))
         binding.swipeRefreshLayout.isEnabled = false
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        ViewCompat.setOnApplyWindowInsetsListener(speedGraderFilesRecyclerView) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
+        if (speedGraderFilesRecyclerView.isAttachedToWindow) {
+            ViewCompat.requestApplyInsets(speedGraderFilesRecyclerView)
+        }
     }
 
     override fun onReadySetGo(presenter: SpeedGraderFilesPresenter) {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderGradeFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderGradeFragment.kt
index bc43178cfa..d084d65758 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderGradeFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/SpeedGraderGradeFragment.kt
@@ -17,6 +17,9 @@ package com.instructure.teacher.fragments
 
 import android.view.LayoutInflater
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.canvasapi2.models.Assignee
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Course
@@ -70,6 +73,18 @@ class SpeedGraderGradeFragment : BasePresenterFragment<
 
     override fun onPresenterPrepared(presenter: SpeedGraderGradePresenter) {
         setupViews()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        ViewCompat.setOnApplyWindowInsetsListener(speedGraderGradeContentLayout) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(bottom = systemBars.bottom)
+            insets
+        }
+        if (speedGraderGradeScrollView.isAttachedToWindow) {
+            ViewCompat.requestApplyInsets(speedGraderGradeScrollView)
+        }
     }
 
     override fun onStart() {
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ToDoFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ToDoFragment.kt
index f3a9802766..c92a00ddeb 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ToDoFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ToDoFragment.kt
@@ -52,6 +52,8 @@ import com.instructure.teacher.router.RouteMatcher
 import com.instructure.teacher.utils.RecyclerViewUtils
 import com.instructure.teacher.utils.setupBackButtonAsBackPressedOnly
 import com.instructure.teacher.viewinterface.ToDoView
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -110,6 +112,7 @@ class ToDoFragment : BaseSyncFragment<ToDo, ToDoPresenter, ToDoView, ToDoViewHol
     }
 
     private fun setupToolbar() = with(binding) {
+        toDoToolbar.applyTopSystemBarInsets()
         val activity = requireActivity()
         if (activity is InitActivity) {
             activity.attachNavigationDrawer()
@@ -166,7 +169,7 @@ class ToDoFragment : BaseSyncFragment<ToDo, ToDoPresenter, ToDoView, ToDoViewHol
     }
 
     override fun onRouteFailed() {
-        toast(R.string.errorToDoRouteFailed)
+        toast(R.string.errorToDoRouteFailedNew)
     }
 
     @Suppress("unused")
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewHtmlFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewHtmlFragment.kt
index 978eb714a3..e636d23d1a 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewHtmlFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewHtmlFragment.kt
@@ -32,6 +32,7 @@ import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.models.EditableFile
 import com.instructure.pandautils.utils.*
 import com.instructure.pandautils.utils.Utils.copyToClipboard
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.teacher.R
 import com.instructure.teacher.router.RouteMatcher
 import com.instructure.teacher.utils.setupBackButtonWithExpandCollapseAndBack
@@ -82,6 +83,10 @@ class ViewHtmlFragment : InternalWebViewFragment() {
     }
 
     override fun setupToolbar(courseColor: Int) {
+        if (isInModulesPager || (isTablet && toolbarColor != 0)) {
+            toolbar?.applyTopSystemBarInsets()
+        }
+
         editableFile?.let {
             // Check if we need to update the file name
             val fileFolderUpdatedEvent = EventBus.getDefault().getStickyEvent(FileFolderUpdatedEvent::class.java)
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewImageFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewImageFragment.kt
index a6b9cca112..f74da8fc23 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewImageFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewImageFragment.kt
@@ -48,6 +48,8 @@ import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.Utils.copyToClipboard
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.filecache.FileCache
 import com.instructure.pandautils.utils.filecache.awaitFileDownload
 import com.instructure.pandautils.utils.isTablet
@@ -100,9 +102,13 @@ class ViewImageFragment : BaseCanvasFragment(), ShareableFile {
         }
 
         if (showToolbar) setupToolbar() else binding.toolbar.setGone()
+
+        binding.photoView.applyBottomSystemBarInsets()
+        binding.errorContainer.applyBottomSystemBarInsets()
     }
 
     private fun setupToolbar() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
 
         editableFile?.let {
 
@@ -179,12 +185,13 @@ class ViewImageFragment : BaseCanvasFragment(), ShareableFile {
             p1: Any?,
             target: Target<Bitmap>,
             p3: Boolean
-        ): Boolean = with(binding) {
-            photoView.setGone()
-            progressBar.setGone()
-            errorContainer.setVisible()
-            ViewStyler.themeButton(openExternallyButton)
-            openExternallyButton.onClick { uri?.viewExternally(requireContext(), contentType) }
+        ): Boolean {
+            if (view == null) return false
+            binding.photoView.setGone()
+            binding.progressBar.setGone()
+            binding.errorContainer.setVisible()
+            ViewStyler.themeButton(binding.openExternallyButton)
+            binding.openExternallyButton.onClick { uri?.viewExternally(requireContext(), contentType) }
             return false
         }
 
@@ -195,6 +202,7 @@ class ViewImageFragment : BaseCanvasFragment(), ShareableFile {
             dataSource: DataSource,
             p4: Boolean
         ): Boolean {
+            if (view == null) return false
             binding.progressBar.setGone()
 
             // Try to set the background color using palette if we can
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewMediaFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewMediaFragment.kt
index 547ed991c2..750dabe76a 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewMediaFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewMediaFragment.kt
@@ -53,6 +53,7 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.Utils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.onClick
 import com.instructure.pandautils.utils.setGone
 import com.instructure.pandautils.utils.setVisible
@@ -87,6 +88,13 @@ class ViewMediaFragment : BaseCanvasFragment(), ShareableFile {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         binding.speedGraderMediaPlayerView.findViewById<Toolbar>(R.id.toolbar).setGone()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        if (isInModulesPager) {
+            toolbar.applyTopSystemBarInsets()
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -260,9 +268,9 @@ class ViewMediaFragment : BaseCanvasFragment(), ShareableFile {
             thumbnailUrl: String?,
             contentType: String,
             displayName: String?,
-            isInModulesPager: Boolean = false,
             toolbarColor: Int = 0,
-            editableFile: EditableFile? = null
+            editableFile: EditableFile? = null,
+            isInModulesPager: Boolean = false
         ) = ViewMediaFragment().apply {
             this.uri = uri
             this.thumbnailUrl = thumbnailUrl
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewPdfFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewPdfFragment.kt
index 6c0ffe8b24..48918d5553 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewPdfFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewPdfFragment.kt
@@ -23,12 +23,16 @@ import android.view.View
 import android.view.ViewGroup
 import com.instructure.interactions.MasterDetailInteractions
 import com.instructure.interactions.router.Route
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.pandautils.analytics.SCREEN_VIEW_VIEW_PDF
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.models.EditableFile
 import com.instructure.pandautils.utils.*
 import com.instructure.pandautils.utils.Utils.copyToClipboard
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.teacher.R
 import com.instructure.teacher.databinding.FragmentViewPdfBinding
 import com.instructure.teacher.factory.ViewPdfFragmentPresenterFactory
@@ -61,6 +65,12 @@ class ViewPdfFragment : PresenterFragment<ViewPdfFragmentPresenter, ViewPdfFragm
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
             inflater.inflate(R.layout.fragment_view_pdf, container, false)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.toolbar.applyTopSystemBarInsets()
+    }
+
     override fun onResume() {
         super.onResume()
 
@@ -89,6 +99,7 @@ class ViewPdfFragment : PresenterFragment<ViewPdfFragmentPresenter, ViewPdfFragm
     override fun onActivityCreated(savedInstanceState: Bundle?) = with(binding) {
         super.onActivityCreated(savedInstanceState)
         toolbar.title = url
+        setupWindowInsets()
 
         editableFile?.let {
             toolbar.setupMenu(R.menu.menu_file_details) { menu ->
@@ -151,6 +162,12 @@ class ViewPdfFragment : PresenterFragment<ViewPdfFragmentPresenter, ViewPdfFragm
         activity?.onBackPressed()
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        if (isInModulesPager || (isTablet && toolbarColor != 0)) {
+            toolbar.applyTopSystemBarInsets()
+        }
+    }
+
     companion object {
         @JvmStatic
         @JvmOverloads
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewUnsupportedFileFragment.kt b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewUnsupportedFileFragment.kt
index d6d2cc534f..8d8ab472f4 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewUnsupportedFileFragment.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/fragments/ViewUnsupportedFileFragment.kt
@@ -21,6 +21,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.DrawableRes
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import com.instructure.pandautils.base.BaseCanvasFragment
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
@@ -44,6 +47,7 @@ import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.Utils.copyToClipboard
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.onClick
 import com.instructure.pandautils.utils.setGone
@@ -81,6 +85,15 @@ class ViewUnsupportedFileFragment : BaseCanvasFragment() {
         return inflater.inflate(R.layout.fragment_unsupported_file_type, container, false)
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+            toolbar.applyTopSystemBarInsets()
+    }
+
     override fun onResume() {
         super.onResume()
         // If returning from editing this file, check if it was deleted so we can immediately go back
diff --git a/apps/teacher/src/main/java/com/instructure/teacher/view/SubmissionContentView.kt b/apps/teacher/src/main/java/com/instructure/teacher/view/SubmissionContentView.kt
index 518f19c95d..33a56cb488 100644
--- a/apps/teacher/src/main/java/com/instructure/teacher/view/SubmissionContentView.kt
+++ b/apps/teacher/src/main/java/com/instructure/teacher/view/SubmissionContentView.kt
@@ -143,8 +143,9 @@ import com.instructure.teacher.utils.setAnonymousAvatar
 import com.instructure.teacher.utils.setupMenu
 import com.instructure.teacher.utils.transformForQuizGrading
 import com.pspdfkit.ui.PdfFragment
+import com.pspdfkit.ui.annotations.OnAnnotationCreationModeChangeListener
+import com.pspdfkit.ui.annotations.OnAnnotationEditingModeChangeListener
 import com.pspdfkit.ui.inspector.PropertyInspectorCoordinatorLayout
-import com.pspdfkit.ui.special_mode.manager.AnnotationManager
 import com.pspdfkit.ui.toolbar.ToolbarCoordinatorLayout
 import com.sothree.slidinguppanel.SlidingUpPanelLayout
 import kotlinx.coroutines.Job
@@ -164,7 +165,7 @@ class SubmissionContentView(
     private val assignment: Assignment,
     private val course: Course,
     var initialTabIndex: Int = 0
-) : PdfSubmissionView(context, courseId = course.id), AnnotationManager.OnAnnotationCreationModeChangeListener, AnnotationManager.OnAnnotationEditingModeChangeListener {
+) : PdfSubmissionView(context, courseId = course.id), OnAnnotationCreationModeChangeListener, OnAnnotationEditingModeChangeListener {
 
     private val binding: ViewSubmissionContentBinding
 
diff --git a/apps/teacher/src/main/res/layout/activity_init.xml b/apps/teacher/src/main/res/layout/activity_init.xml
index 46c52d9b83..8d9b609195 100644
--- a/apps/teacher/src/main/res/layout/activity_init.xml
+++ b/apps/teacher/src/main/res/layout/activity_init.xml
@@ -32,7 +32,7 @@
             android:id="@+id/container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/bottomBar"
+            android:layout_above="@+id/bottomBarDivider"
             android:animateLayoutChanges="true">
 
             <View
@@ -48,7 +48,7 @@
             android:id="@+id/masterDetailContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/bottomBar"
+            android:layout_above="@+id/bottomBarDivider"
             android:animateLayoutChanges="true"
             android:visibility="gone">
 
@@ -108,17 +108,34 @@
 
         </androidx.percentlayout.widget.PercentRelativeLayout>
 
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/bottomBar"
+        <FrameLayout
+            android:id="@+id/bottomBarContainer"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:minHeight="48dp"
             android:layout_alignParentBottom="true"
-            android:background="@color/backgroundLightestElevated"
-            app:itemIconTint="@color/textDarkest"
-            app:itemTextColor="@color/textDarkest"
-            app:menu="@menu/bottom_navigation_items"
-            app:labelVisibilityMode="labeled"/>
+            android:background="@color/backgroundLightestElevated">
+
+            <com.google.android.material.bottomnavigation.BottomNavigationView
+                android:id="@+id/bottomBar"
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:minHeight="48dp"
+                android:background="@color/backgroundLightestElevated"
+                android:layout_gravity="top"
+                app:elevation="0dp"
+                app:itemIconTint="@color/textDarkest"
+                app:itemTextColor="@color/textDarkest"
+                app:menu="@menu/bottom_navigation_items"
+                app:labelVisibilityMode="labeled"/>
+
+        </FrameLayout>
+
+        <View
+            android:id="@+id/bottomBarDivider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/backgroundLight"
+            android:layout_alignTop="@id/bottomBarContainer"/>
 
     </RelativeLayout>
 
diff --git a/apps/teacher/src/main/res/layout/fragment_annotation_comment_list.xml b/apps/teacher/src/main/res/layout/fragment_annotation_comment_list.xml
index 5d396f29b6..310c463fc5 100644
--- a/apps/teacher/src/main/res/layout/fragment_annotation_comment_list.xml
+++ b/apps/teacher/src/main/res/layout/fragment_annotation_comment_list.xml
@@ -24,6 +24,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:ignore="UnusedAttribute"/>
 
@@ -39,7 +40,8 @@
         android:animateLayoutChanges="true"
         android:id="@+id/commentInputContainer"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:minHeight="56dp"
         android:layout_alignParentBottom="true"
         android:background="@color/backgroundLightest">
 
diff --git a/apps/teacher/src/main/res/layout/fragment_assignee_list.xml b/apps/teacher/src/main/res/layout/fragment_assignee_list.xml
index a529d0b4b1..76b4ed87b5 100644
--- a/apps/teacher/src/main/res/layout/fragment_assignee_list.xml
+++ b/apps/teacher/src/main/res/layout/fragment_assignee_list.xml
@@ -27,6 +27,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         app:title="@string/page_title_add_assignees"/>
 
     <TextView
diff --git a/apps/teacher/src/main/res/layout/fragment_assignment_details.xml b/apps/teacher/src/main/res/layout/fragment_assignment_details.xml
index ea3f9417b3..a94bc02400 100644
--- a/apps/teacher/src/main/res/layout/fragment_assignment_details.xml
+++ b/apps/teacher/src/main/res/layout/fragment_assignment_details.xml
@@ -26,6 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         tools:background="#00bcd5"
         tools:ignore="UnusedAttribute"
diff --git a/apps/teacher/src/main/res/layout/fragment_assignment_due_dates.xml b/apps/teacher/src/main/res/layout/fragment_assignment_due_dates.xml
index ee42bcda4d..7816453b60 100644
--- a/apps/teacher/src/main/res/layout/fragment_assignment_due_dates.xml
+++ b/apps/teacher/src/main/res/layout/fragment_assignment_due_dates.xml
@@ -11,6 +11,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         app:title="@string/page_title_due_dates"
         tools:background="#00bcd5"
diff --git a/apps/teacher/src/main/res/layout/fragment_comment_library.xml b/apps/teacher/src/main/res/layout/fragment_comment_library.xml
index 441721b6e9..26cdabe8f0 100644
--- a/apps/teacher/src/main/res/layout/fragment_comment_library.xml
+++ b/apps/teacher/src/main/res/layout/fragment_comment_library.xml
@@ -35,6 +35,7 @@
             android:id="@+id/commentLibraryToolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:background="@color/backgroundLightest"
             android:elevation="6dp"
             app:theme="@style/ToolBarStyle"
@@ -46,7 +47,8 @@
             layout="@layout/speed_grader_comment_input_view"
             android:id="@+id/commentInputContainer"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
+            android:minHeight="56dp"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent" />
 
diff --git a/apps/teacher/src/main/res/layout/fragment_course_settings.xml b/apps/teacher/src/main/res/layout/fragment_course_settings.xml
index afb8408621..cb0448ba42 100644
--- a/apps/teacher/src/main/res/layout/fragment_course_settings.xml
+++ b/apps/teacher/src/main/res/layout/fragment_course_settings.xml
@@ -24,7 +24,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"/>
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"/>
 
     <ImageView
         android:id="@+id/courseImage"
diff --git a/apps/teacher/src/main/res/layout/fragment_create_or_edit_page.xml b/apps/teacher/src/main/res/layout/fragment_create_or_edit_page.xml
index df4224e29a..dcdc11727c 100644
--- a/apps/teacher/src/main/res/layout/fragment_create_or_edit_page.xml
+++ b/apps/teacher/src/main/res/layout/fragment_create_or_edit_page.xml
@@ -25,6 +25,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:background="@color/backgroundDarkest"
         tools:ignore="UnusedAttribute">
diff --git a/apps/teacher/src/main/res/layout/fragment_dashboard.xml b/apps/teacher/src/main/res/layout/fragment_dashboard.xml
index d50e04d630..0c4c6363ba 100644
--- a/apps/teacher/src/main/res/layout/fragment_dashboard.xml
+++ b/apps/teacher/src/main/res/layout/fragment_dashboard.xml
@@ -23,7 +23,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_edit_assignment_details.xml b/apps/teacher/src/main/res/layout/fragment_edit_assignment_details.xml
index 3cc3cbe8b3..3f9e6691eb 100644
--- a/apps/teacher/src/main/res/layout/fragment_edit_assignment_details.xml
+++ b/apps/teacher/src/main/res/layout/fragment_edit_assignment_details.xml
@@ -25,6 +25,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:background="@color/backgroundDarkest"
         tools:ignore="UnusedAttribute">
diff --git a/apps/teacher/src/main/res/layout/fragment_edit_filefolder.xml b/apps/teacher/src/main/res/layout/fragment_edit_filefolder.xml
index 3bf1f639b2..8838581cfe 100644
--- a/apps/teacher/src/main/res/layout/fragment_edit_filefolder.xml
+++ b/apps/teacher/src/main/res/layout/fragment_edit_filefolder.xml
@@ -26,15 +26,18 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle" />
 
     <ScrollView
+        android:id="@+id/editFileFolderScrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <LinearLayout
+            android:id="@+id/editFileFolderContentLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
diff --git a/apps/teacher/src/main/res/layout/fragment_edit_syllabus.xml b/apps/teacher/src/main/res/layout/fragment_edit_syllabus.xml
index 05c6cab8bc..f0e78c39e7 100644
--- a/apps/teacher/src/main/res/layout/fragment_edit_syllabus.xml
+++ b/apps/teacher/src/main/res/layout/fragment_edit_syllabus.xml
@@ -26,6 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightest"
         android:elevation="6dp"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/apps/teacher/src/main/res/layout/fragment_feature_flags.xml b/apps/teacher/src/main/res/layout/fragment_feature_flags.xml
index 8cb1e4217a..d7cfb5c9bb 100644
--- a/apps/teacher/src/main/res/layout/fragment_feature_flags.xml
+++ b/apps/teacher/src/main/res/layout/fragment_feature_flags.xml
@@ -25,6 +25,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightest"
         android:elevation="6dp"
         app:title="@string/featureFlagsTitle"
diff --git a/apps/teacher/src/main/res/layout/fragment_file_list.xml b/apps/teacher/src/main/res/layout/fragment_file_list.xml
index 436158c6f7..14a49eed86 100644
--- a/apps/teacher/src/main/res/layout/fragment_file_list.xml
+++ b/apps/teacher/src/main/res/layout/fragment_file_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/fileListToolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_file_search.xml b/apps/teacher/src/main/res/layout/fragment_file_search.xml
index 9ebc9b5a18..790fa245d8 100644
--- a/apps/teacher/src/main/res/layout/fragment_file_search.xml
+++ b/apps/teacher/src/main/res/layout/fragment_file_search.xml
@@ -23,7 +23,8 @@
     <LinearLayout
         android:id="@+id/searchHeader"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:orientation="horizontal">
 
         <ImageButton
@@ -91,7 +92,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/fileSearchRecyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:clipToPadding="false"/>
 
         <com.instructure.pandautils.views.EmptyView
             android:id="@+id/emptyPandaView"
diff --git a/apps/teacher/src/main/res/layout/fragment_internal_webview.xml b/apps/teacher/src/main/res/layout/fragment_internal_webview.xml
index 657d3b2723..9ae96ddc7d 100644
--- a/apps/teacher/src/main/res/layout/fragment_internal_webview.xml
+++ b/apps/teacher/src/main/res/layout/fragment_internal_webview.xml
@@ -27,20 +27,29 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle"
         tools:ignore="UnusedAttribute" />
 
-    <com.instructure.pandautils.views.CanvasWebView
-        android:id="@+id/canvasWebView"
+    <FrameLayout
+        android:id="@+id/canvasWebViewContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scrollbarStyle="outsideOverlay"
         android:layout_below="@id/toolbar"
-        android:clipToPadding="false"/>
+        android:clipToPadding="false">
+
+        <com.instructure.pandautils.views.CanvasWebView
+            android:id="@+id/canvasWebView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbarStyle="outsideOverlay"
+            android:clipToPadding="false"/>
+
+    </FrameLayout>
 
     <com.instructure.pandautils.views.CanvasLoadingView
         android:id="@+id/loading"
diff --git a/apps/teacher/src/main/res/layout/fragment_module_list.xml b/apps/teacher/src/main/res/layout/fragment_module_list.xml
index 2480af6a15..8e1e91c06c 100644
--- a/apps/teacher/src/main/res/layout/fragment_module_list.xml
+++ b/apps/teacher/src/main/res/layout/fragment_module_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         android:accessibilityHeading="true"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_page_details.xml b/apps/teacher/src/main/res/layout/fragment_page_details.xml
index f08875494d..eeea9179fe 100644
--- a/apps/teacher/src/main/res/layout/fragment_page_details.xml
+++ b/apps/teacher/src/main/res/layout/fragment_page_details.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:theme="@style/ToolBarStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_page_list.xml b/apps/teacher/src/main/res/layout/fragment_page_list.xml
index 7773cdb7f4..aa4f9487c6 100644
--- a/apps/teacher/src/main/res/layout/fragment_page_list.xml
+++ b/apps/teacher/src/main/res/layout/fragment_page_list.xml
@@ -29,7 +29,7 @@
             android:id="@+id/pageListToolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:minHeight="?attr/actionBarSize"
+            android:minHeight="?android:attr/actionBarSize"
             android:elevation="6dp"
             app:popupTheme="@style/ToolBarPopupStyle"
             app:theme="@style/ToolBarStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_people_list_layout.xml b/apps/teacher/src/main/res/layout/fragment_people_list_layout.xml
index 9c340d319b..d4de2e8480 100644
--- a/apps/teacher/src/main/res/layout/fragment_people_list_layout.xml
+++ b/apps/teacher/src/main/res/layout/fragment_people_list_layout.xml
@@ -27,7 +27,7 @@
         android:id="@+id/peopleListToolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="?attr/actionBarSize"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_post_policy_settings.xml b/apps/teacher/src/main/res/layout/fragment_post_policy_settings.xml
index 771b5253ae..bb0459eb16 100644
--- a/apps/teacher/src/main/res/layout/fragment_post_policy_settings.xml
+++ b/apps/teacher/src/main/res/layout/fragment_post_policy_settings.xml
@@ -25,7 +25,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/postPolicyToolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle"
         app:title="@string/postPolicyTitle"
diff --git a/apps/teacher/src/main/res/layout/fragment_profile.xml b/apps/teacher/src/main/res/layout/fragment_profile.xml
index 3c564b5193..b4ec6eea15 100644
--- a/apps/teacher/src/main/res/layout/fragment_profile.xml
+++ b/apps/teacher/src/main/res/layout/fragment_profile.xml
@@ -28,7 +28,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_profile_edit.xml b/apps/teacher/src/main/res/layout/fragment_profile_edit.xml
index e08f9d0efd..0fe48a6774 100644
--- a/apps/teacher/src/main/res/layout/fragment_profile_edit.xml
+++ b/apps/teacher/src/main/res/layout/fragment_profile_edit.xml
@@ -29,6 +29,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:ignore="UnusedAttribute" />
 
diff --git a/apps/teacher/src/main/res/layout/fragment_quiz_details.xml b/apps/teacher/src/main/res/layout/fragment_quiz_details.xml
index 94a325b9f5..6c174dfde7 100644
--- a/apps/teacher/src/main/res/layout/fragment_quiz_details.xml
+++ b/apps/teacher/src/main/res/layout/fragment_quiz_details.xml
@@ -26,6 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         tools:background="#00bcd5"
         tools:ignore="UnusedAttribute"/>
diff --git a/apps/teacher/src/main/res/layout/fragment_quiz_list.xml b/apps/teacher/src/main/res/layout/fragment_quiz_list.xml
index 49b473c129..0fd9d1c82f 100644
--- a/apps/teacher/src/main/res/layout/fragment_quiz_list.xml
+++ b/apps/teacher/src/main/res/layout/fragment_quiz_list.xml
@@ -25,7 +25,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/quizListToolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_speed_grader_media.xml b/apps/teacher/src/main/res/layout/fragment_speed_grader_media.xml
index 8f41538d45..1a6723f125 100644
--- a/apps/teacher/src/main/res/layout/fragment_speed_grader_media.xml
+++ b/apps/teacher/src/main/res/layout/fragment_speed_grader_media.xml
@@ -26,6 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         android:visibility="gone"
         tools:ignore="UnusedAttribute" />
diff --git a/apps/teacher/src/main/res/layout/fragment_speedgrader_comments.xml b/apps/teacher/src/main/res/layout/fragment_speedgrader_comments.xml
index 506ba23a0d..ed51855282 100644
--- a/apps/teacher/src/main/res/layout/fragment_speedgrader_comments.xml
+++ b/apps/teacher/src/main/res/layout/fragment_speedgrader_comments.xml
@@ -32,6 +32,7 @@
             android:id="@+id/speedGraderCommentsRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clipToPadding="false"
             android:cacheColorHint="@android:color/transparent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
diff --git a/apps/teacher/src/main/res/layout/fragment_speedgrader_files.xml b/apps/teacher/src/main/res/layout/fragment_speedgrader_files.xml
index a327865269..559a0fe4a4 100644
--- a/apps/teacher/src/main/res/layout/fragment_speedgrader_files.xml
+++ b/apps/teacher/src/main/res/layout/fragment_speedgrader_files.xml
@@ -30,6 +30,7 @@
             android:id="@+id/speedGraderFilesRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clipToPadding="false"
             android:cacheColorHint="@android:color/transparent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
diff --git a/apps/teacher/src/main/res/layout/fragment_speedgrader_grade.xml b/apps/teacher/src/main/res/layout/fragment_speedgrader_grade.xml
index 7be8f35b5d..eb5c676ef4 100644
--- a/apps/teacher/src/main/res/layout/fragment_speedgrader_grade.xml
+++ b/apps/teacher/src/main/res/layout/fragment_speedgrader_grade.xml
@@ -16,11 +16,13 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/speedGraderGradeScrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
 
     <LinearLayout
+        android:id="@+id/speedGraderGradeContentLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
diff --git a/apps/teacher/src/main/res/layout/fragment_student_context.xml b/apps/teacher/src/main/res/layout/fragment_student_context.xml
index 09cb655e9f..a9d9c253ad 100644
--- a/apps/teacher/src/main/res/layout/fragment_student_context.xml
+++ b/apps/teacher/src/main/res/layout/fragment_student_context.xml
@@ -32,7 +32,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         android:visibility="gone"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/teacher/src/main/res/layout/fragment_syllabus.xml b/apps/teacher/src/main/res/layout/fragment_syllabus.xml
index f1e08125e2..0ba546de83 100644
--- a/apps/teacher/src/main/res/layout/fragment_syllabus.xml
+++ b/apps/teacher/src/main/res/layout/fragment_syllabus.xml
@@ -26,6 +26,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         app:theme="@style/ToolBarStyle"
         tools:background="#00bcd5"
diff --git a/apps/teacher/src/main/res/layout/fragment_todo.xml b/apps/teacher/src/main/res/layout/fragment_todo.xml
index 4d05162ad1..3895ff0fc6 100644
--- a/apps/teacher/src/main/res/layout/fragment_todo.xml
+++ b/apps/teacher/src/main/res/layout/fragment_todo.xml
@@ -25,11 +25,12 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toDoToolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
         app:theme="@style/ToolBarStyle"
-        app:title="@string/tab_todo"
+        app:title="@string/tab_todo_new"
         tools:ignore="UnusedAttribute"/>
 
     <com.instructure.pandautils.views.SwipeRefreshLayoutAppBar
diff --git a/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml b/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml
index fb0542d8bf..711a1cc177 100644
--- a/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml
+++ b/apps/teacher/src/main/res/layout/fragment_unsupported_file_type.xml
@@ -23,6 +23,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:ignore="UnusedAttribute" />
 
diff --git a/apps/teacher/src/main/res/layout/fragment_view_image.xml b/apps/teacher/src/main/res/layout/fragment_view_image.xml
index 1710c0e048..6843188c43 100644
--- a/apps/teacher/src/main/res/layout/fragment_view_image.xml
+++ b/apps/teacher/src/main/res/layout/fragment_view_image.xml
@@ -25,6 +25,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:ignore="UnusedAttribute"/>
 
diff --git a/apps/teacher/src/main/res/layout/fragment_view_pdf.xml b/apps/teacher/src/main/res/layout/fragment_view_pdf.xml
index f6beba807f..06ad57ef3b 100644
--- a/apps/teacher/src/main/res/layout/fragment_view_pdf.xml
+++ b/apps/teacher/src/main/res/layout/fragment_view_pdf.xml
@@ -24,6 +24,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:elevation="2dp"
         tools:ignore="UnusedAttribute"/>
 
diff --git a/apps/teacher/src/main/res/layout/speed_grader_comment_input_view.xml b/apps/teacher/src/main/res/layout/speed_grader_comment_input_view.xml
index 8e69f6aa36..bc2a795b2f 100644
--- a/apps/teacher/src/main/res/layout/speed_grader_comment_input_view.xml
+++ b/apps/teacher/src/main/res/layout/speed_grader_comment_input_view.xml
@@ -18,6 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
+        android:id="@+id/commentInputRoot"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
diff --git a/apps/teacher/src/main/res/layout/toolbar_layout.xml b/apps/teacher/src/main/res/layout/toolbar_layout.xml
index 2b2c905fe5..f80c7de15c 100644
--- a/apps/teacher/src/main/res/layout/toolbar_layout.xml
+++ b/apps/teacher/src/main/res/layout/toolbar_layout.xml
@@ -19,7 +19,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/actionBarSize"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/actionBarSize"
     android:background="@color/backgroundDarkest"
     app:theme="@style/ToolBarStyle"
     app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/apps/teacher/src/main/res/menu/bottom_navigation_items.xml b/apps/teacher/src/main/res/menu/bottom_navigation_items.xml
index 73b92c5179..2f40c1e8ca 100644
--- a/apps/teacher/src/main/res/menu/bottom_navigation_items.xml
+++ b/apps/teacher/src/main/res/menu/bottom_navigation_items.xml
@@ -29,7 +29,7 @@
 
     <item
         android:id="@+id/tab_todo"
-        android:title="@string/tab_todo"
+        android:title="@string/tab_todo_new"
         android:icon="@drawable/bottom_nav_todo" />
 
     <item
diff --git a/apps/teacher/src/main/res/values-ar/strings.xml b/apps/teacher/src/main/res/values-ar/strings.xml
index a51ad800eb..07ecd3e3c1 100644
--- a/apps/teacher/src/main/res/values-ar/strings.xml
+++ b/apps/teacher/src/main/res/values-ar/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">الحضور</string>
     <string name="tab_pages">الصفحات</string>
     <string name="tab_todo">قائمة مهام</string>
+    <string name="tab_todo_new">المهمة</string>
     <string name="content_description_school_logo">شعار المدرسة</string>
     <string name="search_guides">البحث في Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -890,6 +891,7 @@
     <string name="toDoEmpty">لا يوجد شيء آخر يمكن فعله!\n طاب يومك.</string>
     <string name="toDoNoSubmissions">لا توجد مهام مرسلة لتقييمها لهذه المهمة.</string>
     <string name="errorToDoRouteFailed">حدث خطأ أثناء محاولة عرض عنصر المهام هذا.</string>
+    <string name="errorToDoRouteFailedNew">وقع خطأ أثناء محاولة عرض عنصر المهمة هذا.</string>
     <string name="errorIsDesigner">لا يمكن لتسجيل المصمم عرض هذا.</string>
 
     <string name="sections">الأقسام</string>
diff --git a/apps/teacher/src/main/res/values-b+da+DK+instk12/strings.xml b/apps/teacher/src/main/res/values-b+da+DK+instk12/strings.xml
index 6b34f6c546..58532761c1 100644
--- a/apps/teacher/src/main/res/values-b+da+DK+instk12/strings.xml
+++ b/apps/teacher/src/main/res/values-b+da+DK+instk12/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Tilstedeværelse</string>
     <string name="tab_pages">Sider</string>
     <string name="tab_todo">Opgaveliste</string>
+    <string name="tab_todo_new">At gøre</string>
     <string name="content_description_school_logo">Skolelogo</string>
     <string name="search_guides">Søg i Canvas-vejledningerne</string>
     <string name="canvas_guides">Canvas-vejledningerne</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Ikke mere at gøre!\n Hav en god dag!</string>
     <string name="toDoNoSubmissions">Der er ingen afleveringer til bedømmelse for denne opgave.</string>
     <string name="errorToDoRouteFailed">Der opstod en fejl ved forsøg på at vise dette element på opgavelisten.</string>
+    <string name="errorToDoRouteFailedNew">Der opstod en fejl ved forsøg på at vise dette element på opgavelisten.</string>
     <string name="errorIsDesigner">Designer-tilmelding kan ikke se dette.</string>
 
     <string name="sections">Sektioner</string>
diff --git a/apps/teacher/src/main/res/values-b+en+AU+unimelb/strings.xml b/apps/teacher/src/main/res/values-b+en+AU+unimelb/strings.xml
index 8764ce3941..07f1092930 100644
--- a/apps/teacher/src/main/res/values-b+en+AU+unimelb/strings.xml
+++ b/apps/teacher/src/main/res/values-b+en+AU+unimelb/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To Do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to grade for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this To Do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrolment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-b+en+GB+instukhe/strings.xml b/apps/teacher/src/main/res/values-b+en+GB+instukhe/strings.xml
index 06fe0712e4..36ab392b68 100644
--- a/apps/teacher/src/main/res/values-b+en+GB+instukhe/strings.xml
+++ b/apps/teacher/src/main/res/values-b+en+GB+instukhe/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to grade for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this to-do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrolment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-b+nb+NO+instk12/strings.xml b/apps/teacher/src/main/res/values-b+nb+NO+instk12/strings.xml
index 813790e8ca..0ec73b8713 100644
--- a/apps/teacher/src/main/res/values-b+nb+NO+instk12/strings.xml
+++ b/apps/teacher/src/main/res/values-b+nb+NO+instk12/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Oppmøte</string>
     <string name="tab_pages">Sider</string>
     <string name="tab_todo">Å gjøre</string>
+    <string name="tab_todo_new">Gjøremål</string>
     <string name="content_description_school_logo">Skolens Logo</string>
     <string name="search_guides">Søk i Canvas-guidene</string>
     <string name="canvas_guides">Canvas-guider</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Ingen flere oppgaver!\n Ha en fin dag.</string>
     <string name="toDoNoSubmissions">Det finnes ingen innleveringer å gi vurderinger til for denne oppgaven.</string>
     <string name="errorToDoRouteFailed">En feil oppsto under visning av dette gjøremålselementet.</string>
+    <string name="errorToDoRouteFailedNew">En feil oppsto under visning av dette gjøremålselementet.</string>
     <string name="errorIsDesigner">Designer påmelding kan ikke vise dette.</string>
 
     <string name="sections">Seksjoner</string>
diff --git a/apps/teacher/src/main/res/values-b+sv+SE+instk12/strings.xml b/apps/teacher/src/main/res/values-b+sv+SE+instk12/strings.xml
index 70bd3aa391..b116079b79 100644
--- a/apps/teacher/src/main/res/values-b+sv+SE+instk12/strings.xml
+++ b/apps/teacher/src/main/res/values-b+sv+SE+instk12/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Närvaro</string>
     <string name="tab_pages">Sidor</string>
     <string name="tab_todo">Att göra</string>
+    <string name="tab_todo_new">Att göra</string>
     <string name="content_description_school_logo">Skolans logotyp</string>
     <string name="search_guides">Sök i Canvas-guider</string>
     <string name="canvas_guides">Canvas-guider</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Inget mer att göra!\n Ha en bra dag.</string>
     <string name="toDoNoSubmissions">Det finns inga inlämningar att bedöma för denna uppgift.</string>
     <string name="errorToDoRouteFailed">Ett fel uppstod när du försökte visa detta att göra-objekt.</string>
+    <string name="errorToDoRouteFailedNew">Ett fel inträffade vid försök att visa det här att göra-objektet.</string>
     <string name="errorIsDesigner">Designerregistrering kan inte visa detta.</string>
 
     <string name="sections">Sektioner</string>
diff --git a/apps/teacher/src/main/res/values-b+zh+HK/strings.xml b/apps/teacher/src/main/res/values-b+zh+HK/strings.xml
index ec68181f05..660ba68168 100644
--- a/apps/teacher/src/main/res/values-b+zh+HK/strings.xml
+++ b/apps/teacher/src/main/res/values-b+zh+HK/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">考勤</string>
     <string name="tab_pages">頁面</string>
     <string name="tab_todo">待辦事項</string>
+    <string name="tab_todo_new">待辦事項</string>
     <string name="content_description_school_logo">學校圖標</string>
     <string name="search_guides">搜尋 Canvas 指南</string>
     <string name="canvas_guides">Canvas 指南</string>
@@ -830,6 +831,7 @@
     <string name="toDoEmpty">沒有待辦事項！\n祝您愉快。</string>
     <string name="toDoNoSubmissions">沒有針對該作業的提交項目可供評分。</string>
     <string name="errorToDoRouteFailed">嘗試檢視此待辦事項時發生錯誤。</string>
+    <string name="errorToDoRouteFailedNew">嘗試檢視此待辦事項時發生錯誤。</string>
     <string name="errorIsDesigner">設計師註冊無法檢視此項。</string>
 
     <string name="sections">章節</string>
diff --git a/apps/teacher/src/main/res/values-b+zh+Hans/strings.xml b/apps/teacher/src/main/res/values-b+zh+Hans/strings.xml
index 934a615f29..b66b6b5697 100644
--- a/apps/teacher/src/main/res/values-b+zh+Hans/strings.xml
+++ b/apps/teacher/src/main/res/values-b+zh+Hans/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">出勤</string>
     <string name="tab_pages">页面</string>
     <string name="tab_todo">待办事项</string>
+    <string name="tab_todo_new">待办</string>
     <string name="content_description_school_logo">学校徽标</string>
     <string name="search_guides">搜索 Canvas 指南</string>
     <string name="canvas_guides">Canvas 指南</string>
@@ -830,6 +831,7 @@
     <string name="toDoEmpty">无需再执行其他操作！\n祝您度过愉快的一天。</string>
     <string name="toDoNoSubmissions">此作业没有要评分的提交项。</string>
     <string name="errorToDoRouteFailed">尝试查看此待办事项时出错。</string>
+    <string name="errorToDoRouteFailedNew">尝试查看此待办任务时出错。</string>
     <string name="errorIsDesigner">设计者注册无法查看。</string>
 
     <string name="sections">章节</string>
diff --git a/apps/teacher/src/main/res/values-b+zh+Hant/strings.xml b/apps/teacher/src/main/res/values-b+zh+Hant/strings.xml
index ec68181f05..660ba68168 100644
--- a/apps/teacher/src/main/res/values-b+zh+Hant/strings.xml
+++ b/apps/teacher/src/main/res/values-b+zh+Hant/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">考勤</string>
     <string name="tab_pages">頁面</string>
     <string name="tab_todo">待辦事項</string>
+    <string name="tab_todo_new">待辦事項</string>
     <string name="content_description_school_logo">學校圖標</string>
     <string name="search_guides">搜尋 Canvas 指南</string>
     <string name="canvas_guides">Canvas 指南</string>
@@ -830,6 +831,7 @@
     <string name="toDoEmpty">沒有待辦事項！\n祝您愉快。</string>
     <string name="toDoNoSubmissions">沒有針對該作業的提交項目可供評分。</string>
     <string name="errorToDoRouteFailed">嘗試檢視此待辦事項時發生錯誤。</string>
+    <string name="errorToDoRouteFailedNew">嘗試檢視此待辦事項時發生錯誤。</string>
     <string name="errorIsDesigner">設計師註冊無法檢視此項。</string>
 
     <string name="sections">章節</string>
diff --git a/apps/teacher/src/main/res/values-ca/strings.xml b/apps/teacher/src/main/res/values-ca/strings.xml
index 6724c41d5a..f9f4905244 100644
--- a/apps/teacher/src/main/res/values-ca/strings.xml
+++ b/apps/teacher/src/main/res/values-ca/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Assistència</string>
     <string name="tab_pages">Pàgines</string>
     <string name="tab_todo">Tasques pendents</string>
+    <string name="tab_todo_new">Tasques pendents</string>
     <string name="content_description_school_logo">Logotip de l\'escola</string>
     <string name="search_guides">Cerca les guies del Canvas</string>
     <string name="canvas_guides">Guies del Canvas</string>
@@ -538,7 +539,7 @@
     <string name="practiceQuiz">Prova sobre pràctiques</string>
     <string name="gradedQuiz">Prova amb nota</string>
     <string name="gradedSurvey">Estudi amb nota</string>
-    <string name="ungradedSurvey">Estudi sense nota</string>
+    <string name="ungradedSurvey">Enquesta sense nota</string>
 
     <string-array name="quizTypes" translatable="false">
         <item>@string/practiceQuiz</item>
@@ -580,8 +581,8 @@
     <string name="unlimited">Il·limitat</string>
     <string name="practice_quiz">Prova sobre pràctiques</string>
     <string name="graded_quiz">Prova amb nota</string>
-    <string name="graded_survey">Estudi qualificat</string>
-    <string name="ungraded_survey">Estudi sense nota</string>
+    <string name="graded_survey">Enquesta qualificada</string>
+    <string name="ungraded_survey">Enquesta sense nota</string>
     <string name="no_time_limit">Sense límit de temps</string>
     <string name="immediately">Immediatament</string>
     <string name="quiz_details_no_points_assigned">No hi ha cap punt assignat</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Ja no s\'ha de fer res més.\n Que tingueu bon dia.</string>
     <string name="toDoNoSubmissions">No hi ha cap entrega que s\'hagi de qualificar per a aquesta activitat.</string>
     <string name="errorToDoRouteFailed">S\'ha produït un error en provar de veure aquest element de tasques pendents.</string>
+    <string name="errorToDoRouteFailedNew">S\'ha produït un error en provar de visualitzar aquest element de Tasques pendents.</string>
     <string name="errorIsDesigner">En la inscripció de dissenyadors no es pot veure això.</string>
 
     <string name="sections">Seccions</string>
diff --git a/apps/teacher/src/main/res/values-cy/strings.xml b/apps/teacher/src/main/res/values-cy/strings.xml
index e52cc88323..4bf591bb04 100644
--- a/apps/teacher/src/main/res/values-cy/strings.xml
+++ b/apps/teacher/src/main/res/values-cy/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Presenoldeb</string>
     <string name="tab_pages">Tudalennau</string>
     <string name="tab_todo">Tasgau i’w Gwneud</string>
+    <string name="tab_todo_new">Tasg i’w Gwneud</string>
     <string name="content_description_school_logo">Logo’r Ysgol</string>
     <string name="search_guides">Chwilio drwy Ganllawiau Canvas</string>
     <string name="canvas_guides">Canllawiau Canvas</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Dim byd arall i\'w wneud!\n Mwynhewch eich diwrnod.</string>
     <string name="toDoNoSubmissions">Does dim cyflwyniadau i’w graddio ar gyfer yr aseiniad hwn.</string>
     <string name="errorToDoRouteFailed">Gwall wrth geisio gweld yr eitem i’w gwneud.</string>
+    <string name="errorToDoRouteFailedNew">Cafwyd gwall wrth geisio gweld yr eitem i’w gwneud.</string>
     <string name="errorIsDesigner">Does dim modd i ymrestriadau dylunydd weld hwn.</string>
 
     <string name="sections">Adrannau</string>
diff --git a/apps/teacher/src/main/res/values-da/strings.xml b/apps/teacher/src/main/res/values-da/strings.xml
index d89f254ecb..4a7d6bba47 100644
--- a/apps/teacher/src/main/res/values-da/strings.xml
+++ b/apps/teacher/src/main/res/values-da/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Tilstedeværelse</string>
     <string name="tab_pages">Sider</string>
     <string name="tab_todo">Opgaveliste</string>
+    <string name="tab_todo_new">Element på opgaveliste</string>
     <string name="content_description_school_logo">Skolelogo</string>
     <string name="search_guides">Søg i Canvas-vejledningerne</string>
     <string name="canvas_guides">Canvas-vejledningerne</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Ikke mere at gøre!\n Hav en god dag.</string>
     <string name="toDoNoSubmissions">Der er ingen afleveringer til bedømmelse for denne opgave.</string>
     <string name="errorToDoRouteFailed">Der opstod en fejl ved forsøg på at vise dette element på opgavelisten.</string>
+    <string name="errorToDoRouteFailedNew">Der opstod en fejl ved forsøg på at vise dette element på opgavelisten.</string>
     <string name="errorIsDesigner">Designer-tilmelding kan ikke se dette.</string>
 
     <string name="sections">Sektioner</string>
diff --git a/apps/teacher/src/main/res/values-de/strings.xml b/apps/teacher/src/main/res/values-de/strings.xml
index 20cc4cc6d9..78e81d40d8 100644
--- a/apps/teacher/src/main/res/values-de/strings.xml
+++ b/apps/teacher/src/main/res/values-de/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Anwesenheit</string>
     <string name="tab_pages">Seiten</string>
     <string name="tab_todo">Zu erledigen</string>
+    <string name="tab_todo_new">Aufgaben</string>
     <string name="content_description_school_logo">Logo der Schule</string>
     <string name="search_guides">Die Canvas-Anleitungen durchsuchen</string>
     <string name="canvas_guides">Canvas-Leitfäden</string>
@@ -353,7 +354,7 @@
     <string name="letter_grade">Buchstaben-Note</string>
     <string name="excuse_student">Student entschuldigen</string>
     <string name="excuseGroup">Gruppe entschuldigen</string>
-    <string name="complete_grade">Fertigstellen</string>
+    <string name="complete_grade">Vollständig</string>
     <string name="incomplete_grade">Unvollständig</string>
     <string name="not_graded">Unbenotet</string>
     <string name="excused">Entschuldigt</string>
@@ -546,7 +547,7 @@
     </string-array>
     <string name="quizStatusUntaken">Nicht erledigt</string>
 
-    <string name="quizStatusComplete">Fertigstellen</string>
+    <string name="quizStatusComplete">Vollständig</string>
     <string name="quizStatusPendingReview">Ausstehende Überprüfung</string>
     <string name="quizStatusInProgress">In Arbeit</string>
     <string name="quizStatusNotStarted">Nicht begonnen</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Nichts weiter zu tun.\n Genießen Sie Ihren Tag!</string>
     <string name="toDoNoSubmissions">Für diese Aufgabe sind keine Abgaben zu benoten.</string>
     <string name="errorToDoRouteFailed">Fehler beim Anzeigen dieser Aufgabe.</string>
+    <string name="errorToDoRouteFailedNew">Bei der Ansicht des To-Do-Elements ist ein Fehler aufgetreten.</string>
     <string name="errorIsDesigner">Designer-Anmeldung kann dies nicht anzeigen.</string>
 
     <string name="sections">Abschnitte</string>
diff --git a/apps/teacher/src/main/res/values-en-rAU/strings.xml b/apps/teacher/src/main/res/values-en-rAU/strings.xml
index 62a4f98001..fdbda1892f 100644
--- a/apps/teacher/src/main/res/values-en-rAU/strings.xml
+++ b/apps/teacher/src/main/res/values-en-rAU/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To Do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to mark for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this To Do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrolment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-en-rCA/strings.xml b/apps/teacher/src/main/res/values-en-rCA/strings.xml
index 132287df5b..92bca6edd3 100644
--- a/apps/teacher/src/main/res/values-en-rCA/strings.xml
+++ b/apps/teacher/src/main/res/values-en-rCA/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To Do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -845,6 +846,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to grade for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this To Do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrollment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-en-rCY/strings.xml b/apps/teacher/src/main/res/values-en-rCY/strings.xml
index 06fe0712e4..36ab392b68 100644
--- a/apps/teacher/src/main/res/values-en-rCY/strings.xml
+++ b/apps/teacher/src/main/res/values-en-rCY/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to grade for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this to-do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrolment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-en-rGB/strings.xml b/apps/teacher/src/main/res/values-en-rGB/strings.xml
index 1e2d03c067..eae0a2de22 100644
--- a/apps/teacher/src/main/res/values-en-rGB/strings.xml
+++ b/apps/teacher/src/main/res/values-en-rGB/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to grade for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this to-do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrolment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-en/strings.xml b/apps/teacher/src/main/res/values-en/strings.xml
index ae9fe72034..8e66b64ee2 100644
--- a/apps/teacher/src/main/res/values-en/strings.xml
+++ b/apps/teacher/src/main/res/values-en/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To Do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -845,6 +846,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to grade for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this To Do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrollment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-es-rES/strings.xml b/apps/teacher/src/main/res/values-es-rES/strings.xml
index 7980014f82..199350c3b8 100644
--- a/apps/teacher/src/main/res/values-es-rES/strings.xml
+++ b/apps/teacher/src/main/res/values-es-rES/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Asistencia</string>
     <string name="tab_pages">Páginas</string>
     <string name="tab_todo">Tareas pendientes</string>
+    <string name="tab_todo_new">Tareas pendientes</string>
     <string name="content_description_school_logo">Logo de la escuela</string>
     <string name="search_guides">Buscar en las guías de Canvas</string>
     <string name="canvas_guides">Guías de Canvas</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Nada más pendiente.\n Que tengas un buen día.</string>
     <string name="toDoNoSubmissions">No hay entregas para evaluar para esta actividad.</string>
     <string name="errorToDoRouteFailed">Ha habido un error al intentar ver este ítem de tareas pendientes.</string>
+    <string name="errorToDoRouteFailedNew">Se ha producido un error al intentar ver este ítem de tareas pendientes.</string>
     <string name="errorIsDesigner">La inscripción de diseñador no puede ver esto.</string>
 
     <string name="sections">Secciones</string>
diff --git a/apps/teacher/src/main/res/values-es/strings.xml b/apps/teacher/src/main/res/values-es/strings.xml
index f75c1bb81b..cd422891dc 100644
--- a/apps/teacher/src/main/res/values-es/strings.xml
+++ b/apps/teacher/src/main/res/values-es/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Asistencia</string>
     <string name="tab_pages">Páginas</string>
     <string name="tab_todo">Por hacer</string>
+    <string name="tab_todo_new">Ítem Por hacer</string>
     <string name="content_description_school_logo">Logo de la escuela</string>
     <string name="search_guides">Busque en las guías de Canvas</string>
     <string name="canvas_guides">Guías de Canvas</string>
@@ -843,6 +844,7 @@
     <string name="toDoEmpty">¡Nada más que hacer!\n Disfrute su día.</string>
     <string name="toDoNoSubmissions">No hay entregas para calificar para esta tarea.</string>
     <string name="errorToDoRouteFailed">Se produjo un error al intentar ver este item por hacer.</string>
+    <string name="errorToDoRouteFailedNew">Se produjo un error al intentar ver este ítem Por hacer.</string>
     <string name="errorIsDesigner">La inscripción de diseñador no puede ver esto.</string>
 
     <string name="sections">Secciones</string>
diff --git a/apps/teacher/src/main/res/values-fi/strings.xml b/apps/teacher/src/main/res/values-fi/strings.xml
index f3e32ddb8e..736cf07915 100644
--- a/apps/teacher/src/main/res/values-fi/strings.xml
+++ b/apps/teacher/src/main/res/values-fi/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Osallistuminen</string>
     <string name="tab_pages">Sivut</string>
     <string name="tab_todo">Tehtävä</string>
+    <string name="tab_todo_new">Tehtävälista</string>
     <string name="content_description_school_logo">Koulun logo</string>
     <string name="search_guides">Etsi Canvas-oppaita</string>
     <string name="canvas_guides">Canvas-oppaat</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Ei enempää tehtävänä!\n Nauti päivästäsi.</string>
     <string name="toDoNoSubmissions">Ei ole lähetyksiä tämän tehtävän arvosteluun.</string>
     <string name="errorToDoRouteFailed">Tämän Tehtävä-kohteen näyttämisen yhteydessä ilmeni virhe.</string>
+    <string name="errorToDoRouteFailedNew">Tämän Tehtävä-kohteen näyttämisen yhteydessä ilmeni virhe.</string>
     <string name="errorIsDesigner">Suunnittelijan ilmoittautumista ei voi tarkastella tätä.</string>
 
     <string name="sections">Osat</string>
diff --git a/apps/teacher/src/main/res/values-fr/strings.xml b/apps/teacher/src/main/res/values-fr/strings.xml
index 9f776238be..792d696d3e 100644
--- a/apps/teacher/src/main/res/values-fr/strings.xml
+++ b/apps/teacher/src/main/res/values-fr/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Présence</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">À faire</string>
+    <string name="tab_todo_new">À Faire</string>
     <string name="content_description_school_logo">Logo de l’école</string>
     <string name="search_guides">Rechercher dans les guides de Canvas</string>
     <string name="canvas_guides">Guides de Canvas</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Rien d’autre à faire !\n Bonne journée.</string>
     <string name="toDoNoSubmissions">Il n’y a aucune soumission à noter pour ce devoir.</string>
     <string name="errorToDoRouteFailed">Une erreur est survenue lors de la tentative d’affichage de cet élément de la liste des choses à faire.</string>
+    <string name="errorToDoRouteFailedNew">Une erreur est survenu lors de la tentative d’affichage de cette tâche À Faire.</string>
     <string name="errorIsDesigner">L’inscription en tant que concepteur ne permet pas d’afficher ceci.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values-ga/strings.xml b/apps/teacher/src/main/res/values-ga/strings.xml
index 0c4b931bba..29217ceac9 100644
--- a/apps/teacher/src/main/res/values-ga/strings.xml
+++ b/apps/teacher/src/main/res/values-ga/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Tinreamh</string>
     <string name="tab_pages">Leathanaigh</string>
     <string name="tab_todo">Le Déanamh</string>
+    <string name="tab_todo_new">Le Déanamh</string>
     <string name="content_description_school_logo">Lógó na Scoile</string>
     <string name="search_guides">Cuardaigh na Treoracha Canvas</string>
     <string name="canvas_guides">Treoracha Canvas</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Níl aon rud níos mó le déanamh!\n Bain taitneamh as do lá.</string>
     <string name="toDoNoSubmissions">Níl aon uaslódálacha le marcáil don tasc seo.</string>
     <string name="errorToDoRouteFailed">Tharla earráid agus an mhír Le Déanamh seo a fheiceáil.</string>
+    <string name="errorToDoRouteFailedNew">Tharla earráid agus iarracht á déanamh an mhír Le Déanamh seo a fheiceáil.</string>
     <string name="errorIsDesigner">Ní féidir le rollú dearthóirí é seo a fheiceáil.</string>
 
     <string name="sections">Grúpaí</string>
diff --git a/apps/teacher/src/main/res/values-hi/strings.xml b/apps/teacher/src/main/res/values-hi/strings.xml
index 21761edd75..cfa97dd05a 100644
--- a/apps/teacher/src/main/res/values-hi/strings.xml
+++ b/apps/teacher/src/main/res/values-hi/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">उपस्थिति</string>
     <string name="tab_pages">पेज</string>
     <string name="tab_todo">करने के लिए</string>
+    <string name="tab_todo_new">करने के लिए</string>
     <string name="content_description_school_logo">स्कूल का लोगो</string>
     <string name="search_guides">Canvas गाइड में खोजें</string>
     <string name="canvas_guides">Canvas गाइड</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">करके के लिए और कुछ नहीं है!\n अपने दिन का आनंद लें।</string>
     <string name="toDoNoSubmissions">इस असाइनमेंट को ग्रेड करने के लिए कोई सबमिशन नहीं है।</string>
     <string name="errorToDoRouteFailed">इस करने के लिए आइटम को देखने की कोशिश करने के दौरान त्रुटि उत्पन्न हुई।</string>
+    <string name="errorToDoRouteFailedNew">इस \'करने के लिए\' आइटम को देखने का प्रयास करते समय एक त्रुटि हुई।</string>
     <string name="errorIsDesigner">डिज़ाइनर नामांकन इसे नहीं देख सकता।</string>
 
     <string name="sections">अनुभाग</string>
diff --git a/apps/teacher/src/main/res/values-ht/strings.xml b/apps/teacher/src/main/res/values-ht/strings.xml
index 6d9ab85cfc..65839e70a0 100644
--- a/apps/teacher/src/main/res/values-ht/strings.xml
+++ b/apps/teacher/src/main/res/values-ht/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Prezans</string>
     <string name="tab_pages">Paj</string>
     <string name="tab_todo">Pou Fè</string>
+    <string name="tab_todo_new">Pou fè</string>
     <string name="content_description_school_logo">moun</string>
     <string name="search_guides">Chèche nan Gid Canvas</string>
     <string name="canvas_guides">Gid Canvas</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Pa gen anyen ki pou fèt ankò!\n Pwofite jounen an.</string>
     <string name="toDoNoSubmissions">Pa gen soumisyon pou evalye pou sesyon sa a.</string>
     <string name="errorToDoRouteFailed">Gen yon erè ki fèt pandan w ap eseye afiche eleman Tach sa a.</string>
+    <string name="errorToDoRouteFailedNew">Yon erè te rive pandan w t ap eseye gade bagay pou w fè sa a.</string>
     <string name="errorIsDesigner">Enskripsyon konseptè paka wè sa a.</string>
 
     <string name="sections">Seksyon</string>
diff --git a/apps/teacher/src/main/res/values-id/strings.xml b/apps/teacher/src/main/res/values-id/strings.xml
index 8160cd9934..0df5363951 100644
--- a/apps/teacher/src/main/res/values-id/strings.xml
+++ b/apps/teacher/src/main/res/values-id/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Kehadiran</string>
     <string name="tab_pages">Halaman</string>
     <string name="tab_todo">Harus Dilakukan</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">Logo Sekolah</string>
     <string name="search_guides">Cari di Panduan Canvas</string>
     <string name="canvas_guides">Panduan Canvas</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Tidak ada lagi hal yang harus dilakukan!\n Semoga harimu menyenangkan.</string>
     <string name="toDoNoSubmissions">Tidak ada penyerahan untuk dinilai untuk tugas ini.</string>
     <string name="errorToDoRouteFailed">Kesalahan terjadi saat mencoba melihat item To Do ini.</string>
+    <string name="errorToDoRouteFailedNew">Kesalahan terjadi saat mencoba melihat item To Do ini.</string>
     <string name="errorIsDesigner">Pendaftaran desainer tidak dapat melihat ini.</string>
 
     <string name="sections">Bagian</string>
diff --git a/apps/teacher/src/main/res/values-is/strings.xml b/apps/teacher/src/main/res/values-is/strings.xml
index f544fc1310..6ee325f46f 100644
--- a/apps/teacher/src/main/res/values-is/strings.xml
+++ b/apps/teacher/src/main/res/values-is/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Mæting</string>
     <string name="tab_pages">Síður</string>
     <string name="tab_todo">Verkefni</string>
+    <string name="tab_todo_new">Verkefnalisti</string>
     <string name="content_description_school_logo">Myndmerki skóla</string>
     <string name="search_guides">Leita í leiðbeiningum Canvas</string>
     <string name="canvas_guides">Canvas leiðarvísar</string>
@@ -843,6 +844,7 @@
     <string name="toDoEmpty">Ekkert annað á dagskrá!\n Njóttu dagsins.</string>
     <string name="toDoNoSubmissions">Þetta verkefni er ekki með nein skil sem bíða mats.</string>
     <string name="errorToDoRouteFailed">Villa kom upp við að skoða þetta verkefni á verkefnalista.</string>
+    <string name="errorToDoRouteFailedNew">Villa kom upp við að skoða þetta verkefni á verkefnalista.</string>
     <string name="errorIsDesigner">Hönnuðu innritun sér þetta ekki.</string>
 
     <string name="sections">Fylki</string>
diff --git a/apps/teacher/src/main/res/values-it/strings.xml b/apps/teacher/src/main/res/values-it/strings.xml
index 7834756330..68e545bf6e 100644
--- a/apps/teacher/src/main/res/values-it/strings.xml
+++ b/apps/teacher/src/main/res/values-it/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Frequenza</string>
     <string name="tab_pages">Pagine</string>
     <string name="tab_todo">Elenco attività</string>
+    <string name="tab_todo_new">Attività da fare</string>
     <string name="content_description_school_logo">Logo della scuola</string>
     <string name="search_guides">Cerca Guide Canvas</string>
     <string name="canvas_guides">Guide Canvas</string>
@@ -843,6 +844,7 @@
     <string name="toDoEmpty">Nessun\'altra attività!\n Buona giornata.</string>
     <string name="toDoNoSubmissions">Non ci sono consegne da valutare per questo compito.</string>
     <string name="errorToDoRouteFailed">Si è verificato un errore durante il tentativo di visualizzare le cose da fare.</string>
+    <string name="errorToDoRouteFailedNew">Si è verificato un errore durante il tentativo di visualizzare questo elemento da fare.</string>
     <string name="errorIsDesigner">L’iscrizione progettista non può visualizzare questo elemento.</string>
 
     <string name="sections">Sezioni</string>
diff --git a/apps/teacher/src/main/res/values-ja/strings.xml b/apps/teacher/src/main/res/values-ja/strings.xml
index c3dd835ffa..fb274e8eef 100644
--- a/apps/teacher/src/main/res/values-ja/strings.xml
+++ b/apps/teacher/src/main/res/values-ja/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">出席状況</string>
     <string name="tab_pages">ページ</string>
     <string name="tab_todo">タスク</string>
+    <string name="tab_todo_new">するべきこと</string>
     <string name="content_description_school_logo">スクールロゴ</string>
     <string name="search_guides">Canvas ガイドを検索する</string>
     <string name="canvas_guides">Canvas ガイド</string>
@@ -830,6 +831,7 @@
     <string name="toDoEmpty">他にすることはありません！\nよい一日を。</string>
     <string name="toDoNoSubmissions">この課題を採点するための提出物はありません。</string>
     <string name="errorToDoRouteFailed">このやるべきことの項目を表示しようとしてエラーが発生しました。</string>
+    <string name="errorToDoRouteFailedNew">この「するべきこと」の項目を表示しようとしてエラーが発生しました。</string>
     <string name="errorIsDesigner">デザイナー登録はこれを表示できません。</string>
 
     <string name="sections">セクション</string>
diff --git a/apps/teacher/src/main/res/values-ko/strings.xml b/apps/teacher/src/main/res/values-ko/strings.xml
index f90fdcf82b..c60bf1bb27 100644
--- a/apps/teacher/src/main/res/values-ko/strings.xml
+++ b/apps/teacher/src/main/res/values-ko/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">출석</string>
     <string name="tab_pages">페이지</string>
     <string name="tab_todo">할 일</string>
+    <string name="tab_todo_new">할 일</string>
     <string name="content_description_school_logo">학교 로고</string>
     <string name="search_guides">Canvas 가이드 검색</string>
     <string name="canvas_guides">Canvas 가이드</string>
@@ -832,6 +833,7 @@
     <string name="toDoEmpty">더 할 일이 없습니다.\n 즐거운 하루 보내세요.</string>
     <string name="toDoNoSubmissions">이 과제에 대해 채점할 제출이 없습니다.</string>
     <string name="errorToDoRouteFailed">이 할 일 항목을 보려고 시도하는 데 오류가 발생했습니다.</string>
+    <string name="errorToDoRouteFailedNew">이 할 일 항목을 보려고 시도하는 데 오류가 발생했습니다.</string>
     <string name="errorIsDesigner">디자이너 등록은 볼 수 없습니다.</string>
 
     <string name="sections">분반</string>
diff --git a/apps/teacher/src/main/res/values-mi/strings.xml b/apps/teacher/src/main/res/values-mi/strings.xml
index 46c421575d..32eff8fff1 100644
--- a/apps/teacher/src/main/res/values-mi/strings.xml
+++ b/apps/teacher/src/main/res/values-mi/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Taenga mai</string>
     <string name="tab_pages">Ngā whārangi</string>
     <string name="tab_todo">Hei mahi</string>
+    <string name="tab_todo_new">Mahi-mahi</string>
     <string name="content_description_school_logo">Tohu o te Kura</string>
     <string name="search_guides">Rapu nga Kaiarahi Canvas</string>
     <string name="canvas_guides">Canvas Kaiārahi</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Kaore atu anō he mahi!\n Kia pai tō rā.</string>
     <string name="toDoNoSubmissions">Kaore he tukunga hei kōeke mo tēnei whakataunga.</string>
     <string name="errorToDoRouteFailed">He hapa i puta i te wā e tiro ana i tēnei Hei Mahi tuemi.</string>
+    <string name="errorToDoRouteFailedNew">I puta he hapa i te ngana ki te tiro i tēnei tūemi mahi.</string>
     <string name="errorIsDesigner">Kaore e taea e ngā kaitātai whakaurunga te tiro i tenei.</string>
 
     <string name="sections">Ngā Wāhanga</string>
diff --git a/apps/teacher/src/main/res/values-ms/strings.xml b/apps/teacher/src/main/res/values-ms/strings.xml
index aed553386a..0d6a03ff4c 100644
--- a/apps/teacher/src/main/res/values-ms/strings.xml
+++ b/apps/teacher/src/main/res/values-ms/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Kehadiran</string>
     <string name="tab_pages">Halaman</string>
     <string name="tab_todo">Untuk Dilakukan</string>
+    <string name="tab_todo_new">Untuk Dilakukan</string>
     <string name="content_description_school_logo">Logo Sekolah</string>
     <string name="search_guides">Buat Carian dalam Panduan Canvas</string>
     <string name="canvas_guides">Panduan Canvas</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Tiada apa-apa lagi untuk dilakukan!\n Nikmati hari anda</string>
     <string name="toDoNoSubmissions">Tiada serahan untuk digredkan untuk tugasan ini.</string>
     <string name="errorToDoRouteFailed">Ralat berlaku semasa cuba melihat Item Untuk Dilakukan</string>
+    <string name="errorToDoRouteFailedNew">Ralat berlaku semasa cuba melihat item Untuk Dilakukan ini.</string>
     <string name="errorIsDesigner">Pendaftaran Pereka Bentuk tidak boleh melihat ini.</string>
 
     <string name="sections">Seksyen</string>
diff --git a/apps/teacher/src/main/res/values-nb/strings.xml b/apps/teacher/src/main/res/values-nb/strings.xml
index 09addaaaba..5b8a88e1f5 100644
--- a/apps/teacher/src/main/res/values-nb/strings.xml
+++ b/apps/teacher/src/main/res/values-nb/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Oppmøte</string>
     <string name="tab_pages">Sider</string>
     <string name="tab_todo">Å gjøre</string>
+    <string name="tab_todo_new">Gjøremål</string>
     <string name="content_description_school_logo">Skolens Logo</string>
     <string name="search_guides">Søk i Canvas-guidene</string>
     <string name="canvas_guides">Canvas-guider</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Ingen flere oppgaver!\n Ha en fin dag.</string>
     <string name="toDoNoSubmissions">Det finnes ingen innleveringer å gi vurderinger til for denne oppgaven.</string>
     <string name="errorToDoRouteFailed">En feil oppsto under visning av dette gjøremålselementet.</string>
+    <string name="errorToDoRouteFailedNew">En feil oppsto under visning av dette gjøremålselementet.</string>
     <string name="errorIsDesigner">Designer påmelding kan ikke vise dette.</string>
 
     <string name="sections">Seksjoner</string>
diff --git a/apps/teacher/src/main/res/values-nl/strings.xml b/apps/teacher/src/main/res/values-nl/strings.xml
index 612c064b7b..7ef51a9037 100644
--- a/apps/teacher/src/main/res/values-nl/strings.xml
+++ b/apps/teacher/src/main/res/values-nl/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Aanwezigheid</string>
     <string name="tab_pages">Pagina\'s</string>
     <string name="tab_todo">To-do lijst</string>
+    <string name="tab_todo_new">Opdracht</string>
     <string name="content_description_school_logo">Schoollogo</string>
     <string name="search_guides">In Canvas-handleidingen zoeken</string>
     <string name="canvas_guides">Canvas-handleidingen</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Dat was alles!\n Een fijne dag gewenst.</string>
     <string name="toDoNoSubmissions">Er zijn geen inzendingen die voor deze opdracht moeten worden beoordeeld.</string>
     <string name="errorToDoRouteFailed">Er is een fout opgetreden bij het weergeven van dit To-do-item.</string>
+    <string name="errorToDoRouteFailedNew">Er is een fout opgetreden bij het weergeven van dit item van de lijst met opdrachten.</string>
     <string name="errorIsDesigner">Ontwerperinschrijving kan dit niet zien.</string>
 
     <string name="sections">Secties</string>
diff --git a/apps/teacher/src/main/res/values-pl/strings.xml b/apps/teacher/src/main/res/values-pl/strings.xml
index eaa231cfd2..7267b8e824 100644
--- a/apps/teacher/src/main/res/values-pl/strings.xml
+++ b/apps/teacher/src/main/res/values-pl/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Uczestnictwo</string>
     <string name="tab_pages">Strony</string>
     <string name="tab_todo">Lista zadań</string>
+    <string name="tab_todo_new">Lista zadań</string>
     <string name="content_description_school_logo">Logo szkoły</string>
     <string name="search_guides">Wyszukaj przewodniki Canvas</string>
     <string name="canvas_guides">Przewodniki Canvas</string>
@@ -866,6 +867,7 @@
     <string name="toDoEmpty">Nic więcej do zrobienia!\n Korzystaj z dnia.</string>
     <string name="toDoNoSubmissions">Brak zgłoszeń do oceny dla tego zadania.</string>
     <string name="errorToDoRouteFailed">Podczas wyświetlania tego elementu listy zadań wystąpił błąd.</string>
+    <string name="errorToDoRouteFailedNew">Podczas wyświetlania tego elementu listy zadań wystąpił błąd.</string>
     <string name="errorIsDesigner">Rejestrujący nie może tego wyświetlać.</string>
 
     <string name="sections">Sekcje</string>
diff --git a/apps/teacher/src/main/res/values-pt-rBR/strings.xml b/apps/teacher/src/main/res/values-pt-rBR/strings.xml
index bc677ae43d..f4aa047c1a 100644
--- a/apps/teacher/src/main/res/values-pt-rBR/strings.xml
+++ b/apps/teacher/src/main/res/values-pt-rBR/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Frequência</string>
     <string name="tab_pages">Páginas</string>
     <string name="tab_todo">Lista de Tarefas</string>
+    <string name="tab_todo_new">A fazer</string>
     <string name="content_description_school_logo">Logo da Escola</string>
     <string name="search_guides">Pesquisar no Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -843,6 +844,7 @@
     <string name="toDoEmpty">Nada mais para fazer!\n Aproveite o seu dia.</string>
     <string name="toDoNoSubmissions">Não há envios para avaliar para essa tarefa.</string>
     <string name="errorToDoRouteFailed">Ocorreu um erro ao tentar visualizar o item da lista de tarefas.</string>
+    <string name="errorToDoRouteFailedNew">Ocorreu um erro ao tentar visualizar este item da lista de tarefas.</string>
     <string name="errorIsDesigner">A matrícula de designer não pode visualizar isso.</string>
 
     <string name="sections">Turmas</string>
diff --git a/apps/teacher/src/main/res/values-pt-rPT/strings.xml b/apps/teacher/src/main/res/values-pt-rPT/strings.xml
index eae07b0fe4..87fdb12b5d 100644
--- a/apps/teacher/src/main/res/values-pt-rPT/strings.xml
+++ b/apps/teacher/src/main/res/values-pt-rPT/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Presença</string>
     <string name="tab_pages">Páginas</string>
     <string name="tab_todo">A Fazer</string>
+    <string name="tab_todo_new">A fazer</string>
     <string name="content_description_school_logo">Logo da escola</string>
     <string name="search_guides">Procurar nos Guias do Canvas</string>
     <string name="canvas_guides">Guias Canvas</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Nada mais a fazer!\n Aproveite seu dia.</string>
     <string name="toDoNoSubmissions">Não há envios para classificação para esta tarefa.</string>
     <string name="errorToDoRouteFailed">Ocorreu um erro ao tentar exibir este item para fazer.</string>
+    <string name="errorToDoRouteFailedNew">Ocorreu um erro ao tentar exibir este item a fazer.</string>
     <string name="errorIsDesigner">Inscrição do Designer não pode ver isto.</string>
 
     <string name="sections">Secções</string>
diff --git a/apps/teacher/src/main/res/values-ru/strings.xml b/apps/teacher/src/main/res/values-ru/strings.xml
index a766fefe94..3b1973c91f 100644
--- a/apps/teacher/src/main/res/values-ru/strings.xml
+++ b/apps/teacher/src/main/res/values-ru/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Посещаемость</string>
     <string name="tab_pages">Страницы</string>
     <string name="tab_todo">Задачи</string>
+    <string name="tab_todo_new">Задача</string>
     <string name="content_description_school_logo">Логотип учебного заведения</string>
     <string name="search_guides">Поиск в руководствах Canvas</string>
     <string name="canvas_guides">Руководства Canvas</string>
@@ -866,6 +867,7 @@
     <string name="toDoEmpty">Все задания выполнены!\n Хорошего дня.</string>
     <string name="toDoNoSubmissions">Для этого задания отсутствуют объекты для оценки.</string>
     <string name="errorToDoRouteFailed">Произошла ошибка при попытке просмотра этого элемента списка текущих дел.</string>
+    <string name="errorToDoRouteFailedNew">Произошла ошибка при попытке просмотра этого элемента списка текущих задач.</string>
     <string name="errorIsDesigner">Это не доступно для просмотра при зачислении дизайнеров.</string>
 
     <string name="sections">Разделы</string>
diff --git a/apps/teacher/src/main/res/values-sl/strings.xml b/apps/teacher/src/main/res/values-sl/strings.xml
index ec0023df01..735fc3743c 100644
--- a/apps/teacher/src/main/res/values-sl/strings.xml
+++ b/apps/teacher/src/main/res/values-sl/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Prisotnost</string>
     <string name="tab_pages">Strani</string>
     <string name="tab_todo">Seznam opravil</string>
+    <string name="tab_todo_new">Opravilo</string>
     <string name="content_description_school_logo">Logotip šole</string>
     <string name="search_guides">Išči vodnike po sistemu Canvas</string>
     <string name="canvas_guides">Vodniki po sistemu Canvas</string>
@@ -842,6 +843,7 @@
     <string name="toDoEmpty">Ničesar ni več treba opraviti.\n Uživajte v dnevu.</string>
     <string name="toDoNoSubmissions">Za to nalogo ni oddaj, ki bi jih bilo treba oceniti.</string>
     <string name="errorToDoRouteFailed">Pri ogledu tega elementa seznama opravil je prišlo do napake.</string>
+    <string name="errorToDoRouteFailedNew">Pri ogledu tega elementa seznama opravil je prišlo do napake.</string>
     <string name="errorIsDesigner">Za vpis snovalca ogled tega ni mogoč.</string>
 
     <string name="sections">Sekcije</string>
diff --git a/apps/teacher/src/main/res/values-sv/strings.xml b/apps/teacher/src/main/res/values-sv/strings.xml
index 71c762669d..a1193b3517 100644
--- a/apps/teacher/src/main/res/values-sv/strings.xml
+++ b/apps/teacher/src/main/res/values-sv/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Närvaro</string>
     <string name="tab_pages">Sidor</string>
     <string name="tab_todo">Att göra</string>
+    <string name="tab_todo_new">Att göra</string>
     <string name="content_description_school_logo">Skolans logotyp</string>
     <string name="search_guides">Sök i Canvas-guider</string>
     <string name="canvas_guides">Canvas-guider</string>
@@ -843,6 +844,7 @@
     <string name="toDoEmpty">Inget mer att göra!\n Ha en bra dag.</string>
     <string name="toDoNoSubmissions">Det finns inga inlämningar att bedöma för denna uppgift.</string>
     <string name="errorToDoRouteFailed">Ett fel uppstod när du försökte visa detta att göra-objekt.</string>
+    <string name="errorToDoRouteFailedNew">Ett fel inträffade vid försök att visa det här att göra-objektet.</string>
     <string name="errorIsDesigner">Designerregistrering kan inte visa detta.</string>
 
     <string name="sections">Sektioner</string>
diff --git a/apps/teacher/src/main/res/values-th/strings.xml b/apps/teacher/src/main/res/values-th/strings.xml
index 46b3dcf62c..991e2050ba 100644
--- a/apps/teacher/src/main/res/values-th/strings.xml
+++ b/apps/teacher/src/main/res/values-th/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">การเข้าร่วม</string>
     <string name="tab_pages">เพจ</string>
     <string name="tab_todo">สิ่งที่ต้องดำเนินการ</string>
+    <string name="tab_todo_new">สิ่งที่ต้องทำ</string>
     <string name="content_description_school_logo">โลโก้สถานศึกษา</string>
     <string name="search_guides">ค้นหาคู่มือ Canvas</string>
     <string name="canvas_guides">คู่มือ Canvas</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">ไม่มีการดำเนินการใด ๆ อีก!\n ขอให้มีความสุข</string>
     <string name="toDoNoSubmissions">ไม่มีผลงานจัดส่งที่จะให้คะแนนสำหรับภารกิจนี้</string>
     <string name="errorToDoRouteFailed">เกิดข้อผิดพลาดขณะพยายามดูรายการที่ต้องทำนี้</string>
+    <string name="errorToDoRouteFailedNew">เกิดข้อผิดพลาดขณะพยายามดูรายการที่ต้องทำ (To-do) นี้</string>
     <string name="errorIsDesigner">ส่วนการลงทะเบียนของผู้ออกแบบไม่สามารถดูในส่วนนี้ได้</string>
 
     <string name="sections">กลุ่มย่อย</string>
diff --git a/apps/teacher/src/main/res/values-vi/strings.xml b/apps/teacher/src/main/res/values-vi/strings.xml
index 2fa202b268..8e93ea613c 100644
--- a/apps/teacher/src/main/res/values-vi/strings.xml
+++ b/apps/teacher/src/main/res/values-vi/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Chuyên Cần</string>
     <string name="tab_pages">Trang</string>
     <string name="tab_todo">Việc Cần Làm</string>
+    <string name="tab_todo_new">Việc Cần Làm</string>
     <string name="content_description_school_logo">Biểu Trưng Trường</string>
     <string name="search_guides">Tìm kiếm Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -844,6 +845,7 @@
     <string name="toDoEmpty">Không còn gì thêm cần làm!\n Hãy tận hưởng thời gian còn lại trong ngày nhé.</string>
     <string name="toDoNoSubmissions">Không có bài nộp để chấm điểm cho bài tập này.</string>
     <string name="errorToDoRouteFailed">Đã xảy ra lỗi khi thử xem mục Việc Cần Làm.</string>
+    <string name="errorToDoRouteFailedNew">Đã xảy ra lỗi khi thử xem mục Việc Cần Làm.</string>
     <string name="errorIsDesigner">Vai trò người thiết kế/ghi danh không xem được</string>
 
     <string name="sections">Phần</string>
diff --git a/apps/teacher/src/main/res/values-zh/strings.xml b/apps/teacher/src/main/res/values-zh/strings.xml
index 934a615f29..b66b6b5697 100644
--- a/apps/teacher/src/main/res/values-zh/strings.xml
+++ b/apps/teacher/src/main/res/values-zh/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">出勤</string>
     <string name="tab_pages">页面</string>
     <string name="tab_todo">待办事项</string>
+    <string name="tab_todo_new">待办</string>
     <string name="content_description_school_logo">学校徽标</string>
     <string name="search_guides">搜索 Canvas 指南</string>
     <string name="canvas_guides">Canvas 指南</string>
@@ -830,6 +831,7 @@
     <string name="toDoEmpty">无需再执行其他操作！\n祝您度过愉快的一天。</string>
     <string name="toDoNoSubmissions">此作业没有要评分的提交项。</string>
     <string name="errorToDoRouteFailed">尝试查看此待办事项时出错。</string>
+    <string name="errorToDoRouteFailedNew">尝试查看此待办任务时出错。</string>
     <string name="errorIsDesigner">设计者注册无法查看。</string>
 
     <string name="sections">章节</string>
diff --git a/apps/teacher/src/main/res/values/strings.xml b/apps/teacher/src/main/res/values/strings.xml
index ae9fe72034..8e66b64ee2 100644
--- a/apps/teacher/src/main/res/values/strings.xml
+++ b/apps/teacher/src/main/res/values/strings.xml
@@ -31,6 +31,7 @@
     <string name="tab_attendance">Attendance</string>
     <string name="tab_pages">Pages</string>
     <string name="tab_todo">To Do</string>
+    <string name="tab_todo_new">To-do</string>
     <string name="content_description_school_logo">School Logo</string>
     <string name="search_guides">Search the Canvas Guides</string>
     <string name="canvas_guides">Canvas Guides</string>
@@ -845,6 +846,7 @@
     <string name="toDoEmpty">Nothing more to do!\n Enjoy your day.</string>
     <string name="toDoNoSubmissions">There are no submissions to grade for this assignment.</string>
     <string name="errorToDoRouteFailed">An error occurred trying to view this To Do item.</string>
+    <string name="errorToDoRouteFailedNew">An error occurred trying to view this To-do item.</string>
     <string name="errorIsDesigner">Designer enrollment cannot view this.</string>
 
     <string name="sections">Sections</string>
diff --git a/apps/teacher/src/main/res/values/styles.xml b/apps/teacher/src/main/res/values/styles.xml
index b074fd0ce6..96d5b6ba8c 100644
--- a/apps/teacher/src/main/res/values/styles.xml
+++ b/apps/teacher/src/main/res/values/styles.xml
@@ -30,7 +30,6 @@
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
         <item name="pspdf__backgroundColor">@color/backgroundLight</item>
         <item name="android:datePickerStyle">@style/DatePickerStyle</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="PSPDFKitTheme" parent="AppTheme.NoActionBar">
@@ -49,7 +48,6 @@
         <item name="pspdf__propertyInspectorStyle">@style/PropertyInspector</item>
         <item name="pspdf__backgroundColor">@color/backgroundLight</item>
         <item name="pspdf__modalDialogStyle">@style/ModalDialogStyle</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="ContextualToolbarStyle">
@@ -81,7 +79,7 @@
 
     <style name="StampPickerStyle">
         <item name="pspdf__maxHeight">380dp</item>
-        <item name="pspdf__maxWidth">100dp</item>
+        <item name="pspdf__maxWidth">200dp</item>
         <item name="pspdf__backgroundColor">@color/backgroundLightest</item>
     </style>
 
@@ -107,7 +105,6 @@
         <item name="pspdf__propertyInspectorStyle">@style/PropertyInspector</item>
         <item name="pspdf__backgroundColor">@color/backgroundLight</item>
         <item name="pspdf__modalDialogStyle">@style/ModalDialogStyle</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="Widget.ActionButton.Overflow" parent="@android:style/Widget.Holo.ActionButton.Overflow">
@@ -130,7 +127,6 @@
         <item name="alertDialogTheme">@style/CanvasDialogTheme_Default</item>
         <item name="android:editTextStyle">@style/NoGifEditText</item>
         <item name="editTextStyle">@style/NoGifEditText</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="RoundedContextDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
diff --git a/apps/teacher/src/qa/AndroidManifest.xml b/apps/teacher/src/qa/AndroidManifest.xml
index d4354d28c2..036f0cbdf7 100644
--- a/apps/teacher/src/qa/AndroidManifest.xml
+++ b/apps/teacher/src/qa/AndroidManifest.xml
@@ -32,6 +32,11 @@
 
     <application tools:ignore="GoogleAppIndexingWarning">
 
+        <meta-data
+            android:name="nutrient_automatic_initialize"
+            android:value="true"
+            tools:replace="android:value" />
+
         <activity android:name=".SingleFragmentTestActivity" />
 
     </application>
diff --git a/automation/dataseedingapi/src/main/graphql/com/instructure/dataseeding/CreateDiscussionTopicMinimal.graphql b/automation/dataseedingapi/src/main/graphql/com/instructure/dataseeding/CreateDiscussionTopicMinimal.graphql
index 2bbb4ee622..457a5bfed7 100644
--- a/automation/dataseedingapi/src/main/graphql/com/instructure/dataseeding/CreateDiscussionTopicMinimal.graphql
+++ b/automation/dataseedingapi/src/main/graphql/com/instructure/dataseeding/CreateDiscussionTopicMinimal.graphql
@@ -19,7 +19,8 @@ mutation CreateDiscussionTopicMinimal(
     $contextType: DiscussionTopicContextType!,
     $title: String!,
     $assignment: AssignmentCreate!,
-    $checkpoints: [DiscussionCheckpoints!]!
+    $checkpoints: [DiscussionCheckpoints!]!,
+    $fileId: ID
 ) {
     createDiscussionTopic(
         input: {
@@ -28,7 +29,8 @@ mutation CreateDiscussionTopicMinimal(
             title: $title,
             published: true,
             assignment: $assignment,
-            checkpoints: $checkpoints
+            checkpoints: $checkpoints,
+            fileId: $fileId
         }
     ) {
         discussionTopic {
diff --git a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/DiscussionTopicsApi.kt b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/DiscussionTopicsApi.kt
index d0c2b01cce..5c4730352c 100644
--- a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/DiscussionTopicsApi.kt
+++ b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/DiscussionTopicsApi.kt
@@ -1,20 +1,19 @@
-//
-// Copyright (C) 2018-present Instructure, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-
+/*
+ * Copyright (C) 2018 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *
+ */
 package com.instructure.dataseeding.api
 
 import com.apollographql.apollo.api.Optional
@@ -35,9 +34,15 @@ import com.instructure.dataseedingapi.type.DiscussionCheckpoints
 import com.instructure.dataseedingapi.type.DiscussionTopicContextType
 import com.instructure.dataseedingapi.type.GradingType
 import kotlinx.coroutines.runBlocking
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.Multipart
 import retrofit2.http.POST
+import retrofit2.http.Part
 import retrofit2.http.Path
 
 object DiscussionTopicsApi {
@@ -45,6 +50,17 @@ object DiscussionTopicsApi {
         @POST("courses/{courseId}/discussion_topics")
         fun createDiscussionTopic(@Path("courseId") courseId: Long, @Body createDiscussionTopic: CreateDiscussionTopic): Call<DiscussionApiModel>
 
+        @Multipart
+        @POST("courses/{courseId}/discussion_topics")
+        fun createDiscussionTopicWithAttachment(
+            @Path("courseId") courseId: Long,
+            @Part("title") title: RequestBody,
+            @Part("message") message: RequestBody,
+            @Part("is_announcement") isAnnouncement: RequestBody,
+            @Part("published") published: RequestBody,
+            @Part attachment: MultipartBody.Part
+        ): Call<DiscussionApiModel>
+
         @POST("courses/{courseId}/discussion_topics/{discussionId}/entries")
         fun createEntryToDiscussionTopic(@Path("courseId") courseId: Long, @Path("discussionId") discussionId: Long, @Body discussionTopicEntry: DiscussionTopicEntryRequest): Call<DiscussionTopicEntryResponse>
 
@@ -72,8 +88,22 @@ object DiscussionTopicsApi {
             .body()!!
     }
 
-    fun createDiscussion(courseId: Long, token: String, isAnnouncement: Boolean = false, lockedForUser: Boolean = false, locked: Boolean = false, discussionTitle: String? = null): DiscussionApiModel {
+    fun createDiscussion(courseId: Long, token: String, isAnnouncement: Boolean = false, lockedForUser: Boolean = false, locked: Boolean = false, discussionTitle: String? = null, fileBytes: ByteArray? = null, fileName: String? = null): DiscussionApiModel {
         val discussionTopic = Randomizer.randomDiscussion(discussionTitle, isAnnouncement, lockedForUser, locked)
+        if (fileBytes != null && fileName != null) {
+            val attachment = MultipartBody.Part.createFormData("attachment", fileName, fileBytes.toRequestBody("application/octet-stream".toMediaTypeOrNull()))
+            return discussionTopicsService(token)
+                .createDiscussionTopicWithAttachment(
+                    courseId,
+                    discussionTopic.title.toRequestBody("text/plain".toMediaTypeOrNull()),
+                    discussionTopic.message.toRequestBody("text/plain".toMediaTypeOrNull()),
+                    isAnnouncement.toString().toRequestBody("text/plain".toMediaTypeOrNull()),
+                    "true".toRequestBody("text/plain".toMediaTypeOrNull()),
+                    attachment
+                )
+                .execute()
+                .body()!!
+        }
         return discussionTopicsService(token)
                 .createDiscussionTopic(courseId, discussionTopic)
                 .execute()
@@ -86,7 +116,8 @@ object DiscussionTopicsApi {
         discussionTitle: String,
         assignmentName: String,
         replyToTopicDueDate: String? = null,
-        replyToEntryDueDate: String? = null
+        replyToEntryDueDate: String? = null,
+        fileId: String? = null
     ) {
         val apolloClient = CanvasNetworkAdapter.getApolloClient(token)
 
@@ -131,7 +162,8 @@ object DiscussionTopicsApi {
             contextType = DiscussionTopicContextType.Course,
             title = discussionTitle,
             assignment = assignment,
-            checkpoints = checkpoints
+            checkpoints = checkpoints,
+            fileId = Optional.presentIfNotNull(fileId)
         )
 
         runBlocking {
@@ -139,8 +171,8 @@ object DiscussionTopicsApi {
         }
     }
 
-    fun createAnnouncement(courseId: Long, token: String, lockedForUser: Boolean = false, locked: Boolean = false, announcementTitle: String? = null): DiscussionApiModel {
-        val discussion = createDiscussion(courseId, token, true, lockedForUser, locked, announcementTitle)
+    fun createAnnouncement(courseId: Long, token: String, lockedForUser: Boolean = false, locked: Boolean = false, announcementTitle: String? = null, fileBytes: ByteArray? = null, fileName: String? = null): DiscussionApiModel {
+        val discussion = createDiscussion(courseId, token, true, lockedForUser, locked, announcementTitle, fileBytes, fileName)
 
         if(!lockedForUser) {
             return DiscussionApiModel(
diff --git a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/UserApi.kt b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/UserApi.kt
index da64eed20b..0036ea0cea 100644
--- a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/UserApi.kt
+++ b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/api/UserApi.kt
@@ -16,6 +16,7 @@
  */
 package com.instructure.dataseeding.api
 
+import com.google.gson.JsonObject
 import com.instructure.dataseeding.model.CanvasUserApiModel
 import com.instructure.dataseeding.model.CommunicationChannel
 import com.instructure.dataseeding.model.CreateUser
@@ -27,10 +28,16 @@ import com.instructure.dataseeding.model.User
 import com.instructure.dataseeding.model.UserSettingsApiModel
 import com.instructure.dataseeding.util.CanvasNetworkAdapter
 import com.instructure.dataseeding.util.Randomizer
+import okhttp3.Cookie
+import okhttp3.CookieJar
+import okhttp3.FormBody
+import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import org.jsoup.Connection
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
 import org.jsoup.Jsoup
-import org.jsoup.nodes.FormElement
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -159,18 +166,76 @@ object UserApi {
      * @return The [String] auth code to be used to acquire the userApiModel's access token
      */
     private fun getAuthCode(userApiModel: CanvasUserApiModel, domain: String = CanvasNetworkAdapter.canvasDomain): String {
-        val loginPageResponse = Jsoup.connect("https://$domain/login/oauth2/auth")
-                .method(Connection.Method.GET)
-                .data("client_id", CanvasNetworkAdapter.clientId)
-                .data("response_type", "code")
-                .data("redirect_uri", CanvasNetworkAdapter.redirectUri)
-                .execute()
-        val loginForm = loginPageResponse.parse().select("form").first() as FormElement
-        loginForm.getElementById("pseudonym_session_unique_id").`val`(userApiModel.loginId)
-        loginForm.getElementById("pseudonym_session_password").`val`(userApiModel.password)
-        val authFormResponse = loginForm.submit().cookies(loginPageResponse.cookies()).execute()
-        val authForm = authFormResponse.parse().select("form").first() as FormElement
-        val responseUrl = authForm.submit().cookies(authFormResponse.cookies()).execute().url().toString()
-        return responseUrl.toHttpUrlOrNull()?.queryParameter("code") ?: throw RuntimeException("/login/oauth2/auth failed!")
+        val cookieStore = mutableMapOf<String, MutableMap<String, Cookie>>()
+        val cookieJar = object : CookieJar {
+            override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
+                cookieStore.getOrPut(url.host) { mutableMapOf() }.apply { cookies.forEach { put(it.name, it) } }
+            }
+            override fun loadForRequest(url: HttpUrl): List<Cookie> =
+                cookieStore[url.host]?.values?.toList() ?: emptyList()
+        }
+        val httpClient = OkHttpClient.Builder().followRedirects(true).cookieJar(cookieJar).build()
+
+        val loginPageUrl = "https://$domain/login/oauth2/auth".toHttpUrlOrNull()!!
+            .newBuilder()
+            .addQueryParameter("client_id", CanvasNetworkAdapter.clientId)
+            .addQueryParameter("response_type", "code")
+            .addQueryParameter("redirect_uri", CanvasNetworkAdapter.redirectUri)
+            .build()
+        val loginPageResponse = httpClient.newCall(Request.Builder().url(loginPageUrl).get().build()).execute()
+        val loginPageHtml = loginPageResponse.body?.string() ?: ""
+
+        val csrfToken = loginPageResponse.header("X-Csrf-Token")
+            ?: Jsoup.parse(loginPageHtml).select("meta[name=csrf-token]").attr("content").takeIf { it.isNotEmpty() }
+            ?: cookieStore[domain]?.values
+                ?.firstOrNull { it.name.equals("_csrf_token", ignoreCase = true) }
+                ?.value?.let { java.net.URLDecoder.decode(it, "UTF-8") }
+            ?: throw RuntimeException(
+                "CSRF token not found.\nResponse headers: ${loginPageResponse.headers}\n" +
+                "Cookies on $domain: ${cookieStore[domain]?.keys}\nAll cookies: ${cookieStore.mapValues { it.value.keys }}"
+            )
+
+        val loginJson = JsonObject().apply {
+            addProperty("authenticity_token", csrfToken)
+            add("pseudonym_session", JsonObject().apply {
+                addProperty("unique_id", userApiModel.loginId)
+                addProperty("password", userApiModel.password)
+                addProperty("remember_me", "0")
+            })
+        }.toString()
+        val loginResponse = httpClient.newCall(
+            Request.Builder()
+                .url("https://$domain/login/canvas")
+                .post(loginJson.toRequestBody("application/json".toMediaType()))
+                .build()
+        ).execute()
+        val loginStatusCode = loginResponse.code
+        val loginResponseHtml = loginResponse.body?.string() ?: ""
+        val loginFinalUrl = loginResponse.request.url.toString()
+
+        // If the code is already in the URL (no consent step needed), return it directly
+        loginFinalUrl.toHttpUrlOrNull()?.queryParameter("code")?.let { return it }
+
+        val consentForm = Jsoup.parse(loginResponseHtml, "https://$domain").select("form").first()
+            ?: throw RuntimeException(
+                "OAuth consent form not found at: $loginFinalUrl (HTTP $loginStatusCode)\n" +
+                "CSRF token used: $csrfToken\n" +
+                "Cookies on $domain: ${cookieStore[domain]?.keys}\n" +
+                "HTML:\n$loginResponseHtml"
+            )
+        val formAction = consentForm.attr("abs:action").takeIf { it.isNotEmpty() }
+            ?: throw RuntimeException("Consent form action attribute missing. HTML:\n${consentForm.outerHtml()}")
+        val formBodyBuilder = FormBody.Builder()
+        consentForm.select("input[name], select[name], textarea[name]").forEach { el ->
+            formBodyBuilder.add(el.attr("name"), el.`val`())
+        }
+        val consentResponse = httpClient.newCall(
+            Request.Builder().url(formAction).post(formBodyBuilder.build()).build()
+        ).execute()
+        consentResponse.body?.close()
+
+        val finalUrl = consentResponse.request.url.toString()
+        return finalUrl.toHttpUrlOrNull()?.queryParameter("code")
+            ?: throw RuntimeException("/login/oauth2/auth failed! Final URL: $finalUrl")
     }
 }
diff --git a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/util/Extensions.kt b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/util/Extensions.kt
index 86319977ac..d721645090 100644
--- a/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/util/Extensions.kt
+++ b/automation/dataseedingapi/src/main/kotlin/com/instructure/dataseeding/util/Extensions.kt
@@ -18,7 +18,9 @@
 package com.instructure.dataseeding.util
 
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
 
 
 val Int.week: Pair<Int, Int>
@@ -29,6 +31,10 @@ val Int.days: Pair<Int, Int>
     get() =
         Pair(Calendar.DAY_OF_YEAR, this)
 
+val Int.hours: Pair<Int, Int>
+    get() =
+        Pair(Calendar.HOUR_OF_DAY, this)
+
 val Pair<Int, Int>.fromNow: Calendar
     get() {
         val cal = Calendar.getInstance()
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/CustomActions.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/CustomActions.kt
index 3de43361ff..d7800b70ed 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/CustomActions.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/CustomActions.kt
@@ -348,7 +348,13 @@ fun checkToastText(text: String, activity: Activity) {
 }
 
 fun checkToastText(@StringRes stringRes: Int, activity: Activity) {
-    onView(withText(stringRes)).inRoot(withDecorView(not(`is`(activity.window.decorView)))).check(matches(isDisplayed()))
+    retryWithIncreasingDelay(times = 3, initialDelay = 500, maxDelay = 5000) {
+        try {
+            onView(withText(stringRes)).inRoot(withDecorView(not(`is`(activity.window.decorView)))).check(matches(isDisplayed()))
+        } catch (e: NoMatchingViewException) {
+            // Toast did not appear yet, so try to check it again.
+        }
+    }
 
     retryWithIncreasingDelay(times = 5, initialDelay = 500, maxDelay = 15500) {
         try {
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CalendarInteractionTest.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CalendarInteractionTest.kt
index 86f412c8b8..f1cf6a9ac4 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CalendarInteractionTest.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CalendarInteractionTest.kt
@@ -111,7 +111,7 @@ abstract class CalendarInteractionTest : CanvasComposeTest() {
         calendarScreenPage.assertItemDetails(assignment.name!!, course.name, index = 0)
         calendarScreenPage.assertItemDetails(quiz.title!!, course.name, index = 1)
         calendarScreenPage.assertItemDetails(discussionAssignment.name!!, course.name, index = 2)
-        calendarScreenPage.assertItemDetails(todo.plannable.title, "${course.name} To Do", index = 3)
+        calendarScreenPage.assertItemDetails(todo.plannable.title, "${course.name} To-do", index = 3)
         calendarScreenPage.assertItemDetails(event.title!!, course.name, index = 4)
     }
 
@@ -407,7 +407,7 @@ abstract class CalendarInteractionTest : CanvasComposeTest() {
         clickTodayButton()
 
         calendarScreenPage.assertItemDetails(event.title!!, course.name)
-        calendarScreenPage.assertItemDetails(todo.plannable.title, "${course.name} To Do")
+        calendarScreenPage.assertItemDetails(todo.plannable.title, "${course.name} To-do")
     }
 
     override fun displaysPageObjects() = Unit
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CreateUpdateToDoInteractionTest.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CreateUpdateToDoInteractionTest.kt
index c2d2eaa873..a54abd4c5b 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CreateUpdateToDoInteractionTest.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/CreateUpdateToDoInteractionTest.kt
@@ -47,7 +47,7 @@ abstract class CreateUpdateToDoInteractionTest : CanvasComposeTest() {
         calendarToDoCreateUpdatePage.clickSave()
 
         composeTestRule.waitForIdle()
-        calendarScreenPage.assertItemDetails("New Todo", "To Do")
+        calendarScreenPage.assertItemDetails("New Todo", "To-do")
     }
 
     @Test
@@ -63,7 +63,7 @@ abstract class CreateUpdateToDoInteractionTest : CanvasComposeTest() {
         calendarToDoCreateUpdatePage.clickSave()
 
         composeTestRule.waitForIdle()
-        calendarScreenPage.assertItemDetails("New Todo", "To Do")
+        calendarScreenPage.assertItemDetails("New Todo", "To-do")
     }
 
     @Test
@@ -99,7 +99,7 @@ abstract class CreateUpdateToDoInteractionTest : CanvasComposeTest() {
         calendarToDoCreateUpdatePage.clickSave()
 
         composeTestRule.waitForIdle()
-        calendarScreenPage.assertItemDetails("New Todo", "$canvasContextName To Do")
+        calendarScreenPage.assertItemDetails("New Todo", "$canvasContextName To-do")
     }
 
     @Test
@@ -134,13 +134,13 @@ abstract class CreateUpdateToDoInteractionTest : CanvasComposeTest() {
         goToEditToDo(data)
 
         composeTestRule.waitForIdle()
-        calendarToDoCreateUpdatePage.assertPageTitle("Edit To Do")
+        calendarToDoCreateUpdatePage.assertPageTitle("Edit To-do")
         calendarToDoCreateUpdatePage.assertTodoTitle("Test Todo")
         calendarToDoCreateUpdatePage.typeTodoTitle("Updated Title")
         calendarToDoCreateUpdatePage.clickSave()
 
         composeTestRule.waitForIdle()
-        calendarScreenPage.assertItemDetails("Updated Title", "To Do")
+        calendarScreenPage.assertItemDetails("Updated Title", "To-do")
     }
 
     @Test
@@ -167,7 +167,7 @@ abstract class CreateUpdateToDoInteractionTest : CanvasComposeTest() {
 
         composeTestRule.waitForIdle()
         calendarScreenPage.swipeEventsLeft()
-        calendarScreenPage.assertItemDetails("Test Todo", "To Do")
+        calendarScreenPage.assertItemDetails("Test Todo", "To-do")
     }
 
     @Test
@@ -223,7 +223,7 @@ abstract class CreateUpdateToDoInteractionTest : CanvasComposeTest() {
         calendarToDoCreateUpdatePage.clickSave()
 
         composeTestRule.waitForIdle()
-        calendarScreenPage.assertItemDetails("Test Todo", "$canvasContextName To Do")
+        calendarScreenPage.assertItemDetails("Test Todo", "$canvasContextName To-do")
     }
 
     @Test
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoDetailsInteractionTest.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoDetailsInteractionTest.kt
index 3dbaf29704..2d3ebb3b5b 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoDetailsInteractionTest.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoDetailsInteractionTest.kt
@@ -133,7 +133,7 @@ abstract class ToDoDetailsInteractionTest : CanvasComposeTest() {
         calendarToDoDetailsPage.clickEditMenu()
 
         composeTestRule.waitForIdle()
-        calendarToDoCreateUpdatePage.assertPageTitle("Edit To Do")
+        calendarToDoCreateUpdatePage.assertPageTitle("Edit To-do")
     }
 
     @Test
@@ -179,7 +179,7 @@ abstract class ToDoDetailsInteractionTest : CanvasComposeTest() {
         calendarToDoDetailsPage.clickDeleteMenu()
 
         composeTestRule.waitForIdle()
-        composeTestRule.onNodeWithText("Delete To Do?").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Delete To-do?").assertIsDisplayed()
         composeTestRule.onNodeWithText("Delete").performClick()
 
         composeTestRule.waitForIdle()
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoListInteractionTest.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoListInteractionTest.kt
index 106c11f2fc..3c9f8a1e85 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoListInteractionTest.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/interaction/ToDoListInteractionTest.kt
@@ -162,7 +162,7 @@ abstract class ToDoListInteractionTest : CanvasComposeTest() {
 
         composeTestRule.waitForIdle()
         toDoListPage.clickFilterButton()
-        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDos)
+        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDosNew)
         toDoFilterPage.clickDone()
         composeTestRule.waitForIdle()
         toDoListPage.clickOnItem(todo.plannable.title)
@@ -360,7 +360,7 @@ abstract class ToDoListInteractionTest : CanvasComposeTest() {
 
         // Enable personal todos filter
         toDoListPage.clickFilterButton()
-        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDos)
+        toDoFilterPage.selectVisibleItemsOption(R.string.todoFilterShowPersonalToDosNew)
         toDoFilterPage.clickDone()
 
         composeTestRule.waitForIdle()
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/AssignmentDetailsPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/AssignmentDetailsPage.kt
index 9bde2936b4..7dad3c720a 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/AssignmentDetailsPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/AssignmentDetailsPage.kt
@@ -44,6 +44,7 @@ import com.instructure.canvas.espresso.CanvasTest
 import com.instructure.canvas.espresso.containsTextCaseInsensitive
 import com.instructure.canvas.espresso.stringContainsTextCaseInsensitive
 import com.instructure.canvas.espresso.waitForMatcherWithSleeps
+import com.instructure.canvas.espresso.withResourceIdContaining
 import com.instructure.canvasapi2.models.Assignment
 import com.instructure.dataseeding.model.AssignmentApiModel
 import com.instructure.espresso.ModuleItemInteractions
@@ -334,6 +335,24 @@ open class AssignmentDetailsPage(val moduleItemInteractions: ModuleItemInteracti
         onView(withId(R.id.draftDivider)).assertDisplayed()
     }
 
+    fun assertAttachmentIconDisplayed() {
+        onView(withId(R.id.attachmentIcon))
+            .scrollTo()
+            .assertDisplayed()
+    }
+
+    fun clickAttachmentIcon() {
+        onView(withId(R.id.attachmentIcon))
+            .scrollTo()
+            .click()
+    }
+
+    // PDF viewer method for PSPDFKit toolbar verification
+    fun assertPdfViewerToolbarDisplayed() {
+        Espresso.onView(withResourceIdContaining("pspdf__toolbar_main"))
+            .assertDisplayed()
+    }
+
     //OfflineMethod
     fun assertSubmitButtonDisabled() {
         onView(withId(R.id.submitButton)).check(matches(ViewMatchers.isNotEnabled()))
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginFindSchoolPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginFindSchoolPage.kt
index 46d0b6aa1e..fe63eb0241 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginFindSchoolPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginFindSchoolPage.kt
@@ -24,6 +24,7 @@ import com.instructure.espresso.page.BasePage
 import com.instructure.espresso.page.getStringFromResource
 import com.instructure.espresso.page.plus
 import com.instructure.espresso.page.waitForView
+import com.instructure.espresso.page.withAncestor
 import com.instructure.espresso.page.withId
 import com.instructure.espresso.page.withText
 import com.instructure.espresso.replaceText
@@ -81,5 +82,19 @@ class LoginFindSchoolPage: BasePage() {
         val hintText = getHintText(withId(R.id.domainInput))
         assertEquals(hintText, getStringFromResource(schoolText))
     }
+
+    /**
+     * Assert that the "Tap here for login help." link is displayed.
+     */
+    fun assertHowDoIFindMySchoolLinkDisplayed() {
+        waitForView(withId(R.id.helpLink) + withText(R.string.accountDomainFooterLoginHelp) + withAncestor(withId(R.id.findSchoolRecyclerView))).assertDisplayed()
+    }
+
+    /**
+     * Clicks the "Tap here for login help." link.
+     */
+    fun clickOnHowDoIFindMySchoolLink() {
+        waitForView(withId(R.id.helpLink) + withText(R.string.accountDomainFooterLoginHelp) + withAncestor(withId(R.id.findSchoolRecyclerView))).click()
+    }
 }
 
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginSignInPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginSignInPage.kt
index c6a83910e1..09b76b0c68 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginSignInPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/LoginSignInPage.kt
@@ -16,6 +16,7 @@
  */
 package com.instructure.canvas.espresso.common.pages
 
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
 import androidx.test.espresso.web.sugar.Web
 import androidx.test.espresso.web.sugar.Web.onWebView
@@ -29,22 +30,24 @@ import com.instructure.dataseeding.model.CanvasUserApiModel
 import com.instructure.espresso.OnViewWithId
 import com.instructure.espresso.assertDisplayed
 import com.instructure.espresso.click
+import com.instructure.espresso.notifyReactOfInputChange
 import com.instructure.espresso.page.BasePage
 import com.instructure.espresso.page.onView
 import com.instructure.espresso.page.waitForViewWithText
 import com.instructure.espresso.page.withText
+import com.instructure.espresso.waitForWebElement
 import com.instructure.loginapi.login.R
 import org.hamcrest.CoreMatchers.containsString
 
 @Suppress("unused")
 class LoginSignInPage: BasePage() {
 
-    private val EMAIL_FIELD_CSS = "input[name=\"pseudonym_session[unique_id]\"]"
-    private val PASSWORD_FIELD_CSS = "input[name=\"pseudonym_session[password]\"]"
-    private val LOGIN_BUTTON_CSS = "button[type=\"submit\"]"
-    private val FORGOT_PASSWORD_BUTTON_CSS = "a[class=\"forgot-password flip-to-back\"]"
-    private val AUTHORIZE_BUTTON_CSS = "button[type=\"submit\"]"
-    private val LOGIN_ERROR_MESSAGE_HOLDER_CSS = "div[class='error']"
+    private val EMAIL_FIELD_CSS = "input[data-testid=\"username-input\"]"
+    private val PASSWORD_FIELD_CSS = "input[data-testid=\"password-input\"]"
+    private val LOGIN_BUTTON_CSS = "button[data-testid=\"login-button\"]"
+    private val FORGOT_PASSWORD_BUTTON_CSS = "a[data-testid=\"forgot-password-link\"]"
+    private val EMAIL_LOGIN_ERROR_MESSAGE_HOLDER_CSS = "div[id=\"TextInput-messages___0\"] span[class\$='formFieldMessage']"
+    private val PASSWORD_LOGIN_ERROR_MESSAGE_HOLDER_CSS = "div[id=\"TextInput-messages___1\"] span[class\$='formFieldMessage']"
 
     private val signInRoot by OnViewWithId(R.id.signInRoot, autoAssert = false)
     private val toolbar by OnViewWithId(R.id.toolbar, autoAssert = false)
@@ -67,12 +70,12 @@ class LoginSignInPage: BasePage() {
         return onWebView().withElement(findElement(Locator.CSS_SELECTOR, FORGOT_PASSWORD_BUTTON_CSS))
     }
 
-    private fun authorizeButton(): Web.WebInteraction<*> {
-        return onWebView().withElement(findElement(Locator.CSS_SELECTOR, AUTHORIZE_BUTTON_CSS))
+    private fun emailLoginErrorMessageHolder(): Web.WebInteraction<*> {
+        return onWebView().withElement(findElement(Locator.CSS_SELECTOR, EMAIL_LOGIN_ERROR_MESSAGE_HOLDER_CSS))
     }
 
-    private fun loginErrorMessageHolder(): Web.WebInteraction<*> {
-        return onWebView().withElement(findElement(Locator.CSS_SELECTOR, LOGIN_ERROR_MESSAGE_HOLDER_CSS))
+    private fun passwordLoginErrorMessageHolder(): Web.WebInteraction<*> {
+        return onWebView().withElement(findElement(Locator.CSS_SELECTOR, PASSWORD_LOGIN_ERROR_MESSAGE_HOLDER_CSS))
     }
 
     //endregion
@@ -102,13 +105,17 @@ class LoginSignInPage: BasePage() {
     }
 
     private fun enterEmail(email: String) {
+        waitForWebElement(withId(R.id.webView), Locator.CSS_SELECTOR, EMAIL_FIELD_CSS, timeoutMillis = 10000)
         emailField().perform(clearElement())
         emailField().perform(webKeys(email))
+        notifyReactOfInputChange(EMAIL_FIELD_CSS)
     }
 
     private fun enterPassword(password: String) {
+        waitForWebElement(withId(R.id.webView), Locator.CSS_SELECTOR, PASSWORD_FIELD_CSS, timeoutMillis = 10000)
         passwordField().perform(clearElement())
         passwordField().perform(webKeys(password))
+        notifyReactOfInputChange(PASSWORD_FIELD_CSS)
     }
 
     private fun clickLoginButton() {
@@ -119,8 +126,12 @@ class LoginSignInPage: BasePage() {
         forgotPasswordButton().perform(webClick())
     }
 
-    fun assertLoginErrorMessage(errorMessage: String) {
-        loginErrorMessageHolder().check(webMatches(getText(), containsString(errorMessage)))
+    fun assertLoginEmailErrorMessage(emailErrorMessage: String) {
+        emailLoginErrorMessageHolder().check(webMatches(getText(), containsString(emailErrorMessage)))
+    }
+
+    fun assertLoginPasswordErrorMessage(passwordErrorMessage: String) {
+        passwordLoginErrorMessageHolder().check(webMatches(getText(), containsString(passwordErrorMessage)))
     }
 
     fun loginAs(user: CanvasUserApiModel) {
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/VideoPlayerPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/VideoPlayerPage.kt
new file mode 100644
index 0000000000..5afbe5f6e3
--- /dev/null
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/VideoPlayerPage.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *
+ */
+package com.instructure.canvas.espresso.common.pages
+
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.Until
+import com.instructure.espresso.assertDisplayed
+import com.instructure.espresso.click
+import com.instructure.espresso.page.BasePage
+import com.instructure.espresso.page.onView
+import com.instructure.espresso.page.withId
+import com.instructure.espresso.page.withParent
+import com.instructure.pandautils.R
+import org.hamcrest.Matchers.allOf
+import androidx.media3.ui.R as Media3R
+
+/**
+ * Page object for video player interactions.
+ * Contains common methods for interacting with both in-app ExoPlayer and external device video players.
+ */
+class VideoPlayerPage : BasePage() {
+
+    fun assertMediaCommentPreviewDisplayed() {
+        onView(allOf(withId(R.id.prepareMediaButton), withParent(R.id.mediaPreviewContainer))).assertDisplayed()
+    }
+
+    fun clickPlayButton() {
+        onView(withId(R.id.prepareMediaButton)).click()
+    }
+
+    fun assertPlayPauseButtonDisplayed() {
+        onView(withId(Media3R.id.exo_play_pause)).assertDisplayed()
+    }
+
+    fun clickPlayPauseButton() {
+        onView(withId(Media3R.id.exo_play_pause)).click()
+    }
+
+    /**
+     * Waits until mediaProgressBar is no longer visible, confirming the video has finished
+     * loading and started playing. Once loading completes, taps the screen center to reveal
+     * the player controls.
+     */
+    fun waitForVideoToStart(device: UiDevice) {
+        device.wait(Until.gone(By.res(device.currentPackageName, "mediaProgressBar")), 15000L)
+        device.click(device.displayWidth / 2, device.displayHeight / 2)
+    }
+
+    /**
+     * Waits until the ExoPlayer's player_view is visible (video opened directly from Files),
+     * then taps the screen center to reveal the player controls.
+     */
+    fun waitForPlayerViewAndTapToShowControls(device: UiDevice) {
+        device.wait(Until.findObject(By.res(device.currentPackageName, "player_view")), 15000L)
+        device.click(device.displayWidth / 2, device.displayHeight / 2)
+    }
+
+}
\ No newline at end of file
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarScreenPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarScreenPage.kt
index 91265c37f3..792fe31098 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarScreenPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarScreenPage.kt
@@ -55,7 +55,7 @@ class CalendarScreenPage(private val composeTestRule: ComposeTestRule) : BasePag
     }
 
     fun clickAddTodo() {
-        composeTestRule.onNodeWithText("Add To Do").performClick()
+        composeTestRule.onNodeWithText("Add To-do").performClick()
         composeTestRule.waitForIdle()
     }
 
@@ -137,6 +137,13 @@ class CalendarScreenPage(private val composeTestRule: ComposeTestRule) : BasePag
         composeTestRule.waitForIdle()
     }
 
+    fun clickOnDayNumber(dayNumber: Int) {
+        composeTestRule.onNode(
+            hasTestTag(dayNumber.toString()) and hasAnyAncestor(hasTestTag("calendarBody0"))
+        ).performClick()
+        composeTestRule.waitForIdle()
+    }
+
     fun checkCalendarCollapsed(): Boolean {
         return try {
             composeTestRule.onNode(hasTestTag("calendarRow0").and(hasAnyAncestor(hasTestTag("calendarBody0")))).assertIsDisplayed()
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarToDoDetailsPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarToDoDetailsPage.kt
index 2681506ac8..22bcc295a3 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarToDoDetailsPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarToDoDetailsPage.kt
@@ -103,12 +103,12 @@ class CalendarToDoDetailsPage(private val composeTestRule: ComposeTestRule) {
     }
 
     fun assertDeleteDialog() {
-        composeTestRule.onNodeWithText("Delete To Do?").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Delete To-do?").assertIsDisplayed()
     }
 
     fun confirmDeletion() {
         composeTestRule.waitForIdle()
-        composeTestRule.onNodeWithText("Delete To Do?").assertIsDisplayed()
+        composeTestRule.onNodeWithText("Delete To-do?").assertIsDisplayed()
         composeTestRule.onNodeWithText("Delete").performClick()
     }
 
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxComposePage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxComposePage.kt
index def3a2568b..ed436821ec 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxComposePage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxComposePage.kt
@@ -156,8 +156,8 @@ class InboxComposePage(private val composeTestRule: ComposeTestRule) {
     }
 
     fun pressSendButton() {
-        composeTestRule.waitForIdle()
         composeTestRule.onNodeWithContentDescription("Send message").performClick()
+        composeTestRule.waitForIdle()
     }
 
     fun pressCourseSelector() {
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxDetailsPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxDetailsPage.kt
index cb85f60210..3883e73d2d 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxDetailsPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/InboxDetailsPage.kt
@@ -13,7 +13,6 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-
 package com.instructure.canvas.espresso.common.pages.compose
 
 import androidx.compose.ui.semantics.SemanticsProperties.Text
@@ -36,14 +35,9 @@ import androidx.compose.ui.test.onParent
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.uiautomator.UiDevice
 import com.instructure.canvas.espresso.withResourceIdContaining
 import com.instructure.canvasapi2.models.Conversation
 import com.instructure.espresso.assertDisplayed
-import com.instructure.espresso.click
-import com.instructure.pandautils.R
-import androidx.media3.ui.R as Media3R
 
 class InboxDetailsPage(private val composeTestRule: ComposeTestRule) {
 
@@ -208,31 +202,6 @@ class InboxDetailsPage(private val composeTestRule: ComposeTestRule) {
 
     }
 
-    // Media player methods for video playback verification
-    fun assertPlayButtonDisplayed() {
-        onView(withId(R.id.prepareMediaButton))
-            .assertDisplayed()
-    }
-
-    fun clickPlayButton() {
-        onView(withId(R.id.prepareMediaButton))
-            .click()
-    }
-
-    fun clickScreenCenterToShowControls(device: UiDevice) {
-        device.click(device.displayWidth / 2, device.displayHeight / 2)
-    }
-
-    fun assertPlayPauseButtonDisplayed() {
-        onView(withId(Media3R.id.exo_play_pause))
-            .assertDisplayed()
-    }
-
-    fun clickPlayPauseButton() {
-        onView(withId(Media3R.id.exo_play_pause))
-            .click()
-    }
-
     // PDF viewer method for PSPDFKit toolbar verification
     fun assertPdfViewerToolbarDisplayed() {
         onView(withResourceIdContaining("pspdf__toolbar_main"))
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/SmartSearchPreferencesPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/SmartSearchPreferencesPage.kt
index 42fc873415..a901d47efb 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/SmartSearchPreferencesPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/SmartSearchPreferencesPage.kt
@@ -19,6 +19,8 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertIsOff
 import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.hasAnyDescendant
 import androidx.compose.ui.test.hasParent
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.junit4.ComposeTestRule
@@ -46,8 +48,12 @@ class SmartSearchPreferencesPage(private val composeTestRule: ComposeTestRule) {
     }
 
     fun cancelFilters() {
-        composeTestRule.onNodeWithTag("navigationButton", useUnmergedTree = true)
-            .performClick()
+        composeTestRule.onNode(
+            hasTestTag("navigationButton").and(
+                hasAnyAncestor(hasTestTag("toolbar").and(hasAnyDescendant(hasTestTag("doneButton"))))
+            ),
+            useUnmergedTree = true
+        ).performClick()
         composeTestRule.waitForIdle()
     }
 
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoFilterPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoFilterPage.kt
index db2b12ebfd..762b9e2bd6 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoFilterPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoFilterPage.kt
@@ -39,7 +39,7 @@ import com.instructure.pandautils.R
 class ToDoFilterPage(private val composeTestRule: ComposeTestRule) : BasePage() {
 
     fun assertFilterScreenTitle() {
-        composeTestRule.onNodeWithText(getStringFromResource(R.string.todoFilterPreferences))
+        composeTestRule.onNodeWithText(getStringFromResource(R.string.todoFilterPreferencesNew))
             .assertIsDisplayed()
     }
 
@@ -72,7 +72,7 @@ class ToDoFilterPage(private val composeTestRule: ComposeTestRule) : BasePage()
             .performScrollToNode(hasText(getStringFromResource(R.string.todoFilterVisibleItems)))
         composeTestRule.onNodeWithText(getStringFromResource(R.string.todoFilterVisibleItems)).performScrollTo()
             .assertIsDisplayed()
-        composeTestRule.onNodeWithText(getStringFromResource(R.string.todoFilterShowPersonalToDos)).performScrollTo()
+        composeTestRule.onNodeWithText(getStringFromResource(R.string.todoFilterShowPersonalToDosNew)).performScrollTo()
             .assertIsDisplayed()
         composeTestRule.onNodeWithText(getStringFromResource(R.string.todoFilterShowCalendarEvents)).performScrollTo()
             .assertIsDisplayed()
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoListPage.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoListPage.kt
index 63a1165abb..4484ad00d6 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoListPage.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/ToDoListPage.kt
@@ -16,6 +16,9 @@
 package com.instructure.canvas.espresso.common.pages.compose
 
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasAnyAncestor
+import androidx.compose.ui.test.hasAnyDescendant
+import androidx.compose.ui.test.hasAnySibling
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.ComposeTestRule
@@ -25,6 +28,7 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTouchInput
+import androidx.compose.ui.test.swipeDown
 import androidx.compose.ui.test.swipeLeft
 import androidx.compose.ui.test.swipeRight
 import com.instructure.espresso.assertDoesNotExistWithTimeout
@@ -40,8 +44,13 @@ class ToDoListPage(private val composeTestRule: ComposeTestRule) : BasePage() {
         composeTestRule.waitForIdle()
     }
 
-    fun clickOnItem(itemTitle: String) {
-        composeTestRule.onNodeWithText(itemTitle).performClick()
+    fun clickOnItem(itemTitle: String, tagName: String = "") {
+        if(tagName.isEmpty()) {
+            composeTestRule.onNodeWithText(itemTitle).performClick()
+        }
+        else {
+            composeTestRule.onNode( hasTestTag("todoItemTitle") and hasText(itemTitle) and hasAnySibling(hasTestTag("todoItemTag") and hasText(tagName)), useUnmergedTree = true).performClick()
+        }
         composeTestRule.waitForIdle()
     }
 
@@ -49,6 +58,38 @@ class ToDoListPage(private val composeTestRule: ComposeTestRule) : BasePage() {
         composeTestRule.onNode( hasTestTag("todoItemTitle") and hasText(itemTitle), useUnmergedTree = true).assertIsDisplayed()
     }
 
+    fun assertDiscussionCheckpointItemDisplayed(itemTitle: String, tagName: String = "") {
+        composeTestRule.onNode( hasTestTag("todoItemTitle") and hasText(itemTitle) and hasAnySibling(hasTestTag("todoItemTag") and hasText(tagName)), useUnmergedTree = true).assertIsDisplayed()
+        composeTestRule.onNode(hasTestTag("todoItemTag") and hasText(tagName) and hasAnySibling(hasTestTag("todoItemTitle") and hasText(itemTitle)), useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    fun assertItemDueTime(itemTitle: String, tagName: String, dueDate: String) {
+        composeTestRule.onNode( hasTestTag("todoItemTime") and hasText(dueDate) and
+                hasAnySibling(hasTestTag("todoItemTitle") and hasText(itemTitle)) and
+                hasAnySibling(hasTestTag("todoItemTag") and hasText(tagName)), useUnmergedTree = true)
+            .assertIsDisplayed()
+    }
+
+    fun assertItemDateDay(itemTitle: String, dayOfMonth: String, dayOfWeek: String, day: String) {
+
+        composeTestRule.onNode( hasTestTag("dateBadgeMonth") and hasText(dayOfMonth) and hasAnyAncestor(
+            hasAnyDescendant(hasTestTag("todoItemTitle") and hasText(itemTitle))
+        ) and hasAnySibling(hasTestTag("dateBadgeDayOfWeek") and hasText(dayOfWeek)) and hasAnySibling(hasTestTag("dateBadgeDay") and hasText(day)), useUnmergedTree = true).assertIsDisplayed()
+
+        composeTestRule.onNode( hasTestTag("dateBadgeDayOfWeek") and hasText(dayOfWeek) and hasAnyAncestor(
+            hasAnyDescendant(hasTestTag("todoItemTitle") and hasText(itemTitle))
+        ) and hasAnySibling(hasTestTag("dateBadgeMonth") and hasText(dayOfMonth)) and hasAnySibling(hasTestTag("dateBadgeDay") and hasText(day)), useUnmergedTree = true).assertIsDisplayed()
+
+        composeTestRule.onNode( hasTestTag("dateBadgeDay") and hasText(day) and hasAnyAncestor(
+            hasAnyDescendant(hasTestTag("todoItemTitle") and hasText(itemTitle))
+        ) and hasAnySibling(hasTestTag("dateBadgeMonth") and hasText(dayOfMonth)) and hasAnySibling(hasTestTag("dateBadgeDayOfWeek") and hasText(dayOfWeek)), useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    fun refresh() {
+        composeTestRule.onNodeWithTag("todoList").performTouchInput { swipeDown() }
+        composeTestRule.waitForIdle()
+    }
+
     fun assertItemNotDisplayed(itemTitle: String) {
         composeTestRule.onNode(hasTestTag("todoItemTitle") and hasText(itemTitle), useUnmergedTree = true).assertDoesNotExistWithTimeout(5)
     }
@@ -112,7 +153,7 @@ class ToDoListPage(private val composeTestRule: ComposeTestRule) : BasePage() {
     }
 
     fun assertEmptyState() {
-        composeTestRule.onNodeWithText(getStringFromResource(R.string.noToDosForNow))
+        composeTestRule.onNodeWithText(getStringFromResource(R.string.noToDosForNowNew))
             .assertIsDisplayed()
     }
 
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/mockcanvas/fakes/FakeGetLearningLibraryManager.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/mockcanvas/fakes/FakeGetLearningLibraryManager.kt
new file mode 100644
index 0000000000..0ce49a71b6
--- /dev/null
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/mockcanvas/fakes/FakeGetLearningLibraryManager.kt
@@ -0,0 +1,399 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvas.espresso.mockcanvas.fakes
+
+import com.instructure.canvas.espresso.mockcanvas.MockCanvas
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollectionsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItemsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import java.util.Date
+
+class FakeGetLearningLibraryManager : GetLearningLibraryManager {
+
+    private val learningLibraryCollections = mutableListOf<LearningLibraryCollection>()
+    private val enrolledCollections = mutableListOf<EnrolledLearningLibraryCollection>()
+    private val collectionItems = mutableMapOf<String, MutableList<LearningLibraryCollectionItem>>()
+
+    init {
+        initializeMockData()
+    }
+
+    override suspend fun getLearningLibraryCollectionItems(
+        cursor: String?,
+        limit: Int?,
+        forward: Boolean?,
+        bookmarkedOnly: Boolean?,
+        searchTerm: String?,
+        types: List<CollectionItemType>?,
+        completedOnly: Boolean?,
+        sortBy: CollectionItemSortOption?,
+        forceNetwork: Boolean
+    ): LearningLibraryCollectionItemsResponse {
+        var items = collectionItems.values.flatten()
+
+        if (bookmarkedOnly == true) {
+            items = items.filter { it.isBookmarked }
+        }
+
+        if (!searchTerm.isNullOrBlank()) {
+            items = items.filter {
+                it.canvasCourse?.courseName?.contains(searchTerm, ignoreCase = true) == true
+            }
+        }
+
+        if (!types.isNullOrEmpty()) {
+            items = items.filter { it.itemType in types }
+        }
+
+        if (completedOnly == true) {
+            items = items.filter { it.completionPercentage == 100.0 }
+        }
+
+        return LearningLibraryCollectionItemsResponse(
+            items = items,
+            pageInfo = LearningLibraryPageInfo(
+                nextCursor = null,
+                previousCursor = null,
+                hasNextPage = false,
+                hasPreviousPage = false,
+                totalCount = null,
+                pageCursors = null
+            )
+        )
+    }
+
+    override suspend fun getEnrolledLearningLibraryCollections(
+        itemLimitPerCollection: Int?,
+        forceNetwork: Boolean
+    ): EnrolledLearningLibraryCollectionsResponse {
+        val collections = enrolledCollections.map { collection ->
+            val items = if (itemLimitPerCollection != null) {
+                collection.items.take(itemLimitPerCollection)
+            } else {
+                collection.items
+            }
+
+            collection.copy(items = items)
+        }
+
+        return EnrolledLearningLibraryCollectionsResponse(
+            collections = collections
+        )
+    }
+
+    override suspend fun getEnrolledLearningLibraryCollection(
+        id: String,
+        forceNetwork: Boolean
+    ): EnrolledLearningLibraryCollection {
+        return enrolledCollections.find { it.id == id }
+            ?: throw IllegalArgumentException("Enrolled collection not found: $id")
+    }
+
+    override suspend fun toggleLearningLibraryItemIsBookmarked(itemId: String): Boolean {
+        collectionItems.values.flatten().find { it.id == itemId }?.let { item ->
+            val updatedItem = item.copy(isBookmarked = !item.isBookmarked)
+
+            // Update in collectionItems
+            collectionItems.forEach { (collectionId, items) ->
+                val index = items.indexOfFirst { it.id == itemId }
+                if (index >= 0) {
+                    items[index] = updatedItem
+                }
+            }
+
+            // Update in enrolledCollections
+            enrolledCollections.forEachIndexed { collectionIndex, collection ->
+                val itemIndex = collection.items.indexOfFirst { it.id == itemId }
+                if (itemIndex >= 0) {
+                    val updatedItems = collection.items.toMutableList()
+                    updatedItems[itemIndex] = updatedItem
+                    enrolledCollections[collectionIndex] = collection.copy(items = updatedItems)
+                }
+            }
+
+            return updatedItem.isBookmarked
+        }
+
+        return false
+    }
+
+    override suspend fun enrollLearningLibraryItem(itemId: String): LearningLibraryCollectionItem {
+        val item = collectionItems.values.flatten().find { it.id == itemId }
+            ?: throw IllegalArgumentException("Item not found: $itemId")
+
+        val updatedItem = item.copy(
+            isEnrolledInCanvas = true,
+            completionPercentage = 0.0
+        )
+
+        // Update in collectionItems
+        collectionItems.forEach { (collectionId, items) ->
+            val index = items.indexOfFirst { it.id == itemId }
+            if (index >= 0) {
+                items[index] = updatedItem
+            }
+        }
+
+        // Update in enrolledCollections
+        enrolledCollections.forEachIndexed { collectionIndex, collection ->
+            val itemIndex = collection.items.indexOfFirst { it.id == itemId }
+            if (itemIndex >= 0) {
+                val updatedItems = collection.items.toMutableList()
+                updatedItems[itemIndex] = updatedItem
+                enrolledCollections[collectionIndex] = collection.copy(items = updatedItems)
+            }
+        }
+
+        return updatedItem
+    }
+
+    override suspend fun getLearningLibraryItem(
+        itemId: String,
+        forceNetwork: Boolean
+    ): LearningLibraryCollectionItem {
+        return collectionItems.values.flatten().first { it.id == itemId }
+    }
+
+    override suspend fun getLearningLibraryRecommendations(forceNetwork: Boolean): List<LearningLibraryRecommendation> {
+        return emptyList()
+    }
+
+    private fun initializeMockData() {
+        val now = Date()
+        val courses = MockCanvas.data?.courses?.values?.toList() ?: emptyList()
+
+        // Create Learning Library Collections
+        val collection1 = LearningLibraryCollection(
+            id = "collection1",
+            name = "Introduction to Programming",
+            publicName = "Programming Basics",
+            description = "Learn the fundamentals of programming",
+            rootAccountUuid = "root-account-1",
+            accountId = "account-1",
+            deletedAt = null,
+            createdAt = now,
+            updatedAt = now
+        )
+
+        val collection2 = LearningLibraryCollection(
+            id = "collection2",
+            name = "Advanced Web Development",
+            publicName = "Web Development",
+            description = "Master modern web technologies",
+            rootAccountUuid = "root-account-1",
+            accountId = "account-1",
+            deletedAt = null,
+            createdAt = now,
+            updatedAt = now
+        )
+
+        val collection3 = LearningLibraryCollection(
+            id = "collection3",
+            name = "Data Science Fundamentals",
+            publicName = "Data Science",
+            description = "Introduction to data science and analytics",
+            rootAccountUuid = "root-account-1",
+            accountId = "account-1",
+            deletedAt = null,
+            createdAt = now,
+            updatedAt = now
+        )
+
+        learningLibraryCollections.addAll(listOf(collection1, collection2, collection3))
+
+        // Create Collection Items
+        val items1 = mutableListOf<LearningLibraryCollectionItem>()
+        if (courses.isNotEmpty()) {
+            items1.add(
+                LearningLibraryCollectionItem(
+                    id = "item1",
+                    libraryId = "collection1",
+                    itemType = CollectionItemType.COURSE,
+                    displayOrder = 1.0,
+                    canvasCourse = CanvasCourseInfo(
+                        courseId = courses[0].id.toString(),
+                        canvasUrl = "https://mock-data.instructure.com/courses/${courses[0].id}",
+                        courseName = "Python Basics",
+                        courseImageUrl = "https://example.com/python.png",
+                        moduleCount = 5.0,
+                        moduleItemCount = 25.0,
+                        estimatedDurationMinutes = 300.0
+                    ),
+                    programId = null,
+                    programCourseId = null,
+                    createdAt = now,
+                    updatedAt = now,
+                    isBookmarked = false,
+                    completionPercentage = 0.0,
+                    isEnrolledInCanvas = true,
+                    moduleInfo = null,
+                    canvasEnrollmentId = null
+                )
+            )
+
+            items1.add(
+                LearningLibraryCollectionItem(
+                    id = "item2",
+                    libraryId = "collection1",
+                    itemType = CollectionItemType.PAGE,
+                    displayOrder = 2.0,
+                    canvasCourse = null,
+                    programId = null,
+                    programCourseId = null,
+                    createdAt = now,
+                    updatedAt = now,
+                    isBookmarked = true,
+                    completionPercentage = null,
+                    isEnrolledInCanvas = null,
+                    moduleInfo = null,
+                    canvasEnrollmentId = null
+                )
+            )
+        }
+
+        val items2 = mutableListOf<LearningLibraryCollectionItem>()
+        if (courses.size > 1) {
+            items2.add(
+                LearningLibraryCollectionItem(
+                    id = "item3",
+                    libraryId = "collection2",
+                    itemType = CollectionItemType.COURSE,
+                    displayOrder = 1.0,
+                    canvasCourse = CanvasCourseInfo(
+                        courseId = courses[1].id.toString(),
+                        canvasUrl = "https://mock-data.instructure.com/courses/${courses[1].id}",
+                        courseName = "React Advanced",
+                        courseImageUrl = "https://example.com/react.png",
+                        moduleCount = 8.0,
+                        moduleItemCount = 40.0,
+                        estimatedDurationMinutes = 480.0
+                    ),
+                    programId = null,
+                    programCourseId = null,
+                    createdAt = now,
+                    updatedAt = now,
+                    isBookmarked = true,
+                    completionPercentage = 50.0,
+                    isEnrolledInCanvas = true,
+                    moduleInfo = null,
+                    canvasEnrollmentId = null
+                )
+            )
+        }
+
+        val items3 = mutableListOf<LearningLibraryCollectionItem>()
+        if (courses.size > 2) {
+            items3.add(
+                LearningLibraryCollectionItem(
+                    id = "item4",
+                    libraryId = "collection3",
+                    itemType = CollectionItemType.COURSE,
+                    displayOrder = 1.0,
+                    canvasCourse = CanvasCourseInfo(
+                        courseId = courses[2].id.toString(),
+                        canvasUrl = "https://mock-data.instructure.com/courses/${courses[2].id}",
+                        courseName = "Machine Learning",
+                        courseImageUrl = "https://example.com/ml.png",
+                        moduleCount = 10.0,
+                        moduleItemCount = 50.0,
+                        estimatedDurationMinutes = 600.0
+                    ),
+                    programId = null,
+                    programCourseId = null,
+                    createdAt = now,
+                    updatedAt = now,
+                    isBookmarked = false,
+                    completionPercentage = 100.0,
+                    isEnrolledInCanvas = true,
+                    moduleInfo = null,
+                    canvasEnrollmentId = null
+                )
+            )
+
+            items3.add(
+                LearningLibraryCollectionItem(
+                    id = "item5",
+                    libraryId = "collection3",
+                    itemType = CollectionItemType.EXTERNAL_URL,
+                    displayOrder = 2.0,
+                    canvasCourse = null,
+                    programId = null,
+                    programCourseId = null,
+                    createdAt = now,
+                    updatedAt = now,
+                    isBookmarked = false,
+                    completionPercentage = null,
+                    isEnrolledInCanvas = null,
+                    moduleInfo = null,
+                    canvasEnrollmentId = null
+                )
+            )
+        }
+
+        collectionItems["collection1"] = items1
+        collectionItems["collection2"] = items2
+        collectionItems["collection3"] = items3
+
+        // Create Enrolled Collections
+        enrolledCollections.add(
+            EnrolledLearningLibraryCollection(
+                id = collection1.id,
+                name = collection1.name,
+                publicName = collection1.publicName,
+                description = collection1.description,
+                createdAt = collection1.createdAt,
+                updatedAt = collection1.updatedAt,
+                items = items1,
+                totalItemCount = items1.size
+            )
+        )
+
+        enrolledCollections.add(
+            EnrolledLearningLibraryCollection(
+                id = collection2.id,
+                name = collection2.name,
+                publicName = collection2.publicName,
+                description = collection2.description,
+                createdAt = collection2.createdAt,
+                updatedAt = collection2.updatedAt,
+                items = items2,
+                totalItemCount = items2.size
+            )
+        )
+
+        enrolledCollections.add(
+            EnrolledLearningLibraryCollection(
+                id = collection3.id,
+                name = collection3.name,
+                publicName = collection3.publicName,
+                description = collection3.description,
+                createdAt = collection3.createdAt,
+                updatedAt = collection3.updatedAt,
+                items = items3,
+                totalItemCount = items3.size
+            )
+        )
+    }
+}
diff --git a/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/mockcanvas/fakes/FakeMyContentManager.kt b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/mockcanvas/fakes/FakeMyContentManager.kt
new file mode 100644
index 0000000000..13fa273cdb
--- /dev/null
+++ b/automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/mockcanvas/fakes/FakeMyContentManager.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvas.espresso.mockcanvas.fakes
+
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemStatus
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemType
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemsResponse
+
+class FakeMyContentManager : MyContentManager {
+    override suspend fun getLearnItems(
+        cursor: String?,
+        limit: Int?,
+        forward: Boolean?,
+        searchTerm: String?,
+        itemTypes: List<LearnItemType>?,
+        status: List<LearnItemStatus>?,
+        sortBy: CollectionItemSortOption?,
+        forceNetwork: Boolean,
+    ): LearnItemsResponse {
+        return LearnItemsResponse(
+            items = emptyList(),
+            pageInfo = LearningLibraryPageInfo(
+                nextCursor = null,
+                previousCursor = null,
+                hasNextPage = false,
+                hasPreviousPage = false,
+                totalCount = 0,
+                pageCursors = null,
+            ),
+        )
+    }
+}
diff --git a/automation/espresso/src/main/kotlin/com/instructure/espresso/TestingUtils.kt b/automation/espresso/src/main/kotlin/com/instructure/espresso/TestingUtils.kt
index 9d5bd7115d..48322ddb36 100644
--- a/automation/espresso/src/main/kotlin/com/instructure/espresso/TestingUtils.kt
+++ b/automation/espresso/src/main/kotlin/com/instructure/espresso/TestingUtils.kt
@@ -18,6 +18,7 @@ package com.instructure.espresso
 
 import android.os.Build
 import android.view.View
+import android.webkit.WebView
 import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.recyclerview.widget.RecyclerView
@@ -26,8 +27,11 @@ import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.NoMatchingViewException
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
 import androidx.test.espresso.contrib.RecyclerViewActions
 import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.espresso.web.sugar.Web
@@ -37,6 +41,7 @@ import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkQuery
 import com.instructure.espresso.page.plus
+import com.instructure.loginapi.login.R
 import com.instructure.pandautils.binding.BindableViewHolder
 import org.apache.commons.lang3.StringUtils
 import org.hamcrest.Matcher
@@ -360,3 +365,26 @@ fun getVideoPosition(viewId: Int): String {
         }
     return positionText
 }
+
+/**
+ * Notifies React components in a WebView of an input change by dispatching 'input' and 'change' events.
+ * E.g. Using this on New Login UI page.
+ */
+fun notifyReactOfInputChange(cssSelector: String) {
+    onView(withId(R.id.webView)).perform(object : ViewAction {
+        override fun getConstraints() = isDisplayed()
+        override fun getDescription() = "Notify React of input change"
+        override fun perform(uiController: UiController, view: View) {
+            (view as WebView).evaluateJavascript("""
+                    (function() {
+                        var el = document.querySelector('$cssSelector');
+                        if (!el) return;
+                        if (el._valueTracker) { el._valueTracker.setValue(''); }
+                        el.dispatchEvent(new Event('input', { bubbles: true }));
+                        el.dispatchEvent(new Event('change', { bubbles: true }));
+                    })();
+                """.trimIndent(), null)
+            uiController.loopMainThreadForAtLeast(300)
+        }
+    })
+}
\ No newline at end of file
diff --git a/libs/annotations/src/main/java/com/instructure/annotations/AnnotationConverter.kt b/libs/annotations/src/main/java/com/instructure/annotations/AnnotationConverter.kt
index 860c34f52f..2ad5d32608 100644
--- a/libs/annotations/src/main/java/com/instructure/annotations/AnnotationConverter.kt
+++ b/libs/annotations/src/main/java/com/instructure/annotations/AnnotationConverter.kt
@@ -314,7 +314,7 @@ fun coordsToListOfRectfs(coords: List<List<List<Float>>>?) : MutableList<RectF>
     return rectList
 }
 
-fun convertListOfRectsToListOfListOfListOfFloats(rects: MutableList<RectF>?): ArrayList<ArrayList<ArrayList<Float>>>? {
+fun convertListOfRectsToListOfListOfListOfFloats(rects: List<RectF>?): ArrayList<ArrayList<ArrayList<Float>>>? {
     if (rects == null || rects.isEmpty()) {
         return null
     }
diff --git a/libs/annotations/src/main/java/com/instructure/annotations/CanvaDocsExtensions.kt b/libs/annotations/src/main/java/com/instructure/annotations/CanvaDocsExtensions.kt
index 4c86156256..bd8a9332e4 100644
--- a/libs/annotations/src/main/java/com/instructure/annotations/CanvaDocsExtensions.kt
+++ b/libs/annotations/src/main/java/com/instructure/annotations/CanvaDocsExtensions.kt
@@ -80,23 +80,6 @@ fun Annotation.setIsNotFound(isNotFound: Boolean) {
 
 fun Annotation.getContext() = (this as? PSCanvaInterface)?.context ?: ""
 
-/**
- * Finds an annotation based on it's id
- */
-fun PdfDocument.findAnnotationById(id: String, pageIndex: Int): Annotation? {
-    val annotations = this.annotationProvider.getAnnotations(pageIndex)
-    return annotations.find { it.getId() == id }
-}
-
-fun PdfDocument.removeAnnotation(id: String, pageIndex: Int) {
-    val annotationToRemove = findAnnotationById(id, pageIndex) ?: return
-    annotationProvider.removeAnnotationFromPage(annotationToRemove)
-}
-
-fun PdfDocument.addAnnotation(annotation: Annotation) {
-    annotationProvider.addAnnotationToPage(annotation)
-}
-
 
 // Delegate
 interface PSCanvaInterface {
diff --git a/libs/annotations/src/main/java/com/instructure/annotations/CanvaPdfAnnotation.kt b/libs/annotations/src/main/java/com/instructure/annotations/CanvaPdfAnnotation.kt
index de9eb26c59..ed88d05cd5 100644
--- a/libs/annotations/src/main/java/com/instructure/annotations/CanvaPdfAnnotation.kt
+++ b/libs/annotations/src/main/java/com/instructure/annotations/CanvaPdfAnnotation.kt
@@ -13,10 +13,18 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
+@file:Suppress("CONFLICTING_INHERITED_JVM_DECLARATIONS")
+
 package com.instructure.annotations
 
 import android.graphics.RectF
-import com.pspdfkit.annotations.*
+import com.pspdfkit.annotations.FreeTextAnnotation
+import com.pspdfkit.annotations.HighlightAnnotation
+import com.pspdfkit.annotations.InkAnnotation
+import com.pspdfkit.annotations.NoteAnnotation
+import com.pspdfkit.annotations.SquareAnnotation
+import com.pspdfkit.annotations.StampAnnotation
+import com.pspdfkit.annotations.StrikeOutAnnotation
 import com.pspdfkit.annotations.stamps.StampType
 
 class CanvaInkAnnotation(info: CanvaPdfAnnotation) : InkAnnotation(info.page), PSCanvaInterface by info
@@ -31,5 +39,5 @@ class CanvaFreeTextAnnotation(info: CanvaPdfAnnotation, contents: String) : Free
 
 class CanvaNoteAnnotation(info: CanvaPdfAnnotation, iconName: String, contents: String ) : NoteAnnotation(info.page, info.rect ?: RectF(), contents, iconName), PSCanvaInterface by info
 
-class CanvaStampAnnotation(info: CanvaPdfAnnotation) : StampAnnotation(info.page, info.rect ?: RectF(), StampType.APPROVED), PSCanvaInterface by info
+class CanvaStampAnnotation(info: CanvaPdfAnnotation) : StampAnnotation(info.page, info.rect ?: RectF(), StampType("#CustomAp")), PSCanvaInterface by info
 
diff --git a/libs/annotations/src/main/java/com/instructure/annotations/DocumentListenerSimpleDelegate.kt b/libs/annotations/src/main/java/com/instructure/annotations/DocumentListenerSimpleDelegate.kt
deleted file mode 100644
index 086b3a779c..0000000000
--- a/libs/annotations/src/main/java/com/instructure/annotations/DocumentListenerSimpleDelegate.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.annotations
-
-import android.graphics.PointF
-import android.view.MotionEvent
-import com.pspdfkit.annotations.Annotation
-import com.pspdfkit.document.DocumentSaveOptions
-import com.pspdfkit.document.PdfDocument
-import com.pspdfkit.listeners.DocumentListener
-
-/**
- * Class delegate that gives us default implementations for everything, since
- * we're only using a few of these.
- *
- * Override specific methods in delegate
- */
-class DocumentListenerSimpleDelegate : DocumentListener {
-    override fun onPageUpdated(p0: PdfDocument, p1: Int) = Unit
-    override fun onDocumentSaveCancelled(p0: PdfDocument?) = Unit
-    override fun onPageChanged(p0: PdfDocument, p1: Int) = Unit
-    override fun onDocumentSaved(p0: PdfDocument) = Unit
-    override fun onDocumentZoomed(p0: PdfDocument, p1: Int, p2: Float) = Unit
-    override fun onPageClick(p0: PdfDocument, p1: Int, p2: MotionEvent?, p3: PointF?, p4: Annotation?) = false
-    override fun onDocumentSave(p0: PdfDocument, p1: DocumentSaveOptions) = true
-    override fun onDocumentLoaded(p0: PdfDocument) = Unit
-    override fun onDocumentLoadFailed(p0: Throwable) = Unit
-    override fun onDocumentClick(): Boolean = false
-    override fun onDocumentSaveFailed(p0: PdfDocument, p1: Throwable) = Unit
-}
\ No newline at end of file
diff --git a/libs/annotations/src/main/java/com/instructure/annotations/PdfSubmissionView.kt b/libs/annotations/src/main/java/com/instructure/annotations/PdfSubmissionView.kt
index 48880b322b..9bab1e51ed 100644
--- a/libs/annotations/src/main/java/com/instructure/annotations/PdfSubmissionView.kt
+++ b/libs/annotations/src/main/java/com/instructure/annotations/PdfSubmissionView.kt
@@ -29,8 +29,12 @@ import android.widget.ImageView
 import androidx.annotation.ColorRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.lifecycleScope
 import com.instructure.annotations.AnnotationDialogs.AnnotationCommentDialog
 import com.instructure.annotations.AnnotationDialogs.AnnotationErrorDialog
 import com.instructure.annotations.AnnotationDialogs.FreeTextDialog
@@ -46,7 +50,7 @@ import com.instructure.canvasapi2.utils.isValid
 import com.instructure.canvasapi2.utils.weave.StatusCallbackError
 import com.instructure.canvasapi2.utils.weave.awaitApi
 import com.instructure.canvasapi2.utils.weave.catch
-import com.instructure.canvasapi2.utils.weave.tryWeave
+import com.instructure.canvasapi2.utils.weave.tryLaunch
 import com.instructure.pandautils.utils.filecache.FileCache
 import com.instructure.pandautils.utils.filecache.awaitFileDownload
 import com.instructure.pandautils.utils.onClick
@@ -74,6 +78,9 @@ import com.pspdfkit.configuration.page.PageScrollDirection
 import com.pspdfkit.document.PdfDocument
 import com.pspdfkit.listeners.DocumentListener
 import com.pspdfkit.ui.PdfFragment
+import com.pspdfkit.ui.annotations.OnAnnotationCreationModeChangeListener
+import com.pspdfkit.ui.annotations.OnAnnotationEditingModeChangeListener
+import com.pspdfkit.ui.annotations.OnAnnotationSelectedListener
 import com.pspdfkit.ui.inspector.PropertyInspectorCoordinatorLayout
 import com.pspdfkit.ui.inspector.annotation.AnnotationCreationInspectorController
 import com.pspdfkit.ui.inspector.annotation.AnnotationEditingInspectorController
@@ -85,30 +92,43 @@ import com.pspdfkit.ui.special_mode.controller.AnnotationCreationController
 import com.pspdfkit.ui.special_mode.controller.AnnotationEditingController
 import com.pspdfkit.ui.special_mode.controller.AnnotationSelectionController
 import com.pspdfkit.ui.special_mode.controller.AnnotationTool
-import com.pspdfkit.ui.special_mode.manager.AnnotationManager
 import com.pspdfkit.ui.toolbar.AnnotationCreationToolbar
 import com.pspdfkit.ui.toolbar.AnnotationEditingToolbar
 import com.pspdfkit.ui.toolbar.ContextualToolbar
 import com.pspdfkit.ui.toolbar.ContextualToolbarMenuItem
 import com.pspdfkit.ui.toolbar.ToolbarCoordinatorLayout
 import com.pspdfkit.ui.toolbar.grouping.MenuItemGroupingRule
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import okhttp3.Response
 import java.io.File
 import java.util.EnumSet
 
 @SuppressLint("ViewConstructor")
-abstract class PdfSubmissionView(context: Context, private val studentAnnotationView: Boolean = false, private val courseId: Long) : FrameLayout(context), AnnotationManager.OnAnnotationCreationModeChangeListener, AnnotationManager.OnAnnotationEditingModeChangeListener {
+abstract class PdfSubmissionView(context: Context, private val studentAnnotationView: Boolean = false, private val courseId: Long) :
+    FrameLayout(context), OnAnnotationCreationModeChangeListener, OnAnnotationEditingModeChangeListener {
 
     protected lateinit var docSession: DocSession
     protected lateinit var apiValues: ApiValues
     protected val commentRepliesHashMap: HashMap<String, ArrayList<CanvaDocAnnotation>> = HashMap()
     protected var pdfFragment: PdfFragment? = null
     protected var noteHinter: AnnotationNoteHinter? = null
-    protected val supportFragmentManager: FragmentManager = (context as AppCompatActivity).supportFragmentManager
-
-    private val annotationCreationList = mutableListOf(AnnotationTool.INK, AnnotationTool.HIGHLIGHT, AnnotationTool.STRIKEOUT, AnnotationTool.SQUARE, AnnotationTool.STAMP, AnnotationTool.FREETEXT, AnnotationTool.ERASER, AnnotationTool.NOTE)
+    private val activity = context as AppCompatActivity
+    protected val supportFragmentManager: FragmentManager = activity.supportFragmentManager
+    protected val viewScope = activity.lifecycleScope
+
+    private val annotationCreationList = mutableListOf(
+        AnnotationTool.INK,
+        AnnotationTool.HIGHLIGHT,
+        AnnotationTool.STRIKEOUT,
+        AnnotationTool.SQUARE,
+        AnnotationTool.STAMP,
+        AnnotationTool.FREETEXT,
+        AnnotationTool.ERASER,
+        AnnotationTool.NOTE
+    )
     private val annotationEditList = mutableListOf(
         AnnotationType.INK,
         AnnotationType.HIGHLIGHT,
@@ -120,14 +140,16 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
     )
 
     private val pdfConfiguration: PdfConfiguration = PdfConfiguration.Builder()
-            .scrollDirection(PageScrollDirection.VERTICAL)
-            .enabledAnnotationTools(annotationCreationList)
-            .editableAnnotationTypes(annotationEditList)
-            .setAnnotationInspectorEnabled(true)
-            .layoutMode(PageLayoutMode.SINGLE)
-            .textSelectionEnabled(false)
-            .copyPastEnabled(false)
-            .build()
+        .scrollDirection(PageScrollDirection.VERTICAL)
+        .enabledAnnotationTools(annotationCreationList)
+        .editableAnnotationTypes(annotationEditList)
+        .setAnnotationInspectorEnabled(true)
+        .layoutMode(PageLayoutMode.SINGLE)
+        .textSelectionEnabled(false)
+        .copyPastEnabled(false)
+        .contentEditingEnabled(false)
+        .annotationPopupToolbarEnabled(false)
+        .build()
 
     private val annotationCreationToolbar = AnnotationCreationToolbar(context)
     private val annotationEditingToolbar = AnnotationEditingToolbar(context)
@@ -140,10 +162,12 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
     private var pdfContentJob: Job? = null
     private var annotationsJob: Job? = null
     private var sendCommentJob: Job? = null
+    private var appearanceGeneratorsJob: Job? = null
     private var currentAnnotationModeTool: AnnotationTool? = null
     private var currentAnnotationModeType: AnnotationType? = null
     private var isUpdatingWithNoNetwork = false
     private var stampRaceFlag = true
+    private var appearanceGeneratorsLoaded = false
 
     @get:ColorRes
     abstract val progressColor: Int
@@ -159,7 +183,13 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
     abstract fun disableViewPager()
     abstract fun enableViewPager()
     abstract fun setIsCurrentlyAnnotating(boolean: Boolean)
-    abstract fun showAnnotationComments(commentList: ArrayList<CanvaDocAnnotation>, headAnnotationId: String, docSession: DocSession, apiValues: ApiValues)
+    abstract fun showAnnotationComments(
+        commentList: ArrayList<CanvaDocAnnotation>,
+        headAnnotationId: String,
+        docSession: DocSession,
+        apiValues: ApiValues
+    )
+
     abstract fun showFileError()
 
     open fun logOnAnnotationSelectedAnalytics() {}
@@ -180,6 +210,7 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         annotationsJob?.cancel()
         pdfContentJob?.cancel()
         fileJob?.cancel()
+        appearanceGeneratorsJob?.cancel()
     }
 
     protected fun unregisterPdfFragmentListeners() {
@@ -197,13 +228,22 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         annotationEditingInspectorController = DefaultAnnotationEditingInspectorController(context, inspectorCoordinatorLayout)
         annotationCreationInspectorController = DefaultAnnotationCreationInspectorController(context, inspectorCoordinatorLayout)
 
-        annotationToolbarLayout.setOnContextualToolbarLifecycleListener(object : ToolbarCoordinatorLayout.OnContextualToolbarLifecycleListener {
+        // Consume status bar insets at the layout level to prevent PSPDFKit from applying them
+        ViewCompat.setOnApplyWindowInsetsListener(annotationToolbarLayout) { _, insets ->
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(WindowInsetsCompat.Type.statusBars(), Insets.NONE)
+                .build()
+        }
+
+        annotationToolbarLayout.setOnContextualToolbarLifecycleListener(object :
+            ToolbarCoordinatorLayout.OnContextualToolbarLifecycleListener {
             override fun onDisplayContextualToolbar(p0: ContextualToolbar<*>) {}
             override fun onRemoveContextualToolbar(p0: ContextualToolbar<*>) {}
 
             override fun onPrepareContextualToolbar(toolbar: ContextualToolbar<*>) {
                 toolbar.layoutParams = ToolbarCoordinatorLayout.LayoutParams(
-                        ToolbarCoordinatorLayout.LayoutParams.Position.TOP, EnumSet.of(ToolbarCoordinatorLayout.LayoutParams.Position.TOP)
+                    ToolbarCoordinatorLayout.LayoutParams.Position.TOP,
+                    EnumSet.of(ToolbarCoordinatorLayout.LayoutParams.Position.TOP)
                 )
 
                 if (toolbar is AnnotationCreationToolbar) {
@@ -222,10 +262,13 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
 
         annotationEditingToolbar.setOnMenuItemClickListener { _, contextualToolbarMenuItem ->
             if (contextualToolbarMenuItem.title == context.getString(com.pspdfkit.R.string.pspdf__edit) &&
-                    currentAnnotationModeType == AnnotationType.FREETEXT) {
+                currentAnnotationModeType == AnnotationType.FREETEXT
+            ) {
 
-                val dialog = FreeTextDialog.getInstance(supportFragmentManager, true, pdfFragment?.selectedAnnotations?.get(0)?.contents
-                        ?: "", freeTextDialogCallback)
+                val dialog = FreeTextDialog.getInstance(
+                    supportFragmentManager, true, pdfFragment?.selectedAnnotations?.get(0)?.contents
+                        ?: "", freeTextDialogCallback
+                )
                 dialog.show(supportFragmentManager, FreeTextDialog::class.java.simpleName)
 
                 return@setOnMenuItemClickListener true
@@ -235,11 +278,13 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
                 val annotation = pdfFragment?.selectedAnnotations?.get(0)
                 // Remove the annotation
                 if (annotation != null) {
-                    pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
-                    pdfFragment?.notifyAnnotationHasChanged(annotation)
-                    pdfFragment?.clearSelectedAnnotations()
-                    pdfFragment?.exitCurrentlyActiveMode()
-                    pdfFragment?.enterAnnotationCreationMode()
+                    viewScope.launch {
+                        pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
+                        pdfFragment?.notifyAnnotationHasChanged(annotation)
+                        pdfFragment?.clearSelectedAnnotations()
+                        pdfFragment?.exitCurrentlyActiveMode()
+                        pdfFragment?.enterAnnotationCreationMode()
+                    }
                     return@setOnMenuItemClickListener true
                 }
             }
@@ -273,21 +318,21 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         toolbar.setOnMenuItemClickListener(
             ContextualToolbar.OnMenuItemClickListener { contextualToolbar, menuItem ->
                 return@OnMenuItemClickListener (
-                    if (menuItem.id == R.id.grab_annotation) {
-                        if (!menuItem.isSelected) {
-                            contextualToolbar.menuItems.forEach { it.isSelected = false }
-                            pdfFragment?.exitCurrentlyActiveMode()
-                            pdfFragment?.enterAnnotationCreationMode(AnnotationTool.NONE)
-                            menuItem.isSelected = true
-                        }
-                        true
-                    } else {
-                        if (menuItem.isSelected) {
-                            val grab = contextualToolbar.menuItems.find { it.id == R.id.grab_annotation }
-                            Handler(Looper.getMainLooper()).postDelayed ({ grab?.isSelected = true }, 50)
-                        }
-                        false
-                    })
+                        if (menuItem.id == R.id.grab_annotation) {
+                            if (!menuItem.isSelected) {
+                                contextualToolbar.menuItems.forEach { it.isSelected = false }
+                                pdfFragment?.exitCurrentlyActiveMode()
+                                pdfFragment?.enterAnnotationCreationMode(AnnotationTool.NONE)
+                                menuItem.isSelected = true
+                            }
+                            true
+                        } else {
+                            if (menuItem.isSelected) {
+                                val grab = contextualToolbar.menuItems.find { it.id == R.id.grab_annotation }
+                                Handler(Looper.getMainLooper()).postDelayed({ grab?.isSelected = true }, 50)
+                            }
+                            false
+                        })
             }
         )
     }
@@ -324,13 +369,17 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
             // If the contents of the current annotation are empty we want to prompt them to add a comment
             if (commentRepliesHashMap[currentAnnotation.annotationId] == null || commentRepliesHashMap[currentAnnotation.annotationId]?.isEmpty() == true) {
                 // No comments for this annotation, show a dialog for the user to add some if they want
-                AnnotationCommentDialog.getInstance(supportFragmentManager, "", context.getString(R.string.addAnnotationComment)) { _, text ->
+                AnnotationCommentDialog.getInstance(
+                    supportFragmentManager,
+                    "",
+                    context.getString(R.string.addAnnotationComment)
+                ) { _, text ->
                     setIsCurrentlyAnnotating(true) //don't want the sliding panel getting in the way
                     // Create new comment reply for this annotation.
                     if (text.isValid()) {
                         createCommentAnnotation(currentAnnotation.annotationId, currentAnnotation.page, text)
                         // Add contents to the current annotation so we can add an indicator
-                        if(currentAnnotation.annotationType != CanvaDocAnnotation.AnnotationType.TEXT && currentAnnotation.annotationType != CanvaDocAnnotation.AnnotationType.FREE_TEXT) {
+                        if (currentAnnotation.annotationType != CanvaDocAnnotation.AnnotationType.TEXT && currentAnnotation.annotationType != CanvaDocAnnotation.AnnotationType.FREE_TEXT) {
                             currentPdfAnnotation.contents = "comment"
                             noteHinter?.notifyDrawablesChanged()
                             pdfFragment?.notifyAnnotationHasChanged(currentPdfAnnotation)
@@ -367,7 +416,7 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
     }
 
     protected fun handlePdfContent(url: String) {
-        pdfContentJob = tryWeave {
+        pdfContentJob = viewScope.tryLaunch {
             if (url.contains("canvadoc")) {
                 val redirectUrl = getCanvaDocsRedirect(url, domain = ApiPrefs.overrideDomains[courseId])
                 //extract the domain for API use
@@ -404,10 +453,10 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         }
     }
 
-    private val documentListener = object : DocumentListener by DocumentListenerSimpleDelegate() {
+    private val documentListener = object : DocumentListener {
         override fun onDocumentLoaded(pdfDocument: PdfDocument) {
             setupPdfAnnotationDefaults()
-            loadCustomAppearanceGenerators()
+            loadCustomAppearanceGeneratorsAsync()
 
             docSession.rotations?.let { rotations ->
                 pdfFragment?.document?.let {
@@ -422,14 +471,9 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
     }
 
     private fun loadAnnotations() {
-        annotationsJob = tryWeave {
+        annotationsJob = viewScope.tryLaunch {
             // Snag them annotations with the session id
             val annotations = awaitApi { CanvaDocsManager.getAnnotations(apiValues.sessionId, apiValues.canvaDocsDomain, it) }
-            // There is a freeze in the PdfSubmissionView, where the root cause is unknown.
-            // The main issue is that the pdfFragment?.document?.annotationProvider?.addAnnotationToPage(annotation) completely freezes the thread.
-            // I suspect something under the hood is still loading in the PSPDFKit, but there was no way to detect it.
-            // Adding a delay to wait for this loading significantly reduces the probability of this freezing.
-            delay(200)
 
             // Grab all the annotations and sort them by type (descending).
             // This will result in all of the comments being iterated over first as the COMMENT_REPLY type is last in the AnnotationType enum.
@@ -455,8 +499,9 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
                                 }
                             }
 
-                            if(commentRepliesHashMap.containsKey(annotation.name)
-                                && (item.annotationType != CanvaDocAnnotation.AnnotationType.TEXT && item.annotationType != CanvaDocAnnotation.AnnotationType.FREE_TEXT)) {
+                            if (commentRepliesHashMap.containsKey(annotation.name)
+                                && (item.annotationType != CanvaDocAnnotation.AnnotationType.TEXT && item.annotationType != CanvaDocAnnotation.AnnotationType.FREE_TEXT)
+                            ) {
                                 annotation.contents = "comment"
                             }
 
@@ -485,14 +530,17 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
 
         rotationMap.forEach { pageRotation ->
             pageRotation.key.toIntOrNull()?.let { pageIndex ->
-                pdfDocument.setRotationOffset(calculateRotationOffset(pdfDocument.getPageRotation(pageIndex), pageRotation.value), pageIndex)
+                pdfDocument.setRotationOffset(
+                    calculateRotationOffset(pdfDocument.getPageRotation(pageIndex), pageRotation.value),
+                    pageIndex
+                )
             }
         }
     }
 
     protected fun load(url: String?, onFinished: (Uri) -> Unit) {
         fileJob?.cancel()
-        fileJob = tryWeave {
+        fileJob = viewScope.tryLaunch {
             progressBar.isIndeterminate = true
             progressBar.setColor(ContextCompat.getColor(this@PdfSubmissionView.context, R.color.textDark))
             val teacherYellow = ContextCompat.getColor(this@PdfSubmissionView.context, progressColor)
@@ -507,10 +555,10 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
             handler.postDelayed(showLoadingRunner, jitterThreshold)
 
             // If we don't have a url we'll display an error
-            val tempFile: File? = FileCache.awaitFileDownload(url!!) {
-                onUI {
+            val tempFile: File? = FileCache.awaitFileDownload(url!!) { progress ->
+                viewScope.launch {
                     progressBar.setColor(teacherYellow)
-                    progressBar.setProgress(it)
+                    progressBar.setProgress(progress)
                 }
             }
 
@@ -538,6 +586,12 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
     }
 
     private val annotationUpdateListener = object : AnnotationProvider.OnAnnotationUpdatedListener {
+        override fun onAnnotationZOrderChanged(
+            pageIndex: Int,
+            oldOrder: List<@JvmSuppressWildcards Annotation>,
+            newOrder: List<@JvmSuppressWildcards Annotation>
+        ) = Unit
+
         override fun onAnnotationCreated(annotation: Annotation) {
             if (!annotation.isAttached || annotationNetworkCheck(annotation)) return
 
@@ -574,8 +628,6 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
                 deleteAnnotation(annotation)
             }
         }
-
-        override fun onAnnotationZOrderChanged(p0: Int, p1: MutableList<Annotation>, p2: MutableList<Annotation>) {}
     }
 
     private fun annotationNetworkCheck(annotation: Annotation): Boolean {
@@ -586,9 +638,11 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
             } else {
                 isUpdatingWithNoNetwork = true
                 if (annotation.isAttached) {
-                    pdfFragment?.clearSelectedAnnotations()
-                    pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
-                    pdfFragment?.notifyAnnotationHasChanged(annotation)
+                    viewScope.launch {
+                        pdfFragment?.clearSelectedAnnotations()
+                        pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
+                        pdfFragment?.notifyAnnotationHasChanged(annotation)
+                    }
                 }
                 showNoInternetDialog()
             }
@@ -596,9 +650,10 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         return false
     }
 
-    private val annotationSelectedListener = object : AnnotationManager.OnAnnotationSelectedListener {
+    private val annotationSelectedListener = object : OnAnnotationSelectedListener {
         override fun onAnnotationSelected(annotation: Annotation, isCreated: Boolean) {
             logOnAnnotationSelectedAnalytics()
+            pdfFragment?.enterAnnotationEditingMode(annotation)
         }
 
         override fun onPrepareAnnotationSelection(p0: AnnotationSelectionController, annotation: Annotation, isCreated: Boolean): Boolean {
@@ -613,7 +668,10 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
                     setIsCurrentlyAnnotating(true)
                 }
 
-                if (annotation.type != AnnotationType.FREETEXT && annotation.name.isValid() && (!studentAnnotationView || hasComments(annotation))) {
+                if (annotation.type != AnnotationType.FREETEXT && annotation.name.isValid() && (!studentAnnotationView || hasComments(
+                        annotation
+                    ))
+                ) {
                     // if the annotation is an existing annotation (has an ID) and is NOT freetext
                     // we want to display the button to view/make comments
                     commentsButton.setVisible()
@@ -621,13 +679,18 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
             }
             return true
         }
+
+        override fun onAnnotationDeselected(annotation: Annotation?, reselected: Boolean) {
+            super.onAnnotationDeselected(annotation, reselected)
+            commentsButton.setGone()
+        }
     }
 
     private fun hasComments(annotation: Annotation): Boolean {
         val currentAnnotation = annotation.convertPDFAnnotationToCanvaDoc(docSession.documentId)
         return currentAnnotation != null
-            && commentRepliesHashMap[currentAnnotation.annotationId] != null
-            && commentRepliesHashMap[currentAnnotation.annotationId]?.isNotEmpty() == true
+                && commentRepliesHashMap[currentAnnotation.annotationId] != null
+                && commentRepliesHashMap[currentAnnotation.annotationId]?.isNotEmpty() == true
     }
 
     //region Annotation Manipulation
@@ -643,10 +706,18 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
             commentsButton.isEnabled = false
         }
 
-        createAnnotationJob = tryWeave {
+        createAnnotationJob = viewScope.tryLaunch {
             val canvaDocAnnotation = annotation.convertPDFAnnotationToCanvaDoc(apiValues.documentId)
             if (canvaDocAnnotation != null) {
-                val newAnnotation = awaitApi { CanvaDocsManager.putAnnotation(apiValues.sessionId, generateAnnotationId(), canvaDocAnnotation, apiValues.canvaDocsDomain, it) }
+                val newAnnotation = awaitApi {
+                    CanvaDocsManager.putAnnotation(
+                        apiValues.sessionId,
+                        generateAnnotationId(),
+                        canvaDocAnnotation,
+                        apiValues.canvaDocsDomain,
+                        it
+                    )
+                }
 
                 // Edit the annotation with the appropriate id
                 annotation.name = newAnnotation.annotationId
@@ -677,12 +748,20 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         if (docSession.annotationMetadata?.canWrite() != true) return
 
         // Don't want to update if we just created a stamp.
-        if(annotation.type == AnnotationType.STAMP && !stampRaceFlag) return
+        if (annotation.type == AnnotationType.STAMP && !stampRaceFlag) return
         // Annotation modified; Update it
-        updateAnnotationJob = tryWeave {
+        updateAnnotationJob = viewScope.tryLaunch {
             val canvaDocAnnotation = annotation.convertPDFAnnotationToCanvaDoc(apiValues.documentId)
             if (canvaDocAnnotation != null && !annotation.name.isNullOrEmpty()) {
-                awaitApi<CanvaDocAnnotation> { CanvaDocsManager.putAnnotation(apiValues.sessionId, annotation.name!!, canvaDocAnnotation, apiValues.canvaDocsDomain, it) }
+                awaitApi<CanvaDocAnnotation> {
+                    CanvaDocsManager.putAnnotation(
+                        apiValues.sessionId,
+                        annotation.name!!,
+                        canvaDocAnnotation,
+                        apiValues.canvaDocsDomain,
+                        it
+                    )
+                }
             }
         } catch {
             if (it is StatusCallbackError) {
@@ -691,9 +770,11 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
                     // Not found; Annotation has been deleted and no longer exists.
                     val dialog = AnnotationErrorDialog.getInstance(supportFragmentManager) {
                         // Delete annotation after user clicks OK on dialog
-                        pdfFragment?.clearSelectedAnnotations()
-                        pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
-                        pdfFragment?.notifyAnnotationHasChanged(annotation)
+                        viewScope.launch {
+                            pdfFragment?.clearSelectedAnnotations()
+                            pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
+                            pdfFragment?.notifyAnnotationHasChanged(annotation)
+                        }
                     }
                     dialog.show(supportFragmentManager, AnnotationErrorDialog::class.java.simpleName)
                 }
@@ -708,7 +789,7 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
 
     private fun deleteAnnotation(annotation: Annotation) {
         // Annotation deleted; DELETE
-        deleteAnnotationJob = tryWeave {
+        deleteAnnotationJob = viewScope.tryLaunch {
             // If it is not found, don't hit the server (it will fail)
             if (!annotation.name.isNullOrEmpty())
                 awaitApi { CanvaDocsManager.deleteAnnotation(apiValues.sessionId, annotation.name!!, apiValues.canvaDocsDomain, it) }
@@ -724,7 +805,7 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         // Annotation modified; Update it
         commentsButton.isEnabled = false
 
-        sendCommentJob = tryWeave {
+        sendCommentJob = viewScope.tryLaunch {
             val newCommentReply = awaitApi {
                 CanvaDocsManager.putAnnotation(apiValues.sessionId, generateAnnotationId(), createCommentReplyAnnotation(comment
                         ?: "", inReplyToId, apiValues.documentId, ApiPrefs.user?.id.toString(), page), apiValues.canvaDocsDomain, it)
@@ -909,87 +990,127 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         val yellow = AssetAppearanceStreamGenerator(yellowStampFile)
 
         // Create picker items with custom subject and custom appearance stream generator set.
-        stamps.add(StampPickerItem.fromTitle(context, blackStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, blackStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(black)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, blueStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, blueStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(blue)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, brownStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, brownStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(brown)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, greenStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, greenStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(green)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, navyStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, navyStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(navy)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, orangeStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, orangeStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(orange)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, pinkStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, pinkStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(pink)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, purpleStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, purpleStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(purple)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, redStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, redStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(red)
-                .build())
+                .build()
+        )
 
-        stamps.add(StampPickerItem.fromTitle(context, yellowStampSubject)
+        stamps.add(
+            StampPickerItem.fromTitle(context, yellowStampSubject)
                 .withSize(18.66f, 26.66f)
                 .withAppearanceStreamGenerator(yellow)
-                .build())
+                .build()
+        )
 
         return stamps
     }
 
-    private fun loadCustomAppearanceGenerators() {
-        // Register custom stamp appearance stream generator as a global appearance stream generator.
-        val customStampAppearanceStreamGenerator = CustomStampAppearanceStreamGenerator()
-        pdfFragment?.document?.annotationProvider?.addAppearanceStreamGenerator(customStampAppearanceStreamGenerator)
+    private fun loadCustomAppearanceGeneratorsAsync() {
+        // Avoid loading multiple times
+        if (appearanceGeneratorsLoaded) return
+        appearanceGeneratorsLoaded = true
+
+        // Load appearance generators asynchronously to prevent ANR
+        // These generators load and parse PDF files from assets, which can cause blocking I/O
+        appearanceGeneratorsJob = viewScope.tryLaunch {
+            // Perform I/O operations on background thread
+            val generators = withContext(Dispatchers.IO) {
+                // Create appearance stream generators with a PDF containing vector logo.
+                // This reads and parses 10 PDF files from assets, which can block the main thread
+                val black = AssetAppearanceStreamGenerator(blackStampFile)
+                val blue = AssetAppearanceStreamGenerator(blueStampFile)
+                val brown = AssetAppearanceStreamGenerator(brownStampFile)
+                val green = AssetAppearanceStreamGenerator(greenStampFile)
+                val navy = AssetAppearanceStreamGenerator(navyStampFile)
+                val orange = AssetAppearanceStreamGenerator(orangeStampFile)
+                val pink = AssetAppearanceStreamGenerator(pinkStampFile)
+                val purple = AssetAppearanceStreamGenerator(purpleStampFile)
+                val red = AssetAppearanceStreamGenerator(redStampFile)
+                val yellow = AssetAppearanceStreamGenerator(yellowStampFile)
+
+                mapOf(
+                    blackStampSubject to black,
+                    blueStampSubject to blue,
+                    brownStampSubject to brown,
+                    greenStampSubject to green,
+                    navyStampSubject to navy,
+                    orangeStampSubject to orange,
+                    pinkStampSubject to pink,
+                    purpleStampSubject to purple,
+                    redStampSubject to red,
+                    yellowStampSubject to yellow
+                )
+            }
 
-        // Create appearance stream generators with a PDF containing vector logo.
-        val black = AssetAppearanceStreamGenerator(blackStampFile)
-        val blue = AssetAppearanceStreamGenerator(blueStampFile)
-        val brown = AssetAppearanceStreamGenerator(brownStampFile)
-        val green = AssetAppearanceStreamGenerator(greenStampFile)
-        val navy = AssetAppearanceStreamGenerator(navyStampFile)
-        val orange = AssetAppearanceStreamGenerator(orangeStampFile)
-        val pink = AssetAppearanceStreamGenerator(pinkStampFile)
-        val purple = AssetAppearanceStreamGenerator(purpleStampFile)
-        val red = AssetAppearanceStreamGenerator(redStampFile)
-        val yellow = AssetAppearanceStreamGenerator(yellowStampFile)
+            // Register on main thread after loading completes
+            val customStampAppearanceStreamGenerator = CustomStampAppearanceStreamGenerator()
+            pdfFragment?.document?.annotationProvider?.addAppearanceStreamGenerator(customStampAppearanceStreamGenerator)
 
-        // Register created appearance stream generator for the custom subject.
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(blackStampSubject, black)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(blueStampSubject, blue)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(brownStampSubject, brown)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(greenStampSubject, green)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(navyStampSubject, navy)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(orangeStampSubject, orange)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(pinkStampSubject, pink)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(purpleStampSubject, purple)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(redStampSubject, red)
-        customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(yellowStampSubject, yellow)
+            // Register created appearance stream generator for the custom subject.
+            generators.forEach { (subject, generator) ->
+                customStampAppearanceStreamGenerator.addAppearanceStreamGenerator(subject, generator)
+            }
+        } catch {
+            appearanceGeneratorsLoaded = false
+        }
     }
     //endregion
 
@@ -1022,7 +1143,7 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
         //check to make sure we have all of our items
 
         // If the user has read/write/manage we want to let them delete (and only delete) non-authored annotations
-        val annotation = pdfFragment?.selectedAnnotations?.get(0)
+        val annotation = pdfFragment?.selectedAnnotations?.firstOrNull()
         if (::docSession.isInitialized && docSession.annotationMetadata?.canManage() == true && annotation?.flags?.contains(AnnotationFlags.LOCKED) == true) {
             // We need to only return a list with the delete menu item
             delete = ContextualToolbarMenuItem.createSingleItem(context, View.generateViewId(),
@@ -1054,10 +1175,12 @@ abstract class PdfSubmissionView(context: Context, private val studentAnnotation
                     ?: return else return
             if ((cancelled && annotation.contents.isNullOrEmpty()) || text.isEmpty()) {
                 // Remove the annotation
-                pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
-                pdfFragment?.notifyAnnotationHasChanged(annotation)
-                pdfFragment?.clearSelectedAnnotations()
-                pdfFragment?.enterAnnotationCreationMode()
+                viewScope.launch {
+                    pdfFragment?.document?.annotationProvider?.removeAnnotationFromPage(annotation)
+                    pdfFragment?.notifyAnnotationHasChanged(annotation)
+                    pdfFragment?.clearSelectedAnnotations()
+                    pdfFragment?.enterAnnotationCreationMode()
+                }
                 return
             }
 
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/EnrollLearningLibraryItem.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/EnrollLearningLibraryItem.graphql
new file mode 100644
index 0000000000..6f44e7b5d2
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/EnrollLearningLibraryItem.graphql
@@ -0,0 +1,31 @@
+mutation EnrollLearningLibraryItem($input: EnrollLearnerInCollectionItemInput!) {
+  enrollLearnerInCollectionItem(input: $input) {
+      wasAlreadyEnrolled
+      item {
+          id
+          libraryId
+          itemType
+          displayOrder
+          canvasCourse {
+              courseId
+              canvasUrl
+              courseName
+              courseImageUrl
+              moduleCount
+              moduleItemCount
+              estimatedDurationMinutes
+          }
+          programId
+          programCourseId
+          createdAt
+          updatedAt
+          isBookmarked
+          completionPercentage
+          isEnrolledInCanvas
+          canvasEnrollmentId
+          canvasModuleId
+          canvasModuleItemId
+          canvasResourceId
+      }
+  }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetEnrolledLearningLibraryCollection.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetEnrolledLearningLibraryCollection.graphql
new file mode 100644
index 0000000000..1932ed54be
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetEnrolledLearningLibraryCollection.graphql
@@ -0,0 +1,37 @@
+query GetEnrolledLearningLibraryCollection($id: String!) {
+    enrolledLearningLibraryCollection(id: $id) {
+        id
+        name
+        publicName
+        description
+        createdAt
+        updatedAt
+        items {
+            id
+            libraryId
+            itemType
+            displayOrder
+            canvasCourse {
+                courseId
+                canvasUrl
+                courseName
+                courseImageUrl
+                moduleCount
+                moduleItemCount
+                estimatedDurationMinutes
+            }
+            programId
+            programCourseId
+            createdAt
+            updatedAt
+            isBookmarked
+            completionPercentage
+            isEnrolledInCanvas
+            canvasEnrollmentId
+            canvasModuleId
+            canvasModuleItemId
+            canvasResourceId
+        }
+        totalItemCount
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetEnrolledLearningLibraryCollections.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetEnrolledLearningLibraryCollections.graphql
new file mode 100644
index 0000000000..4654d5cc1c
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetEnrolledLearningLibraryCollections.graphql
@@ -0,0 +1,45 @@
+query GetEnrolledLearningLibraryCollections(
+  $itemLimitPerCollection: Int
+) {
+  enrolledLearningLibraryCollections(
+    input: {
+      itemLimitPerCollection: $itemLimitPerCollection
+    }
+  ) {
+    collections {
+      id
+      name
+      publicName
+      description
+      createdAt
+      updatedAt
+      totalItemCount
+      items {
+        id
+        libraryId
+        itemType
+        displayOrder
+        canvasCourse {
+          courseId
+          canvasUrl
+          courseName
+          courseImageUrl
+          moduleCount
+          moduleItemCount
+          estimatedDurationMinutes
+        }
+        programId
+        programCourseId
+        createdAt
+        updatedAt
+        isBookmarked
+        completionPercentage
+        isEnrolledInCanvas
+        canvasEnrollmentId
+        canvasModuleId
+        canvasModuleItemId
+        canvasResourceId
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearnItems.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearnItems.graphql
new file mode 100644
index 0000000000..3b7863a6c8
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearnItems.graphql
@@ -0,0 +1,61 @@
+query GetLearnItems(
+    $cursor: String,
+    $limit: Int,
+    $forward: Boolean,
+    $searchTerm: String,
+    $itemTypes: [LearnItemType!],
+    $status: [LearnItemStatus!],
+    $sortBy: LearnItemSortOption
+) {
+    learnItems(input: {
+        cursor: $cursor
+        limit: $limit
+        forward: $forward
+        searchTerm: $searchTerm
+        itemTypes: $itemTypes
+        status: $status
+        sortBy: $sortBy
+    }) {
+        items {
+            ... on ProgramEnrollmentItemGQL {
+                id
+                name
+                position
+                itemType
+                startDate
+                endDate
+                enrolledAt
+                completionPercentage
+                status
+                description
+                variant
+                estimatedDurationMinutes
+                courseCount
+            }
+            ... on CourseEnrollmentItemGQL {
+                id
+                name
+                position
+                itemType
+                startAt
+                endAt
+                enrolledAt
+                completionPercentage
+                requirementCount
+                requirementCompletedCount
+                completedAt
+                grade
+                imageUrl
+                workflowState
+                lastActivityAt
+            }
+        }
+        pageInfo {
+            nextCursor
+            previousCursor
+            hasNextPage
+            hasPreviousPage
+            totalCount
+        }
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryCollectionItem.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryCollectionItem.graphql
new file mode 100644
index 0000000000..fa215c87db
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryCollectionItem.graphql
@@ -0,0 +1,28 @@
+query GetLearningLibraryCollectionItem($itemId: String!) {
+    learningLibraryCollectionItem(collectionItemId: $itemId) {
+        id
+        libraryId
+        itemType
+        displayOrder
+        canvasCourse {
+            courseId
+            canvasUrl
+            courseName
+            courseImageUrl
+            moduleCount
+            moduleItemCount
+            estimatedDurationMinutes
+        }
+        programId
+        programCourseId
+        createdAt
+        updatedAt
+        isBookmarked
+        completionPercentage
+        isEnrolledInCanvas
+        canvasEnrollmentId
+        canvasModuleId
+        canvasModuleItemId
+        canvasResourceId
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryCollectionItems.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryCollectionItems.graphql
new file mode 100644
index 0000000000..9388ce22db
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryCollectionItems.graphql
@@ -0,0 +1,61 @@
+query GetLearningLibraryCollectionItems(
+  $cursor: String
+  $limit: Int = 10
+  $forward: Boolean = true
+  $bookmarkedOnly: Boolean = false
+  $searchTerm: String
+  $types: [CollectionItemType!]
+  $completedOnly: Boolean = false,
+  $sortBy: CollectionItemSortOption,
+) {
+  learningLibraryCollectionItems(
+    input: {
+      cursor: $cursor
+      limit: $limit
+      forward: $forward
+      bookmarkedOnly: $bookmarkedOnly
+      searchTerm: $searchTerm
+      types: $types
+      completedOnly: $completedOnly
+      sortBy: $sortBy
+    }
+  ) {
+    items {
+      id
+      libraryId
+      itemType
+      displayOrder
+      canvasCourse {
+        courseId
+        canvasUrl
+        courseName
+        courseImageUrl
+        moduleCount
+        moduleItemCount
+        estimatedDurationMinutes
+      }
+      programId
+      programCourseId
+      createdAt
+      updatedAt
+      isBookmarked
+      completionPercentage
+      isEnrolledInCanvas
+      canvasEnrollmentId
+      canvasModuleId
+      canvasModuleItemId
+      canvasResourceId
+    }
+    pageInfo {
+      nextCursor
+      previousCursor
+      hasNextPage
+      hasPreviousPage
+      totalCount
+      pageCursors {
+          cursor
+          page
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryRecommendations.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryRecommendations.graphql
new file mode 100644
index 0000000000..84e37b50e4
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/GetLearningLibraryRecommendations.graphql
@@ -0,0 +1,40 @@
+query GetLearningLibraryRecommendations {
+    learningRecommendations {
+    recommendations {
+        courseId
+        primaryReason
+        sourceContext {
+            sourceCourseId
+            sourceCourseName
+            sourceSkillName
+        }
+        popularityCount
+        membership {
+            id
+            libraryId
+            itemType
+            displayOrder
+            canvasCourse {
+                courseId
+                canvasUrl
+                courseName
+                courseImageUrl
+                moduleCount
+                moduleItemCount
+                estimatedDurationMinutes
+            }
+            programId
+            programCourseId
+            createdAt
+            updatedAt
+            isBookmarked
+            completionPercentage
+            isEnrolledInCanvas
+            canvasEnrollmentId
+            canvasModuleId
+            canvasModuleItemId
+            canvasResourceId
+        }
+    }
+  }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/ToggleLearningLibraryItemIsBookmarked.graphql b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/ToggleLearningLibraryItemIsBookmarked.graphql
new file mode 100644
index 0000000000..3259d999c1
--- /dev/null
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/ToggleLearningLibraryItemIsBookmarked.graphql
@@ -0,0 +1,5 @@
+mutation ToggleLearningLibraryItemIsBookmarked($input: ToggleCollectionItemBookmarkInput!) {
+    toggleCollectionItemBookmark(input: $input) {
+        isBookmarked
+  }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/schema.graphqls b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/schema.graphqls
index 78993e7df8..96c0a2f4b7 100644
--- a/libs/canvas-api-2/src/main/graphql/com/instructure/journey/schema.graphqls
+++ b/libs/canvas-api-2/src/main/graphql/com/instructure/journey/schema.graphqls
@@ -2,1508 +2,2421 @@
 directive @oneOf on INPUT_OBJECT
 
 type WidgetParamsGQL {
-  courseIds: [ID!]
-  courseId: ID
-  userId: ID
-  maxLateAssignments: Float
-  maxMissingAssignments: Float
-  minLowScorePercentage: Float
-  delayDaysAfterAction: Float
-  year: Float
-  month: Float
+    courseIds: [ID!]
+    courseId: ID
+    userId: ID
+    maxLateAssignments: Float
+    maxMissingAssignments: Float
+    minLowScorePercentage: Float
+    delayDaysAfterAction: Float
+    year: Float
+    month: Float
 }
 
 type AssetLinkGQL {
-  id: ID!
-  assetId: Float!
-  assetType: String!
-  courseId: ID!
-  contentLibraryCourseId: ID!
-  detached: Boolean!
-  createdAt: DateTime!
+    id: ID!
+    assetId: Float!
+    assetType: String!
+    courseId: ID!
+    contentLibraryCourseId: ID!
+    detached: Boolean!
+    createdAt: DateTime!
 }
 
 # A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date-time format.
 scalar DateTime
 
 type ContentLibraryGQL {
-  id: ID!
-  accountId: ID!
-  courseId: ID!
-  externalLinksModuleId: ID
-  externalToolsModuleId: ID
+    id: ID!
+    accountId: ID!
+    courseId: ID!
+    externalLinksModuleId: ID
+    externalToolsModuleId: ID
+}
+
+type AccountContentLibrariesGQL {
+    accountId: ID!
+    contentLibraries: [ContentLibraryGQL!]!
+}
+
+type CanvasTermGQL {
+    id: ID!
+    name: String!
+    start_at: String
+    end_at: String
+    sis_term_id: String
+}
+
+type CanvasTeacherGQL {
+    id: ID!
+    display_name: String
+    avatar_url: String
+    name: String
+}
+
+type CanvasCourseGQL {
+    id: ID!
+    name: String
+    course_code: String
+    workflow_state: String
+    account_id: ID
+    enrollment_term_id: ID
+    created_at: String
+    start_at: String
+    end_at: String
+    public_syllabus: Boolean
+    storage_quota_mb: Int
+    hide_final_grades: Boolean
+    license: String
+    allow_student_assignment_edits: Boolean
+    allow_wiki_comments: Boolean
+    allow_student_forum_attachments: Boolean
+    open_enrollment: Boolean
+    self_enrollment: Boolean
+    restrict_enrollments_to_course_dates: Boolean
+    term: CanvasTermGQL
+    enrollments: JSON
+    total_students: Int
+    teachers: [CanvasTeacherGQL!]
+    course_image: String
+}
+
+# The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
+scalar JSON
+
+type CanvasPaginationInfoGQL {
+    # Current page number
+    page: Int!
+
+    # Items per page
+    perPage: Int
+
+    # Total number of pages
+    totalPages: Int
+
+    # Total count of items
+    totalCount: Int
+}
+
+type NonContentLibraryCoursesResultGQL {
+    # Array of Canvas course objects matching Canvas REST API structure
+    courses: [CanvasCourseGQL!]!
+    pagination: CanvasPaginationInfoGQL!
 }
 
 type ContentVersionGQL {
-  id: ID!
-  assetId: Float!
-  assetType: AssetTypeEnum!
-  contentExportId: String!
-  title: String!
-  createdAt: DateTime!
-  courseId: ID
+    id: ID!
+    assetId: Float!
+    assetType: AssetTypeEnum!
+    contentExportId: String!
+    title: String!
+    createdAt: DateTime!
+    courseId: ID
 }
 
 enum AssetTypeEnum {
-  assignment
-  discussion_topic
-  page
-  quiz
-  module
-  module_item
-  external_url
-  external_tool
-  file
+    assignment
+    discussion_topic
+    page
+    quiz
+    module
+    module_item
+    external_url
+    external_tool
+    file
 }
 
 type ContentVersionPreviewGQL {
-  url: String
+    url: String
 }
 
 type CrmJwtGQL {
-  # JWT for CRM integration configuration
-  token: String!
+    # JWT for CRM integration configuration
+    token: String!
 }
 
 type WidgetGroupGQL {
-  id: ID!
-  name: String
-  description: String
-  createdAt: DateTime!
-  widgets: [WidgetGQL!]
+    id: ID!
+    name: String
+    description: String
+    createdAt: DateTime!
+    widgets: [WidgetGQL!]
 }
 
 type WidgetGQL {
-  id: ID!
-  type: String!
-  queryParams: WidgetParamsGQL!
-  position: Int
-  prismQueryId: String
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  group: WidgetGroupGQL
+    id: ID!
+    type: String!
+    queryParams: WidgetParamsGQL!
+    position: Int
+    colSpan: Int
+    prismQueryId: String
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    group: WidgetGroupGQL
 }
 
 type WidgetActionGQL {
-  id: ID!
-  action: String!
-  canvasUserUuid: String!
-  courseId: String!
-  actionReason: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
+    id: ID!
+    action: String!
+    canvasUserUuid: String!
+    courseId: String!
+    actionReason: String!
+    createdAt: DateTime!
+    updatedAt: DateTime!
 }
 
-type WidgetDataResultGQL {
-  # The most recent last modified timestamp among the underlying S3 objects used for this widget data
-  lastModifiedDate: DateTime
+type PageCursorGQL {
+    # Page number (1-based)
+    page: Int!
 
-  # The widget data array (unchanged from the legacy getWidgetData)
-  data: [JSON!]!
+    # Cursor to pass when fetching this page (null for page 1)
+    cursor: String
 }
 
-# The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
-scalar JSON
+type CursorPaginationInfoGQL {
+    # Cursor for the next page
+    nextCursor: String
+
+    # Cursor for the previous page
+    previousCursor: String
+
+    # Whether there is a next page
+    hasNextPage: Boolean!
+
+    # Whether there is a previous page
+    hasPreviousPage: Boolean!
+
+    # Total count of items
+    totalCount: Int
+
+    # Cursors for all pages, enabling direct navigation to any page number
+    pageCursors: [PageCursorGQL!]
+}
+
+type WidgetDataResultGQL {
+    # The most recent last modified timestamp among the underlying S3 objects used for this widget data
+    lastModifiedDate: DateTime
+
+    # The widget data array (unchanged from the legacy getWidgetData)
+    data: [JSON!]!
+    pageInfo: CursorPaginationInfoGQL
+}
 
 type WidgetGroupUserDataGQL {
-  id: ID!
-  widgetGroupId: ID!
-  isPinned: Boolean!
-  lastCheckedAt: DateTime
-  createdAt: DateTime!
-  updatedAt: DateTime!
+    id: ID!
+    widgetGroupId: ID!
+    isPinned: Boolean!
+    lastCheckedAt: DateTime
+    createdAt: DateTime!
+    updatedAt: DateTime!
 }
 
 type InsightActionModel {
-  id: ID!
-  type: String!
-  status: String!
-  errors: [String!]
-  issuedAt: DateTime!
-  input: InsightActionInputModel!
+    id: ID!
+    type: String!
+    status: String!
+    errors: [String!]
+    issuedAt: DateTime!
+    input: InsightActionInputModel!
 }
 
 union InsightActionInputModel =
     EncourageLearnersInput
-  | PraiseLearnersInput
-  | RemindLearnersInput
+    | PraiseLearnersInput
+    | RemindLearnersInput
 
 type EncourageLearnersInput {
-  subject: String!
-  body: String!
-  learner_ids: [String!]!
-  sendIndividualMessages: Boolean!
+    subject: String!
+    body: String!
+    learner_ids: [String!]!
+    sendIndividualMessages: Boolean!
 }
 
 type PraiseLearnersInput {
-  subject: String!
-  body: String!
-  learner_ids: [String!]!
-  sendIndividualMessages: Boolean!
+    subject: String!
+    body: String!
+    learner_ids: [String!]!
+    sendIndividualMessages: Boolean!
 }
 
 type RemindLearnersInput {
-  subject: String!
-  body: String!
-  course_id: String
-  learner_ids: [String!]!
-  sendIndividualMessages: Boolean!
+    subject: String!
+    body: String!
+    course_id: String
+    learner_ids: [String!]!
+    sendIndividualMessages: Boolean!
 }
 
 type InsightMessageModel {
-  id: ID!
-  type: String!
-  status: String!
+    id: ID!
+    type: String!
+    status: String!
 
-  # Time at which the message had new data
-  generatedAt: DateTime!
+    # Time at which the message had new data
+    generatedAt: DateTime!
 
-  # Time at which this message had its status last transitioned
-  updatedAt: DateTime!
-  date: DateTime! @deprecated(reason: "Use generatedAt instead")
-  rootAccountId: String!
-  accountId: String!
-  data: InsightMessageDataModel!
+    # Time at which this message had its status last transitioned
+    updatedAt: DateTime!
+    date: DateTime! @deprecated(reason: "Use generatedAt instead")
+    rootAccountId: String!
+    accountId: String!
+    data: InsightMessageDataModel!
 }
 
 union InsightMessageDataModel =
     LearnersDidCompleteCourse
-  | LearnersDidGainSkills
-  | LearnersDidNotStartCourseYet
-  | LearnersDidReturnAfterIdling
-  | LearnersInCourseAreIdling
-  | MostPopularSkill
-  | PlatformEngagementTrend
+    | LearnersDidGainSkills
+    | LearnersDidNotStartCourseYet
+    | LearnersDidReturnAfterIdling
+    | LearnersInCourseAreIdling
+    | MostPopularSkill
+    | PlatformEngagementTrend
 
 type LearnersDidCompleteCourse {
-  course_id: String!
-  learner_ids: [String!]!
+    course_id: String!
+    learner_ids: [String!]!
 }
 
 type LearnersDidGainSkills {
-  skill_count: Float!
-  learner_ids: [String!]!
+    skill_count: Float!
+    learner_ids: [String!]!
 }
 
 type LearnersDidNotStartCourseYet {
-  course_id: String!
-  learner_ids: [String!]!
+    course_id: String!
+    learner_ids: [String!]!
 }
 
 type LearnersDidReturnAfterIdling {
-  learner_ids: [String!]!
+    learner_ids: [String!]!
 }
 
 type LearnersInCourseAreIdling {
-  course_id: String!
-  learner_ids: [String!]!
+    course_id: String!
+    learner_ids: [String!]!
 }
 
 type MostPopularSkill {
-  skill_name: String!
+    skill_name: String!
 }
 
 type PlatformEngagementTrend {
-  trend: Float!
+    trend: Float!
+}
+
+type LearnItemsResponseGQL {
+    # List of learn items (programs and courses)
+    items: [LearnItem!]!
+
+    # Pagination information
+    pageInfo: CursorPaginationInfoGQL!
+}
+
+# A learn item that can be either a program or a course enrollment
+union LearnItem = ProgramEnrollmentItemGQL | CourseEnrollmentItemGQL
+
+type ProgramEnrollmentItemGQL {
+    # Unique identifier for the program
+    id: String!
+
+    # Name of the program
+    name: String!
+
+    # Position in the sorted list
+    position: Int!
+
+    # Type of item (always PROGRAM for this type)
+    itemType: LearnItemType!
+
+    # Program start date
+    startDate: DateTime
+
+    # Program end date
+    endDate: DateTime
+
+    # When the user was enrolled in the program
+    enrolledAt: DateTime
+
+    # Completion percentage (0-100)
+    completionPercentage: Float
+
+    # Enrollment status (active, completed, dropped)
+    status: String!
+
+    # Program description
+    description: String
+
+    # Program variant type (linear or non_linear)
+    variant: String!
+
+    # Estimated duration in minutes (sum of all courses)
+    estimatedDurationMinutes: Int
+
+    # Number of courses in the program
+    courseCount: Int!
+}
+
+# Type of learn item - either a program or a standalone course
+enum LearnItemType {
+    # A learning program composed of multiple courses
+    PROGRAM
+
+    # A standalone Canvas course not part of a program
+    COURSE
+}
+
+type CourseEnrollmentItemGQL {
+    # Unique identifier for the course
+    id: String!
+
+    # Name of the course
+    name: String!
+
+    # Position in the sorted list
+    position: Int!
+
+    # Type of item (always COURSE for this type)
+    itemType: LearnItemType!
+
+    # Course start date
+    startAt: DateTime
+
+    # Course end date
+    endAt: DateTime
+
+    # When the user was enrolled in the course (null if unknown)
+    enrolledAt: DateTime
+
+    # Completion percentage (0-100)
+    completionPercentage: Float
+
+    # Total number of requirements in the course
+    requirementCount: Int
+
+    # Number of completed requirements
+    requirementCompletedCount: Int
+
+    # When the course was completed
+    completedAt: DateTime
+
+    # Final grade (0-100)
+    grade: Float
+
+    # Course image URL
+    imageUrl: String
+
+    # Course workflow state (available, completed, etc.)
+    workflowState: String!
+
+    # Last activity timestamp in the course
+    lastActivityAt: DateTime
 }
 
 type UserMetadataGQL {
-  # Unique identifier for the user metadata
-  id: ID!
+    # Unique identifier for the user metadata
+    id: ID!
 
-  # ID of the associated metadata user
-  userId: ID!
+    # ID of the associated metadata user
+    userId: ID!
 
-  # Key for the metadata
-  key: String!
+    # Key for the metadata
+    key: String!
 
-  # Value for the metadata
-  value: String!
+    # Value for the metadata
+    value: String!
 
-  # Timestamp when the record was created
-  createdAt: DateTime!
+    # Timestamp when the record was created
+    createdAt: DateTime!
 
-  # Timestamp when the record was last updated
-  updatedAt: DateTime!
+    # Timestamp when the record was last updated
+    updatedAt: DateTime!
 
-  # Associated metadata user
-  user: MetadataUserGQL
+    # Associated metadata user
+    user: MetadataUserGQL
 }
 
 type MetadataUserGQL {
-  # Unique identifier for the metadata user; internal to the metadata service
-  id: ID!
+    # Unique identifier for the metadata user; internal to the metadata service
+    id: ID!
 
-  # UUID of the user's Canvas root account
-  canvasRootAccountUuid: ID!
+    # UUID of the user's Canvas root account
+    canvasRootAccountUuid: ID!
 
-  # User's Canvas UUID
-  canvasUserUuid: ID!
+    # User's Canvas UUID
+    canvasUserUuid: ID!
 
-  # List of user's leaders Canvas UUIDs
-  leaderCanvasUserUuids: [ID!]
+    # List of user's leaders Canvas UUIDs
+    leaderCanvasUserUuids: [ID!]
 
-  # Timestamp when the record was created
-  createdAt: DateTime!
+    # Timestamp when the record was created
+    createdAt: DateTime!
 
-  # Timestamp when the record was last updated
-  updatedAt: DateTime!
+    # Timestamp when the record was last updated
+    updatedAt: DateTime!
 
-  # List of this user's metadata
-  metadata: [UserMetadataGQL!]
+    # List of this user's metadata
+    metadata: [UserMetadataGQL!]
+}
+
+type DeleteUsersResultGQL {
+    # Number of users whose metadata was deleted from Journey
+    metadataDeletedCount: Int!
+
+    # List of user UUIDs whose metadata was successfully deleted
+    deletedUserUuids: [String!]!
 }
 
 type MetadataUsersGql {
-  # List of users
-  users: [MetadataUserGQL!]!
+    # List of users
+    users: [MetadataUserGQL!]!
 }
 
-type CursorPaginationInfoGQL {
-  # Cursor for the next page
-  nextCursor: String
+type CanvasCourseInfoGQL {
+    courseId: String!
+    canvasUrl: String!
+    courseName: String
+    courseImageUrl: String
+    moduleCount: Float!
+    moduleItemCount: Float!
+    estimatedDurationMinutes: Float
+}
 
-  # Cursor for the previous page
-  previousCursor: String
+type LearningLibraryCourseMembershipGQL {
+    id: String!
+    libraryId: String!
+    itemType: CollectionItemType!
+    status: CourseMembershipStatus!
+    displayOrder: Float!
 
-  # Whether there is a next page
-  hasNextPage: Boolean!
+    # Canvas module ID
+    canvasModuleId: String
 
-  # Whether there is a previous page
-  hasPreviousPage: Boolean!
+    # Canvas module item ID
+    canvasModuleItemId: String
+
+    # Canvas resource ID for the underlying content (page URL, assignment ID, file ID, etc.)
+    canvasResourceId: String
+
+    # Canvas course information (only available for COURSE item types, null for PROGRAM types)
+    canvasCourse: CanvasCourseInfoGQL
+
+    # Program ID if this membership references a program
+    programId: String
+
+    # Program course ID if this membership references a course
+    programCourseId: String
+    createdAt: DateTime!
+    updatedAt: DateTime!
+}
+
+# Type of item in a learning library collection
+enum CollectionItemType {
+    COURSE
+    PAGE
+    ASSIGNMENT
+    QUIZ
+    EXTERNAL_URL
+    EXTERNAL_TOOL
+    FILE
+    PROGRAM
+}
+
+# Status of a course membership in a learning library collection
+enum CourseMembershipStatus {
+    CREATING
+    CREATED
+}
+
+type EnrichedLearningLibraryCourseMembershipGQL {
+    id: String!
+    libraryId: String!
+    itemType: CollectionItemType!
+    status: CourseMembershipStatus!
+    displayOrder: Float!
+
+    # Canvas module ID
+    canvasModuleId: String
+
+    # Canvas module item ID
+    canvasModuleItemId: String
+
+    # Canvas resource ID for the underlying content (page URL, assignment ID, file ID, etc.)
+    canvasResourceId: String
+
+    # Canvas course information (only available for COURSE item types, null for PROGRAM types)
+    canvasCourse: CanvasCourseInfoGQL
+
+    # Program ID if this membership references a program
+    programId: String
+
+    # Program course ID if this membership references a course
+    programCourseId: String
+    createdAt: DateTime!
+    updatedAt: DateTime!
+
+    # Whether the current user has bookmarked this item
+    isBookmarked: Boolean!
+
+    # User completion percentage (0-100, null if no progress)
+    completionPercentage: Float
+
+    # Whether user is enrolled in the Canvas course (null for programs)
+    isEnrolledInCanvas: Boolean
+
+    # Canvas enrollment ID for the user in this course (null if not enrolled or for programs)
+    canvasEnrollmentId: String
+}
+
+type EnrolledLearningLibraryCollectionGQL {
+    # Unique identifier for the learning library collection
+    id: String!
+
+    # Internal name of the collection
+    name: String!
+
+    # Public-facing display name of the collection
+    publicName: String
+
+    # Description of the collection
+    description: String
+
+    # Collection creation timestamp
+    createdAt: DateTime!
+
+    # Collection last update timestamp
+    updatedAt: DateTime!
+
+    # Collection items with user-specific enrichment (limited by itemLimitPerCollection)
+    items: [EnrichedLearningLibraryCourseMembershipGQL!]!
+
+    # Total number of items in this collection (all items, not just the limited subset returned)
+    totalItemCount: Int!
+}
+
+type EnrolledLearningLibraryCollectionsResponseGQL {
+    # All collections the user is enrolled in with limited items
+    collections: [EnrolledLearningLibraryCollectionGQL!]!
 }
 
-type LearningLibraryGQL {
-  id: String!
+type LearningLibraryCollectionGQL {
+    id: String!
+
+    # Internal name of the learning library collection
+    name: String!
+
+    # Public-facing name of the collection
+    publicName: String
+    description: String
 
-  # Internal name of the learning library collection
-  name: String!
+    # Canvas root account UUID
+    rootAccountUuid: String!
 
-  # Public-facing name of the collection
-  publicName: String
-  description: String
-  publishStatus: LearningLibraryPublishStatus!
-  ownerId: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
+    # Canvas account ID
+    accountId: String!
+
+    # Soft delete timestamp
+    deletedAt: DateTime
+    createdAt: DateTime!
+    updatedAt: DateTime!
 }
 
-# Publish status of learning library collection
-enum LearningLibraryPublishStatus {
-  UNPUBLISHED
-  PUBLISHED
-  ARCHIVED
-  DELETED
+type LearningLibraryCollectionItemsResponseGQL {
+    # Paginated collection items with user-specific enrichment
+    items: [EnrichedLearningLibraryCourseMembershipGQL!]!
+
+    # Cursor-based pagination information
+    pageInfo: CursorPaginationInfoGQL!
+}
+
+type LearningLibraryCollectionWithCoursesGQL {
+    id: String!
+
+    # Internal name of the learning library collection
+    name: String!
+
+    # Public-facing name of the collection
+    publicName: String
+    description: String
+
+    # Canvas account ID
+    accountId: String!
+
+    # Course memberships in this collection
+    courseMemberships: [LearningLibraryCourseMembershipGQL!]!
+    createdAt: DateTime!
+    updatedAt: DateTime!
 }
 
 type LearningLibraryCollectionsCursorResponseGQL {
-  # List of Learning Library Collections
-  collections: [LearningLibraryGQL!]!
+    # List of Learning Library Collections
+    collections: [LearningLibraryCollectionGQL!]!
 
-  # Cursor-based pagination information
-  pageInfo: CursorPaginationInfoGQL!
+    # Cursor-based pagination information
+    pageInfo: CursorPaginationInfoGQL!
 }
 
-type LearningLibraryCollectionEnrollmentGQL {
-  # Enrollment ID
-  id: String!
+type LearningLibraryCollectionWithCountsGQL {
+    id: String!
 
-  # Learning library collection ID
-  collectionId: String!
+    # Internal name of the learning library collection
+    name: String!
 
-  # User ID of the enrollee
-  enrolleeId: String!
+    # Public-facing name of the collection
+    publicName: String
+    description: String
 
-  # Enrollment status
-  status: LearningLibraryCollectionEnrollmentStatus!
+    # Canvas account ID
+    accountId: String!
 
-  # When the user enrolled
-  enrolledAt: DateTime!
-  createdAt: DateTime!
-  updatedAt: DateTime!
+    # Number of courses in this collection (excludes programs)
+    courseCount: Int!
+
+    # Number of active learners enrolled in this collection
+    learnerCount: Int!
+
+    # Number of unique skills aligned to learning objects in this collection
+    uniqueSkills: Int!
+    createdAt: DateTime!
+    updatedAt: DateTime!
 }
 
-# Enrollment status for learning library collection
-enum LearningLibraryCollectionEnrollmentStatus {
-  ACTIVE
-  INACTIVE
+type LearningLibraryCollectionsWithCountsCursorResponseGQL {
+    # List of Learning Library Collections with course and learner counts
+    collections: [LearningLibraryCollectionWithCountsGQL!]!
+
+    # Cursor-based pagination information
+    pageInfo: CursorPaginationInfoGQL!
+}
+
+type ToggleCollectionItemBookmarkResponseGQL {
+    # Whether the item is now bookmarked (true) or unbookmarked (false)
+    isBookmarked: Boolean!
+}
+
+type BatchUnenrollUsersFromCollectionOutput {
+    # Number of users successfully unenrolled from the collection
+    unenrolledCount: Int!
+
+    # Array of Canvas user IDs that were not found (not enrolled in the collection)
+    notFoundUserIds: [String!]!
+}
+
+type CollectionItemEnrollmentResponseGQL {
+    # The collection item with enriched metadata
+    item: EnrichedLearningLibraryCourseMembershipGQL!
+
+    # Whether the user was already enrolled in the Canvas course before this request
+    wasAlreadyEnrolled: Boolean!
 }
 
 type PaginationInfoGQL {
-  # Current page number (1-indexed)
-  currentPage: Int!
+    # Current page number (1-indexed)
+    currentPage: Int!
 
-  # Total number of pages available
-  totalPages: Int
+    # Total number of pages available
+    totalPages: Int
 
-  # Whether there is a next page
-  hasNextPage: Boolean!
+    # Whether there is a next page
+    hasNextPage: Boolean!
 
-  # Whether there is a previous page
-  hasPreviousPage: Boolean!
+    # Whether there is a previous page
+    hasPreviousPage: Boolean!
 }
 
 type CanvasUserGQL {
-  # Canvas user ID
-  id: ID!
+    # Canvas user ID
+    id: ID!
+
+    # User name from Canvas
+    name: String
+
+    # User email from Canvas
+    email: String
+
+    # User sortable name from Canvas
+    sortableName: String
 
-  # User name from Canvas
-  name: String
+    # User short name from Canvas
+    shortName: String
 
-  # User email from Canvas
-  email: String
+    # User login ID from Canvas
+    loginId: String
 
-  # User sortable name from Canvas
-  sortableName: String
+    # User avatar URL from Canvas
+    avatarUrl: String
 
-  # User short name from Canvas
-  shortName: String
+    # Canvas user UUID
+    uuid: String
 
-  # User login ID from Canvas
-  loginId: String
+    # SIS user ID from Canvas
+    sisUserId: String
 
-  # User avatar URL from Canvas
-  avatarUrl: String
+    # Integration ID from Canvas
+    integrationId: String
+}
+
+type LearningLibraryCollectionEnrollmentGQL {
+    # Enrollment ID
+    id: String!
+
+    # Learning library collection ID
+    collectionId: String!
+
+    # User ID of the enrollee
+    enrolleeId: String!
+
+    # Canvas user UUID of the enrollee
+    canvasUserUuid: String
+
+    # Enrollment status
+    status: LearningLibraryCollectionEnrollmentStatus!
+
+    # When the user enrolled
+    enrolledAt: DateTime!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+
+    # Canvas user profile data (populated when fetching with user details)
+    canvasUser: CanvasUserGQL
+}
 
-  # Canvas user UUID
-  uuid: String
+# Enrollment status for learning library collection
+enum LearningLibraryCollectionEnrollmentStatus {
+    ACTIVE
+    INACTIVE
+}
 
-  # SIS user ID from Canvas
-  sisUserId: String
+type LearningLibraryCollectionEnrollmentsResponseGQL {
+    # List of enrollments for the collection
+    enrollments: [LearningLibraryCollectionEnrollmentGQL!]!
 
-  # Integration ID from Canvas
-  integrationId: String
+    # Pagination information
+    pagination: PaginationInfoGQL!
 }
 
 type KeyValuePairGQL {
-  # Metadata key
-  key: String!
+    # Metadata key
+    key: String!
 
-  # Metadata value
-  value: String!
+    # Metadata value
+    value: String!
 }
 
 type PersonGQL {
-  # Canvas user ID
-  id: ID!
+    # Canvas user ID
+    id: ID!
 
-  # User name from Canvas
-  name: String
+    # User name from Canvas
+    name: String
 
-  # User email from Canvas
-  email: String
+    # User email from Canvas
+    email: String
 
-  # User sortable name from Canvas
-  sortableName: String
+    # User sortable name from Canvas
+    sortableName: String
 
-  # User short name from Canvas
-  shortName: String
+    # User short name from Canvas
+    shortName: String
 
-  # User login ID from Canvas
-  loginId: String
+    # User login ID from Canvas
+    loginId: String
 
-  # User avatar URL from Canvas
-  avatarUrl: String
+    # User avatar URL from Canvas
+    avatarUrl: String
 
-  # Canvas user UUID
-  uuid: ID
+    # Canvas user UUID
+    uuid: ID
 
-  # SIS user ID from Canvas
-  sisUserId: String
+    # SIS user ID from Canvas
+    sisUserId: String
 
-  # Integration ID from Canvas
-  integrationId: String
+    # Integration ID from Canvas
+    integrationId: String
 
-  # User metadata from Journey
-  metadata: [KeyValuePairGQL!]
+    # User metadata from Journey
+    metadata: [KeyValuePairGQL!]
 
-  # Leaders for this user from Canvas
-  leaders: [CanvasUserGQL!]
+    # Leaders for this user from Canvas
+    leaders: [CanvasUserGQL!]
 
-  # Number of direct subordinates for this user from Canvas
-  subordinateCount: Float
+    # Number of direct subordinates for this user from Canvas
+    subordinateCount: Float
 
-  # User timezone from Canvas
-  timeZone: String
+    # User timezone from Canvas
+    timeZone: String
 
-  # Last login timestamp from Canvas
-  lastLogin: String
+    # Last login timestamp from Canvas
+    lastLogin: String
 
-  # Account UUID from Journey metadata
-  accountUuid: String!
+    # Account UUID from Journey metadata
+    accountUuid: String!
 }
 
 type PeopleResponseGQL {
-  # List of people (Canvas users enriched with metadata)
-  people: [PersonGQL!]!
+    # List of people (Canvas users enriched with metadata)
+    people: [PersonGQL!]!
 
-  # Pagination information for the query
-  pagination: PaginationInfoGQL!
+    # Pagination information for the query
+    pagination: PaginationInfoGQL!
 }
 
 type SkillTaxonomyGroupGQL {
-  # Unique identifier for the group
-  id: ID!
+    # Unique identifier for the group
+    id: ID!
 
-  # Name of the skill taxonomy group
-  name: String!
+    # Name of the skill taxonomy group
+    name: String!
 
-  # Creation date of the group
-  createdAt: DateTime!
+    # Creation date of the group
+    createdAt: DateTime!
 
-  # Last updated date of the group
-  updatedAt: DateTime!
+    # Last updated date of the group
+    updatedAt: DateTime!
 
-  # Account associated with the skill taxonomy group
-  account: SkillTaxonomyAccountGQL
+    # Account associated with the skill taxonomy group
+    account: SkillTaxonomyAccountGQL
 
-  # Skills associated with the skill taxonomy group
-  taxonomySkills: [SkillTaxonomySkillGQL!]!
+    # Skills associated with the skill taxonomy group
+    taxonomySkills: [SkillTaxonomySkillGQL!]!
 }
 
 type SkillTaxonomyAccountGQL {
-  # Unique identifier for the account
-  id: ID!
+    # Unique identifier for the account
+    id: ID!
 
-  # Root account UUID for the skill taxonomy
-  rootAccountUuid: String!
+    # Root account UUID for the skill taxonomy
+    rootAccountUuid: String!
 
-  # Creation date of the skill taxonomy account
-  createdAt: DateTime!
+    # Creation date of the skill taxonomy account
+    createdAt: DateTime!
 
-  # Groups associated with the skill taxonomy account
-  groups: [SkillTaxonomyGroupGQL!]!
+    # Groups associated with the skill taxonomy account
+    groups: [SkillTaxonomyGroupGQL!]!
 
-  # Skills associated with the skill taxonomy account
-  taxonomySkills: [SkillTaxonomySkillGQL!]!
+    # Skills associated with the skill taxonomy account
+    taxonomySkills: [SkillTaxonomySkillGQL!]!
 }
 
 type SkillTaxonomySkillGQL {
-  # Unique identifier for the skill
-  id: ID!
+    # Unique identifier for the skill
+    id: ID!
 
-  # Name of the skill
-  name: String!
+    # Name of the skill
+    name: String!
 
-  # Description of the skill
-  description: String
+    # Description of the skill
+    description: String
 
-  # Creation date of the skill
-  createdAt: DateTime!
+    # Creation date of the skill
+    createdAt: DateTime!
 
-  # Last updated date of the skill
-  updatedAt: DateTime!
+    # Last updated date of the skill
+    updatedAt: DateTime!
 
-  # Group to which the skill belongs
-  group: SkillTaxonomyGroupGQL
+    # Group to which the skill belongs
+    group: SkillTaxonomyGroupGQL
 
-  # Account associated with the skill
-  account: SkillTaxonomyAccountGQL
-  courses: [SkillTaxonomyCourseGQL!]!
-  programs: [ProgramGQL!]!
-  alignmentsGroupedByProficiencyScaleValue(
-    courseId: String!
-  ): [AlignmentsByProficiencyScaleValueGQL!]!
-  coursesGroupedByProficiencyScaleValue(
-    programId: String!
-  ): [CoursesByProficiencyScaleValueGQL!]!
+    # Account associated with the skill
+    account: SkillTaxonomyAccountGQL
+    courses: [SkillTaxonomyCourseGQL!]!
+    programs: [ProgramGQL!]!
+    alignmentsGroupedByProficiencyScaleValue(
+        courseId: String
+        collectionId: String
+    ): [AlignmentsByProficiencyScaleValueGQL!]!
+    coursesGroupedByProficiencyScaleValue(
+        programId: String!
+    ): [CoursesByProficiencyScaleValueGQL!]!
 }
 
 type PopulatedSimilarSkillGQL {
-  # Unique identifier for the skill
-  id: ID
+    # Unique identifier for the skill
+    id: ID
 
-  # Name of the skill
-  name: String!
+    # Name of the skill
+    name: String!
 
-  # Description of the skill
-  description: String
+    # Description of the skill
+    description: String
 
-  # Creation date of the skill
-  createdAt: DateTime!
+    # Creation date of the skill
+    createdAt: DateTime!
 
-  # Last updated date of the skill
-  updatedAt: DateTime!
+    # Last updated date of the skill
+    updatedAt: DateTime!
 
-  # Group to which the skill belongs
-  group: SkillTaxonomyGroupGQL
+    # Group to which the skill belongs
+    group: SkillTaxonomyGroupGQL
 
-  # Account associated with the skill
-  account: SkillTaxonomyAccountGQL
-  courses: [SkillTaxonomyCourseGQL!]!
-  programs: [ProgramGQL!]!
+    # Account associated with the skill
+    account: SkillTaxonomyAccountGQL
+    courses: [SkillTaxonomyCourseGQL!]!
+    programs: [ProgramGQL!]!
 }
 
 type SkillTaxonomyProficiencyScaleValueGQL {
-  # Unique identifier for the proficiency scale value
-  id: ID!
+    # Unique identifier for the proficiency scale value
+    id: ID!
 
-  # Level of the proficiency scale value
-  level: Int!
+    # Level of the proficiency scale value
+    level: Int!
 
-  # String value of the proficiency scale value
-  value: String!
+    # String value of the proficiency scale value
+    value: String!
 }
 
 type SkillTaxonomyCourseGQL {
-  # Unique identifier for the course
-  id: ID!
+    # Unique identifier for the course
+    id: ID!
 
-  # Unique identifier for the course in Canvas
-  courseId: String!
+    # Unique identifier for the course in Canvas
+    courseId: String!
 
-  # Learning objects associated with the course
-  learningObjects: [SkillTaxonomyLearningObjectGQL!]!
-  uniqueSkills: Float!
-  skills(moduleId: String, moduleItemId: String): [SkillTaxonomySkillGQL!]!
+    # Learning objects associated with the course
+    learningObjects: [SkillTaxonomyLearningObjectGQL!]!
+    uniqueSkills: Float!
+    skills(moduleId: String, moduleItemId: String): [SkillTaxonomySkillGQL!]!
 }
 
 type SkillTaxonomyLearningObjectGQL {
-  # Unique identifier for the learning object
-  id: String!
+    # Unique identifier for the learning object
+    id: String!
 
-  # Content ID of the learning object
-  contentId: String!
+    # Content ID of the learning object
+    contentId: String!
 
-  # Type of the learning object
-  type: String!
+    # Type of the learning object
+    type: String!
 
-  # Alignments of the learning object with skills
-  alignments: [SkillTaxonomySkillAlignmentGQL!]!
+    # Alignments of the learning object with skills
+    alignments: [SkillTaxonomySkillAlignmentGQL!]!
 
-  # Course associated with the learning object
-  course: SkillTaxonomyCourseGQL
+    # Course associated with the learning object
+    course: SkillTaxonomyCourseGQL
 }
 
 type SkillTaxonomySkillAlignmentGQL {
-  # Unique identifier for the skill alignment
-  id: ID!
+    # Unique identifier for the skill alignment
+    id: ID!
 
-  # Module identifier for the skill alignment
-  moduleId: String!
+    # Module identifier for the skill alignment
+    moduleId: String!
 
-  # Module item identifier for the skill alignment
-  moduleItemId: String!
+    # Module item identifier for the skill alignment
+    moduleItemId: String!
 
-  # Skill associated with the alignment
-  skill: SkillTaxonomySkillGQL
+    # Skill associated with the alignment
+    skill: SkillTaxonomySkillGQL
 
-  # Proficiency scale values for the skill alignment
-  proficiencyScaleValues: [SkillTaxonomyProficiencyScaleValueGQL!]!
+    # Proficiency scale values for the skill alignment
+    proficiencyScaleValues: [SkillTaxonomyProficiencyScaleValueGQL!]!
 
-  # Learning object associated with the skill alignment
-  learningObject: SkillTaxonomyLearningObjectGQL
+    # Learning object associated with the skill alignment
+    learningObject: SkillTaxonomyLearningObjectGQL
 }
 
 type AlignmentsByProficiencyScaleValueGQL {
-  # Proficiency scale value for the skill alignment
-  proficiencyScaleValue: SkillTaxonomyProficiencyScaleValueGQL
+    # Proficiency scale value for the skill alignment
+    proficiencyScaleValue: SkillTaxonomyProficiencyScaleValueGQL
+
+    # List of skill alignments for the proficiency scale value
+    alignments: [SkillTaxonomySkillAlignmentGQL!]!
+}
+
+type SkillTaxonomyCollectionAlignmentGQL {
+    # Unique identifier for the skill alignment
+    id: ID!
+
+    # Unique identifier of the collection item (learning library course membership)
+    collectionItemId: String!
+
+    # Skill associated with the alignment
+    skill: SkillTaxonomySkillGQL
 
-  # List of skill alignments for the proficiency scale value
-  alignments: [SkillTaxonomySkillAlignmentGQL!]!
+    # Proficiency scale values for the skill alignment
+    proficiencyScaleValues: [SkillTaxonomyProficiencyScaleValueGQL!]!
+}
+
+type AssociateSkillsToCollectionItemsResultGQL {
+    # Skill alignments that were created or updated
+    persistedAlignments: [SkillTaxonomyCollectionAlignmentGQL!]!
+
+    # IDs of skill alignments that were deleted
+    deletedAlignments: [ID!]!
 }
 
 type AssociateSkillsToLearningObjectsResultGQL {
-  # List of alignments that were successfully persisted
-  persistedAlignments: [SkillTaxonomySkillAlignmentGQL!]!
+    # List of alignments that were successfully persisted
+    persistedAlignments: [SkillTaxonomySkillAlignmentGQL!]!
 
-  # List of alignment IDs that were deleted
-  deletedAlignments: [ID!]!
+    # List of alignment IDs that were deleted
+    deletedAlignments: [ID!]!
 }
 
 type SimilarSkillGroupGQL {
-  # List of similar skills in the group
-  similarSkills: [PopulatedSimilarSkillGQL!]!
+    # List of similar skills in the group
+    similarSkills: [PopulatedSimilarSkillGQL!]!
 }
 
 type ChangeTaxonomySkillsResultGQL {
-  # List of similar skill groups found in the taxonomy
-  similarSkillGroups: [SimilarSkillGroupGQL!]!
+    # List of similar skill groups found in the taxonomy
+    similarSkillGroups: [SimilarSkillGroupGQL!]!
 
-  # List of skills that were successfully persisted to the taxonomy
-  persistedSkills: [SkillTaxonomySkillGQL!]!
+    # List of skills that were successfully persisted to the taxonomy
+    persistedSkills: [SkillTaxonomySkillGQL!]!
 
-  # List of skill IDs that were deleted from the taxonomy
-  deletedSkills: [ID!]
+    # List of skill IDs that were deleted from the taxonomy
+    deletedSkills: [ID!]
 }
 
 type CoursesByProficiencyScaleValueGQL {
-  # Proficiency scale value specified in the alignment for the skill
-  proficiencyScaleValue: SkillTaxonomyProficiencyScaleValueGQL
+    # Proficiency scale value specified in the alignment for the skill
+    proficiencyScaleValue: SkillTaxonomyProficiencyScaleValueGQL
+
+    # List of courses for the proficiency scale value
+    courses: [SkillTaxonomyCourseGQL!]!
+}
+
+type SkillTaxonomyCollectionItemGQL {
+    # Unique identifier for the skill taxonomy learning object (null if not yet aligned)
+    id: ID
+
+    # Canvas resource ID of the collection item
+    contentId: String!
+
+    # Type of the learning object
+    type: String!
+
+    # Skill alignments for this collection item
+    alignments: [SkillTaxonomyCollectionAlignmentGQL!]!
+}
+
+type SkillTaxonomyCollectionGQL {
+    # Unique identifier for the collection (same as collectionId)
+    id: ID!
+
+    # Unique identifier for the learning library collection
+    collectionId: String!
 
-  # List of courses for the proficiency scale value
-  courses: [SkillTaxonomyCourseGQL!]!
+    # Learning object items in the collection with their skill alignments
+    learningObjects: [SkillTaxonomyCollectionItemGQL!]!
+    uniqueSkills: Float!
+    skills: [SkillTaxonomySkillGQL!]!
 }
 
 type SkillTaxonomyProficiencyScaleGQL {
-  # Unique identifier for the proficiency scale
-  id: ID!
+    # Unique identifier for the proficiency scale
+    id: ID!
 
-  # Name of the proficiency scale
-  name: String!
+    # Name of the proficiency scale
+    name: String!
 
-  # Root account UUID for the proficiency scale
-  rootAccountUuid: String
+    # Root account UUID for the proficiency scale
+    rootAccountUuid: String
 
-  # Values associated with the proficiency scale
-  values: [SkillTaxonomyProficiencyScaleValueGQL!]!
+    # Values associated with the proficiency scale
+    values: [SkillTaxonomyProficiencyScaleValueGQL!]!
 }
 
 type ProgramGQL {
-  id: String!
+    id: String!
 
-  # Internal name of the program
-  name: String!
+    # Internal name of the program
+    name: String!
 
-  # Public-facing name of the program
-  publicName: String
+    # Public-facing name of the program
+    publicName: String
 
-  # Custom ID associated by the creator
-  customerId: String
-  description: String
-  publishStatus: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  owner: String!
-  startDate: DateTime
-  endDate: DateTime
+    # Custom ID associated by the creator
+    customerId: String
+    description: String
+    publishStatus: String!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    owner: String!
+    startDate: DateTime
+    endDate: DateTime
 
-  # Program variant type (linear or non-linear)
-  variant: ProgramVariantType!
+    # Program variant type (linear or non-linear)
+    variant: ProgramVariantType!
 
-  # Number of courses required for completion in non-linear programs
-  courseCompletionCount: Int
+    # Number of courses required for completion in non-linear programs
+    courseCompletionCount: Int
 
-  # Course enrollment type for the program
-  courseEnrollment: CourseEnrollmentType!
-  requirements: [ProgramRequirementGQL!]!
-  enrollments: [ProgramEnrollmentGQL!]!
-  progresses: [ProgramProgressGQL!]!
-  uniqueSkills: Float!
-  skills: [SkillTaxonomySkillGQL!]!
+    # Course enrollment type for the program
+    courseEnrollment: CourseEnrollmentType!
+    requirements: [ProgramRequirementGQL!]!
+    enrollments: [ProgramEnrollmentGQL!]!
+    progresses: [ProgramProgressGQL!]!
+    uniqueSkills: Float!
+    skills: [SkillTaxonomySkillGQL!]!
 }
 
 # Type of program variant (linear or non-linear)
 enum ProgramVariantType {
-  LINEAR
-  NON_LINEAR
+    LINEAR
+    NON_LINEAR
 }
 
 # Type of course enrollment (self-enrollment or auto-enrollment)
 enum CourseEnrollmentType {
-  AUTO
-  SELF
+    AUTO
+    SELF
 }
 
 type ProgramEnrollmentGQL {
-  id: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  enrollee: String!
+    id: String!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    enrollee: String!
 }
 
 type ProgramCourseGQL {
-  id: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  canvasCourseId: String!
-  canvasUrl: String!
-  canvasCourseName: String
-  canvasCourseImageUrl: String
-  canvasMetadataUpdatedAt: DateTime
+    id: String!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    canvasCourseId: String!
+    canvasUrl: String!
+    canvasCourseName: String
+    canvasCourseImageUrl: String
+    canvasMetadataUpdatedAt: DateTime
+    canvasCourseModuleCount: Int!
+    canvasCourseModuleItemCount: Int!
+    estimatedDurationMinutes: Int
 }
 
 type ProgramRequirementGQL {
-  id: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  isCompletionRequired: Boolean!
-  isPlaceholder: Boolean!
-  description: String
+    id: String!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    isCompletionRequired: Boolean!
+    isPlaceholder: Boolean!
+    description: String
 
-  # Course enrollment type for this requirement
-  courseEnrollment: String!
-  dependency: ProgramCourseGQL
-  dependent: ProgramCourseGQL!
+    # Course enrollment type for this requirement
+    courseEnrollment: String!
+    dependency: ProgramCourseGQL
+    dependent: ProgramCourseGQL!
 }
 
 type ProgramProgressGQL {
-  id: String!
-  requirement: ProgramRequirementGQL!
-  enrollment: ProgramEnrollmentGQL!
-  completionPercentage: Float!
-  courseEnrollmentStatus: ProgramProgressCourseEnrollmentStatus!
-  createdAt: DateTime!
-  updatedAt: DateTime!
+    id: String!
+    requirement: ProgramRequirementGQL!
+    enrollment: ProgramEnrollmentGQL!
+    completionPercentage: Float!
+    courseEnrollmentStatus: ProgramProgressCourseEnrollmentStatus!
+    createdAt: DateTime!
+    updatedAt: DateTime!
 }
 
 enum ProgramProgressCourseEnrollmentStatus {
-  ENROLLED
-  NOT_ENROLLED
-  BLOCKED
+    ENROLLED
+    NOT_ENROLLED
+    BLOCKED
 }
 
 type ForceProgressRecalcResultGQL {
-  updated: [String!]!
-  failed: [String!]!
+    updated: [String!]!
+    failed: [String!]!
+}
+
+type CourseProgressSyncResultGQL {
+    completionPercentage: Float!
+    isEnrolledInCanvas: Boolean!
+    canvasEnrollmentId: String
+    lastSyncedAt: DateTime!
+    updatedProgramIds: [String!]!
+    failedProgramIds: [String!]!
 }
 
 type RedwoodResponseGQL {
-  # GraphQL response data from Redwood
-  data: JSON
+    # GraphQL response data from Redwood
+    data: JSON
 
-  # GraphQL errors from Redwood (if any)
-  errors: [JSON!]
+    # GraphQL errors from Redwood (if any)
+    errors: [JSON!]
 }
 
 type ExtractedSkillGQL {
-  name: String!
+    name: String!
 }
 
 type SkillGQL {
-  id: String!
-  name: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  taxonomySkill: SkillTaxonomySkillGQL
-  experiences: [ExperienceGQL!]!
-  proficiencyLevel: String
+    id: String!
+    name: String!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    taxonomySkill: SkillTaxonomySkillGQL
+    experiences: [ExperienceGQL!]!
+    proficiencyLevel: String
 }
 
 type UserGQL {
-  id: String!
-  canvasId: String!
-  canvasBaseUrl: String!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  isOnboarded: Boolean!
+    id: String!
+    canvasId: String!
+    canvasBaseUrl: String!
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    isOnboarded: Boolean!
 }
 
 type CourseRecommendationGQL {
-  courseId: Float!
-  skills: [ExtractedSkillGQL!]!
+    courseId: Float!
+    skills: [ExtractedSkillGQL!]!
 }
 
 type CourseRecommendationsGQL {
-  recommendedCourses: [CourseRecommendationGQL!]!
+    recommendedCourses: [CourseRecommendationGQL!]!
 }
 
 type ExperienceGQL {
-  id: String!
-  type: String!
-  status: String!
-  skill: SkillGQL
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  fileName: String
-  alignment: SkillTaxonomySkillAlignmentGQL
+    id: String!
+    type: String!
+    status: String!
+    skill: SkillGQL
+    createdAt: DateTime!
+    updatedAt: DateTime!
+    fileName: String
+    alignment: SkillTaxonomySkillAlignmentGQL
 }
 
-type Query {
-  skill(id: String!): SkillGQL
-  skills(completedOnly: Boolean): [SkillGQL!]!
-  courseRecommendations(
-    proficiencyLevel: String
-    skillIds: [String!]! = []
-  ): CourseRecommendationsGQL!
-  adminUsers(canvasBaseUrl: String!): [UserGQL!]!
-  currentUser: UserGQL!
+type RecommendationSourceContextGQL {
+    sourceCourseId: String
+    sourceCourseName: String
+    sourceSkillName: String
+}
 
-  # Fetch all skills within the taxonomy for the given account
-  skillTaxonomySkills(accountId: String!): [SkillTaxonomySkillGQL!]!
+type LearningRecommendationGQL {
+    courseId: String!
+    primaryReason: LearningRecommendationReason!
+    sourceContext: RecommendationSourceContextGQL
+    popularityCount: Int!
+    membership: EnrichedLearningLibraryCourseMembershipGQL
+}
 
-  # Fetch all available proficiency scales
-  availableProficiencyScales(
-    accountId: String!
-  ): [SkillTaxonomyProficiencyScaleGQL!]!
-
-  # Fetch the currently used proficiency scale for the account
-  currentlyUsedProficiencyScale: SkillTaxonomyProficiencyScaleGQL
-  skillTaxonomyGroups(accountId: String!): [SkillTaxonomyGroupGQL!]!
-  skillTaxonomyCourses(courseIds: [String!]!): [SkillTaxonomyCourseGQL!]!
-  skillTaxonomyCourse(courseId: String!): SkillTaxonomyCourseGQL!
-
-  # Check if skill extraction has run for course/module/module item
-  hasSkillExtractionRun(input: SkillExtractionStatusInputGQL!): Boolean!
-  contentLibraries(accountId: ID!): [ContentLibraryGQL!]!
-  contentLibrary(courseId: ID!): ContentLibraryGQL!
-  contentVersions(
-    assetId: Float
-    assetType: AssetTypeEnum!
-    courseId: ID!
-  ): [ContentVersionGQL!]!
-  currentContentVersions(
-    assetType: AssetTypeEnum!
-    courseId: ID!
-  ): [ContentVersionGQL!]!
-  previewContentVersion(id: ID!): ContentVersionPreviewGQL!
-  assetLinks(
-    assetId: Float!
-    assetType: AssetTypeEnum!
-    contentLibraryCourseId: ID!
-  ): [AssetLinkGQL!]!
-  assetLinkByAssetId(
-    assetId: ID!
-    assetType: AssetTypeEnum!
-    contentLibraryId: ID!
-  ): AssetLinkGQL
-
-  # All programs available for the user to administer, optionally filtered by progress state
-  programs(
-    # Filter programs by progress state
-    filter: ProgramFilterInput
-  ): [ProgramGQL!]!
-
-  # A program by id
-  program(programId: String!): ProgramGQL!
-
-  # All user enrolled programs
-  enrolledPrograms: [ProgramGQL!]!
-
-  # Get Learning Library Collections with cursor-based pagination support
-  learningLibraryCollections(
-    input: LearningLibraryCollectionsCursorQueryInput
-  ): LearningLibraryCollectionsCursorResponseGQL!
-  crmConfigJwt: CrmJwtGQL!
-  testSnowflakeQuery: JSON!
-  getSnowflakeQueryStatus(queryId: String!): String!
-  getSnowflakeQueryResults(queryId: String!): JSON!
-  readCsvFile(key: String!): JSON!
-  widgetFileUrl(key: String!): String!
-  widgetData(
-    widgetType: String!
-    dataScope: String!
-    timeSpan: TimeSpanInput!
-    canvasAccountId: String
-    queryParams: WidgetDataFiltersInput
-  ): WidgetDataResultGQL!
-  widgetsByUser(userAccountId: String!): [WidgetGQL!]!
-  widgetByTypeAndUser(userAccountId: String!, type: String!): WidgetGQL
-  widgetGroupsByUser(userAccountId: String!): [WidgetGroupGQL!]!
-  widgetGroupById(widgetGroupId: String!): WidgetGroupGQL!
-  widgetActions(widgetId: String!): [WidgetActionGQL!]!
-  widgetGroupUserDataByUser(userAccountId: String!): [WidgetGroupUserDataGQL!]!
-
-  # Get users (and metadata) matching the specified criteria
-  users(input: UsersQueryInputGQL!): MetadataUsersGql!
-
-  # Get all distinct metadata key-value pairs for a given account
-  distinctMetadataValues(input: UsersQueryInputGQL!): [UserMetadataGQL!]!
-
-  # Get users (and metadata) reporting to a specified user or the current user
-  userSubordinates(input: UserReportsQueryInputGQL!): MetadataUsersGql!
-
-  # Get people (Canvas users enriched with metadata) from a specific account
-  getPeople(input: PeopleQueryInputGQL!): PeopleResponseGQL!
-
-  # Get people (Canvas users enriched with metadata) by their Canvas UUIDs from a specific account
-  getPeopleByUuid(input: PeopleByUuidQueryInputGQL!): PeopleResponseGQL!
-
-  # Retrieve all insight feed messages for the current user in a specific account.
-  insights(
-    account: String!
-
-    # Data scope for insights (e.g., admin, leader, instructor, designer, ta)
-    scope: String = "admin"
-  ): [InsightMessageModel!]!
-  insightActionLog(account: String!): [InsightActionModel!]!
-  insightAction(action: String!): InsightActionModel
+enum LearningRecommendationReason {
+    PAST_LEARNINGS
+    BOOKMARKED_ITEMS
+    EXISTING_SKILLS
+    POPULARITY
+}
+
+type LearningRecommendationsResponseGQL {
+    recommendations: [LearningRecommendationGQL!]!
+}
+
+type Query {
+    skill(id: String!): SkillGQL
+    skills(completedOnly: Boolean): [SkillGQL!]!
+    courseRecommendations(
+        proficiencyLevel: String
+        skillIds: [String!]! = []
+    ): CourseRecommendationsGQL!
+    learningRecommendations: LearningRecommendationsResponseGQL!
+    adminUsers(canvasBaseUrl: String!): [UserGQL!]!
+    currentUser: UserGQL!
+
+    # Fetch all skills within the taxonomy for the given account
+    skillTaxonomySkills(accountId: String!): [SkillTaxonomySkillGQL!]!
+
+    # Fetch all available proficiency scales
+    availableProficiencyScales(
+        accountId: String!
+    ): [SkillTaxonomyProficiencyScaleGQL!]!
+
+    # Fetch the currently used proficiency scale for the account
+    currentlyUsedProficiencyScale: SkillTaxonomyProficiencyScaleGQL
+    skillTaxonomyGroups(accountId: String!): [SkillTaxonomyGroupGQL!]!
+    skillTaxonomyCourses(courseIds: [String!]!): [SkillTaxonomyCourseGQL!]!
+    skillTaxonomyCourse(courseId: String!): SkillTaxonomyCourseGQL!
+
+    # Check if skill extraction has run for course/module/module item
+    hasSkillExtractionRun(input: SkillExtractionStatusInputGQL!): Boolean!
+    skillTaxonomyCollection(collectionId: String!): SkillTaxonomyCollectionGQL!
+    contentLibraries(accountId: ID!): [ContentLibraryGQL!]!
+    contentLibrary(courseId: ID!): ContentLibraryGQL!
+    contentLibrariesForAccounts(
+        accountIds: [ID!]!
+    ): [AccountContentLibrariesGQL!]!
+    nonContentLibraryCoursesForAccount(
+        accountId: ID!
+        searchBy: String
+        params: JSON
+        perPage: Int
+    ): NonContentLibraryCoursesResultGQL!
+    contentVersions(
+        assetId: Float
+        assetType: AssetTypeEnum!
+        courseId: ID!
+    ): [ContentVersionGQL!]!
+    currentContentVersions(
+        assetType: AssetTypeEnum!
+        courseId: ID!
+    ): [ContentVersionGQL!]!
+    previewContentVersion(id: ID!): ContentVersionPreviewGQL!
+    assetLinks(
+        assetId: Float!
+        assetType: AssetTypeEnum!
+        contentLibraryCourseId: ID!
+    ): [AssetLinkGQL!]!
+    assetLinkByAssetId(
+        assetId: ID!
+        assetType: AssetTypeEnum!
+        contentLibraryId: ID!
+    ): AssetLinkGQL
+
+    # Returns programs scoped to the caller's permissions. When accountId is provided and the user has read_as_admin, returns all non-deleted programs in admin view. Otherwise returns only published programs in enrollee view.
+    programs(
+        # Filter programs by progress state
+        filter: ProgramFilterInput
+        accountId: String
+    ): [ProgramGQL!]!
+
+    # Returns a program by ID scoped to the caller's permissions. When accountId is provided and the user has read_as_admin, returns the program in admin view (including unpublished). Otherwise returns the program in enrollee view; accessing an unpublished program without admin permission is rejected.
+    program(programId: String!, accountId: String): ProgramGQL!
+
+    # All user enrolled programs
+    enrolledPrograms: [ProgramGQL!]!
+
+    # Get Learning Library Collections with cursor-based pagination support
+    learningLibraryCollections(
+        accountId: String!
+        input: LearningLibraryCollectionsCursorQueryInput
+    ): LearningLibraryCollectionsCursorResponseGQL!
+
+    # Get Learning Library Collections with course and learner counts using cursor-based pagination
+    learningLibraryCollectionsWithCounts(
+        accountId: String!
+        input: LearningLibraryCollectionsCursorQueryInput
+    ): LearningLibraryCollectionsWithCountsCursorResponseGQL!
+
+    # Get a single Learning Library Collection by ID with all course memberships
+    learningLibraryCollection(
+        id: String!
+        accountId: String
+    ): LearningLibraryCollectionWithCoursesGQL!
+
+    # Get paginated collection items from enrolled collections with filtering support
+    learningLibraryCollectionItems(
+        input: LearningLibraryCollectionItemsQueryInput
+    ): LearningLibraryCollectionItemsResponseGQL!
+
+    # Get a single collection item by ID. User must be enrolled in a collection containing this item.
+    learningLibraryCollectionItem(
+        collectionItemId: String!
+    ): EnrichedLearningLibraryCourseMembershipGQL!
+
+    # Get all collections the user is enrolled in with limited items per collection
+    enrolledLearningLibraryCollections(
+        input: EnrolledLearningLibraryCollectionsQueryInput
+    ): EnrolledLearningLibraryCollectionsResponseGQL!
+
+    # Get a single collection the user is enrolled in with ALL items (no pagination)
+    enrolledLearningLibraryCollection(
+        id: String!
+    ): EnrolledLearningLibraryCollectionGQL!
+
+    # Get all users enrolled in a learning library collection with their Canvas profile data (supports pagination, search, and sorting)
+    collectionEnrollments(
+        collectionId: String!
+        accountId: String!
+        page: Int
+        searchTerm: String
+        sortField: EnrollmentSortField
+        sortDirection: SortDirection
+    ): LearningLibraryCollectionEnrollmentsResponseGQL!
+
+    # Get user's enrolled programs and standalone courses with cursor-based pagination, search, filtering, and sorting
+    learnItems(input: LearnItemsQueryInput): LearnItemsResponseGQL!
+    crmConfigJwt: CrmJwtGQL!
+    testSnowflakeQuery: JSON!
+    getSnowflakeQueryStatus(queryId: String!): String!
+    getSnowflakeQueryResults(queryId: String!): JSON!
+    readCsvFile(key: String!): JSON!
+    widgetFileUrl(key: String!): String!
+    widgetData(
+        widgetType: String!
+        dataScope: String!
+        timeSpan: TimeSpanInput!
+        canvasAccountId: String
+        queryParams: WidgetDataFiltersInput
+    ): WidgetDataResultGQL!
+    widgetsByUser(userAccountId: String!): [WidgetGQL!]!
+    widgetByTypeAndUser(userAccountId: String!, type: String!): WidgetGQL
+    widgetGroupsByUser(userAccountId: String!): [WidgetGroupGQL!]!
+    widgetGroupById(widgetGroupId: String!): WidgetGroupGQL!
+    widgetActions(widgetId: String!): [WidgetActionGQL!]!
+    widgetGroupUserDataByUser(userAccountId: String!): [WidgetGroupUserDataGQL!]!
+
+    # Get users (and metadata) matching the specified criteria
+    users(input: UsersQueryInputGQL!): MetadataUsersGql!
+
+    # Get all distinct metadata key-value pairs for a given account
+    distinctMetadataValues(input: UsersQueryInputGQL!): [UserMetadataGQL!]!
+
+    # Get users (and metadata) reporting to a specified user or the current user
+    userSubordinates(input: UserReportsQueryInputGQL!): MetadataUsersGql!
+
+    # Get people (Canvas users enriched with metadata) from a specific account
+    getPeople(input: PeopleQueryInputGQL!): PeopleResponseGQL!
+
+    # Get people (Canvas users enriched with metadata) by their Canvas UUIDs from a specific account
+    getPeopleByUuid(input: PeopleByUuidQueryInputGQL!): PeopleResponseGQL!
+
+    # Retrieve all insight feed messages for the current user in a specific account.
+    insights(
+        account: String!
+
+        # Data scope for insights (e.g., admin, leader, instructor, designer, ta)
+        scope: String = "admin"
+    ): [InsightMessageModel!]!
+    insightActionLog(account: String!): [InsightActionModel!]!
+    insightAction(action: String!): InsightActionModel
 }
 
 input SkillExtractionStatusInputGQL {
-  # Canvas course ID
-  courseId: String!
+    # Canvas course ID
+    courseId: String!
 
-  # Optional module ID
-  moduleId: String
+    # Optional module ID
+    moduleId: String
 
-  # Optional module item ID
-  moduleItemId: String
+    # Optional module item ID
+    moduleItemId: String
 }
 
 input ProgramFilterInput {
-  # Filter by program publish status
-  publishStatus: ProgramPublishStatus
+    # Filter by program publish status
+    publishStatus: ProgramPublishStatus
 
-  # Filter by program progress state
-  progressState: ProgramProgressState
+    # Filter by program progress state
+    progressState: ProgramProgressState
 }
 
 # The publish status of a program
 enum ProgramPublishStatus {
-  UNPUBLISHED
-  PUBLISHED
-  ARCHIVED
-  DELETED
+    UNPUBLISHED
+    PUBLISHED
+    ARCHIVED
+    DELETED
 }
 
 # The progress state of a program
 enum ProgramProgressState {
-  NOT_STARTED
-  IN_PROGRESS
-  COMPLETED
+    NOT_STARTED
+    IN_PROGRESS
+    COMPLETED
 }
 
 input LearningLibraryCollectionsCursorQueryInput {
-  # Cursor for pagination (ID of the last item from previous page)
-  cursor: String
+    # Cursor for pagination (ID of the last item from previous page)
+    cursor: String
 
-  # Number of items to return (default: 10, max: 100)
-  limit: Int = 20
+    # Number of items to return (default: 10, max: 100)
+    limit: Int = 20
 
-  # Direction to paginate (true = forward/next, false = backward/previous)
-  forward: Boolean = true
-}
+    # Direction to paginate (true = forward/next, false = backward/previous)
+    forward: Boolean = true
 
-input TimeSpanInput {
-  type: TimeSpanType!
-  startDate: DateTime
-  endDate: DateTime
-}
+    # Search term to filter collections by name, publicName, or description (case-insensitive)
+    search: String
 
-enum TimeSpanType {
-  TODAY
-  PAST_7_DAYS
-  PAST_30_DAYS
-  PAST_YEAR
-  CUSTOM
+    # Sort order for collections
+    sortMode: CollectionSortMode = MOST_RECENT
 }
 
-input WidgetDataFiltersInput {
-  courseIds: [Float!]
-  courseId: Float
-  userId: String
-  userUuids: [String!]
-  maxLateAssignments: Float
-  maxMissingAssignments: Float
-  minLowScorePercentage: Float
-  delayDaysAfterAction: Float
-  year: Float
-  month: Float
+# Sort options for learning library collections
+enum CollectionSortMode {
+    # Sort by creation date, newest first
+    MOST_RECENT
+
+    # Sort by name alphabetically (A-Z)
+    NAME_ASC
+
+    # Sort by name reverse alphabetically (Z-A)
+    NAME_DESC
 }
 
-input UsersQueryInputGQL {
-  # UUID of the Canvas root account
-  rootAccountUuid: ID!
+input LearningLibraryCollectionItemsQueryInput {
+    # Cursor for pagination (encoded position of last item)
+    cursor: String
+
+    # Number of items to return (default: 10, max: 100)
+    limit: Int = 10
+
+    # Direction to paginate (true = forward, false = backward)
+    forward: Boolean = true
+
+    # If true, only return items bookmarked by the user
+    bookmarkedOnly: Boolean = false
+
+    # Search term for course/program names (case-insensitive partial match)
+    searchTerm: String
+
+    # Filter by item types
+    types: [CollectionItemType!]
 
-  # Canvas account ID to check permissions against
-  accountId: String
+    # If true, only return items with 100% completion
+    completedOnly: Boolean = false
 
-  # Optional list of Canvas user UUIDs to filter by. If not provided, all users in the root account will be considered.
-  canvasUserUuids: [ID!]
+    # Filter items by a specific collection ID
+    collectionId: String
 
-  # Optional filters to apply to user metadata. Only users with metadata matching ALL filters will be returned.
-  metadataFilters: [MetadataFilterInputGQL!]
+    # Sort order for collection items. Sorts by the canvas course name of the underlying program course for name options.
+    sortBy: CollectionItemSortOption = MOST_RECENT
 }
 
-input MetadataFilterInputGQL {
-  # Key to filter metadata by
-  key: String!
+# Sort options for collection items
+enum CollectionItemSortOption {
+    MOST_RECENT
+    LEAST_RECENT
+    NAME_A_Z
+    NAME_Z_A
+}
 
-  # Optional value to filter metadata by. If not provided, any value for the key will match.
-  value: String
+input EnrolledLearningLibraryCollectionsQueryInput {
+    # Maximum number of items to return per collection (default: 4, min: 1, max: 20)
+    itemLimitPerCollection: Int = 4
 }
 
-input UserReportsQueryInputGQL {
-  # UUID of the Canvas root account
-  rootAccountUuid: ID
+# Fields available for sorting collection enrollments
+enum EnrollmentSortField {
+    ENROLLED_AT
+    CREATED_AT
+}
+
+# Sort direction (ascending or descending)
+enum SortDirection {
+    ASC
+    DESC
+}
 
-  # Canvas account ID to check permissions against
-  accountId: String
+input LearnItemsQueryInput {
+    # Cursor for pagination (opaque item ID from previous page - can be program UUID or Canvas course ID)
+    cursor: String
 
-  # Canvas user UUID of the user whose reports to retrieve
-  canvasUserUuid: ID
+    # Number of items to return per page (default: 4, max: 100)
+    limit: Int = 4
 
-  # Whether to include indirect reports. If false, only direct reports are included.
-  includeIndirectReports: Boolean! = false
+    # Direction to paginate (true = forward/next, false = backward/previous)
+    forward: Boolean = true
+
+    # Search term to filter items by name (case-insensitive, partial match)
+    searchTerm: String
+
+    # Filter by item types (PROGRAM, COURSE). If not provided, returns both types.
+    itemTypes: [LearnItemType!]
+
+    # Filter by completion status (IN_PROGRESS, COMPLETED, NOT_STARTED). If not provided, returns all statuses.
+    status: [LearnItemStatus!]
+
+    # Sort order for items (default: MOST_RECENT)
+    sortBy: LearnItemSortOption = MOST_RECENT
 }
 
-input PeopleQueryInputGQL {
-  # The Canvas account ID (sub-account or root account)
-  accountId: ID!
+# Status of a learn item based on completion percentage
+enum LearnItemStatus {
+    IN_PROGRESS
+    COMPLETED
+    NOT_STARTED
+}
 
-  # Optional search term to filter users
-  searchTerm: String
+# Sort options for learn items (programs and courses)
+enum LearnItemSortOption {
+    # Sort by enrollment date, newest first (most recently enrolled)
+    MOST_RECENT
 
-  # Optional flag to return only users who are leaders, will ignore search term if set to true
-  returnOnlyLeaders: Boolean
+    # Sort by enrollment date, oldest first (least recently enrolled)
+    LEAST_RECENT
 
-  # Optional filters to apply to user metadata. Only users with metadata matching ALL filters will be returned.
-  metadataFilters: [MetadataFilterInputGQL!]
+    # Sort by name alphabetically (A to Z)
+    NAME_A_Z
 
-  # Page number for pagination (1-indexed)
-  page: Int
+    # Sort by name reverse alphabetically (Z to A)
+    NAME_Z_A
 }
 
-input PeopleByUuidQueryInputGQL {
-  # The Canvas account ID (sub-account or root account)
-  accountId: ID!
+input TimeSpanInput {
+    type: TimeSpanType!
+    startDate: DateTime
+    endDate: DateTime
+}
 
-  # List of Canvas user UUIDs to fetch
-  uuids: [String!]!
+enum TimeSpanType {
+    TODAY
+    PAST_7_DAYS
+    PAST_30_DAYS
+    PAST_YEAR
+    CUSTOM
 }
 
-type Mutation {
-  createSkills(input: CreateSkillsInputGQL!): [SkillGQL!]!
-  startSkillExtractionTaskForUser: Boolean!
-  adminDeleteSkills(skillIds: [String!]!): Boolean!
-  adminDeleteExperiences(experienceIds: [String!]!): Boolean!
-  adminRemoveUser(userId: String!): Boolean!
-
-  # Change the skill taxonomy for the given account
-  changeTaxonomySkills(
-    input: ChangeTaxonomySkillsInputGQL!
-  ): ChangeTaxonomySkillsResultGQL!
-  associateSkillsToLearningObjects(
-    input: AssociateSkillsToLearningObjectsInputGQL!
-  ): AssociateSkillsToLearningObjectsResultGQL!
-  upsertSkillTaxonomyGroups(
-    input: UpsertSkillTaxonomyGroupsInputGQL!
-  ): [SkillTaxonomyGroupGQL!]!
-  sendEvent(input: EventInputGQL!): Boolean!
-  createContentLibrary(accountId: ID!): ContentLibraryGQL!
-  updateContentLibrary(args: ContentLibraryInputGQL!): ContentLibraryGQL!
-  createContentVersion(
-    assetId: Float!
-    assetType: AssetTypeEnum!
-    title: String!
-    courseId: ID!
-    syncSettings: SyncSettingsInputGQL!
-  ): ContentVersionGQL!
-  importContentVersion(
-    courseId: ID!
-    contentVersionId: ID!
-    moduleId: ID!
-    detached: Boolean!
-  ): ID!
+input WidgetDataFiltersInput {
+    courseIds: [Float!]
+    courseId: Float
+    userId: String
+    userUuids: [String!]
+    maxLateAssignments: Float
+    maxMissingAssignments: Float
+    minLowScorePercentage: Float
+    delayDaysAfterAction: Float
+    year: Float
+    month: Float
+    cursor: String
+    limit: Int
+}
 
-  # Create a new program
-  createProgram(program: String, accountId: String): ProgramGQL!
+input UsersQueryInputGQL {
+    # UUID of the Canvas root account
+    rootAccountUuid: ID!
 
-  # Update program metadata
-  updateProgramMetadata(
-    metadata: UpdateProgramMetadataGQL!
+    # Canvas account ID to check permissions against
     accountId: String
-  ): ProgramGQL!
 
-  # Delete a program
-  deleteProgram(programId: String!, accountId: String): Boolean!
+    # Optional list of Canvas user UUIDs to filter by. If not provided, all users in the root account will be considered.
+    canvasUserUuids: [ID!]
 
-  # Duplicate an existing program
-  duplicateProgram(programId: String!, accountId: String): ProgramGQL!
+    # Optional filters to apply to user metadata. Only users with metadata matching ALL filters will be returned.
+    metadataFilters: [MetadataFilterInputGQL!]
+}
 
-  # Unenroll a Journey user from a program
-  unenrollUserFromProgram(
-    enrollmentId: String!
-    canvasUUID: String!
-    accountId: String
-  ): Boolean!
+input MetadataFilterInputGQL {
+    # Key to filter metadata by
+    key: String!
 
-  # Enroll multiple Journey users to a program
-  batchEnrollUserToProgram(
-    programId: String!
-    userIds: [String!]!
-    accountId: String
-  ): [ProgramEnrollmentGQL!]!
+    # Optional value to filter metadata by. If not provided, any value for the key will match.
+    value: String
+}
 
-  # Enroll multiple Journey users to multiple programs
-  batchEnrollUsersToPrograms(
-    programIds: [String!]!
-    enrolleeIds: [String!]!
-    accountId: String
-  ): [ProgramEnrollmentGQL!]!
+input UserReportsQueryInputGQL {
+    # UUID of the Canvas root account
+    rootAccountUuid: ID
 
-  # Override program requirements
-  updateProgramRequirements(
-    programId: String!
-    requirements: [UpdateProgramRequirementsRequirementGQL!]!
+    # Canvas account ID to check permissions against
     accountId: String
-  ): [ProgramRequirementGQL!]!
 
-  # Enroll user to program requirement
-  enroll(progressId: String!): ProgramProgressGQL!
+    # Canvas user UUID of the user whose reports to retrieve
+    canvasUserUuid: ID
 
-  # Update learner program progresses. This will force recalculation of all progresses for the learner. It can be filtered by Canvas course ID and URL.
-  updateSelfProgresses(
-    canvasCourseFilter: CanvasCourseFilterInputGQL
-  ): ForceProgressRecalcResultGQL!
+    # Whether to include indirect reports. If false, only direct reports are included.
+    includeIndirectReports: Boolean! = false
+}
 
-  # Create a new empty Learning Library Collection
-  createLearningLibraryCollection(
-    input: CreateLearningLibraryInput
-    accountId: String!
-  ): LearningLibraryGQL!
+input PeopleQueryInputGQL {
+    # The Canvas account ID (sub-account or root account)
+    accountId: ID!
 
-  # Enroll multiple users to multiple learning library collections (creates all user-collection combinations)
-  batchEnrollUsersToCollections(
-    collectionIds: [String!]!
-    userIds: [String!]!
-  ): [LearningLibraryCollectionEnrollmentGQL!]!
-  deleteWidget(id: String!, userAccountId: String!): Boolean!
-  createWidget(input: CreateWidgetInput!, userAccountId: String!): WidgetGQL!
-  updateWidget(
-    id: String!
-    userAccountId: String!
-    input: UpdateWidgetInput!
-  ): WidgetGQL!
-  createWidgetGroup(input: CreateWidgetGroupInput!): WidgetGroupGQL!
-  deleteWidgetGroup(id: String!, userAccountId: String!): Boolean!
-  updateWidgetGroup(
-    id: String!
-    userAccountId: String!
-    input: UpdateWidgetGroupInput!
-  ): WidgetGroupGQL!
-  createWidgetAction(
-    widgetId: String!
-    userAccountId: String!
-    inputs: [CreateWidgetActionInput!]!
-  ): [WidgetActionGQL!]!
-  setWidgetGroupUserData(
-    widgetGroupId: String!
-    userAccountId: String!
-    input: SetWidgetGroupUserDataInput!
-  ): WidgetGroupUserDataGQL!
-
-  # Bulk upsert users and metadata
-  bulkUpsertMetadata(input: BulkUpsertMetadataInputGQL!): MetadataUsersGql!
-
-  # Remove a leader from all users in the specified root account
-  removeLeaderFromAllUsers(input: RemoveLeaderInputGQL!): Boolean!
-
-  #
-  #       Answer a prompt using the Cedar AI service
-  #
-  answerPrompt(prompt: String!): String!
-
-  #
-  #       Execute a GraphQL query or mutation on the Redwood service.
-  #       This is a generic proxy that forwards any GraphQL operation to Redwood
-  #       while preserving user authentication via Canvas JWT.
-  #
-  executeRedwoodQuery(input: RedwoodQueryInput!): RedwoodResponseGQL!
-
-  # Mark an insight feed message as read.
-  markInsightAsRead(insight: String!): Boolean!
-
-  # Mark an insight feed message as dismissed.
-  dismissInsights(insights: [String!]!): Boolean!
-
-  #
-  #       Encourage learners who aren't engaging enough with the platform by sending
-  #       them a motivational email. Returns a handle to the InsightAction.
-  #
-  encourageLearners(
-    insight: String!
-    subject: String!
-    body: String!
-    learners: [String!]!
-    sendIndividualMessages: Boolean!
-  ): String!
-
-  #
-  #       Remind learners to begin a course they were enrolled in by sending them
-  #       an email. Returns a handle to the InsightAction.
-  #
-  remindLearners(
-    insight: String!
-    subject: String!
-    body: String!
-    course: String!
-    learners: [String!]!
-    sendIndividualMessages: Boolean!
-  ): String!
-
-  #
-  #       Recognize top-skill achievers by sending them a motivational message to
-  #       their Canvas Inbox. Returns a handle to the InsightAction.
-  #
-  praiseLearners(
-    insight: String!
-    subject: String!
-    body: String!
-    learners: [String!]!
-    sendIndividualMessages: Boolean!
-  ): String!
+    # Optional search term to filter users
+    searchTerm: String
+
+    # Optional flag to return only users who are leaders, will ignore search term if set to true
+    returnOnlyLeaders: Boolean
+
+    # Optional filters to apply to user metadata. Only users with metadata matching ALL filters will be returned.
+    metadataFilters: [MetadataFilterInputGQL!]
+
+    # Page number for pagination (1-indexed)
+    page: Int
+}
+
+input PeopleByUuidQueryInputGQL {
+    # The Canvas account ID (sub-account or root account)
+    accountId: ID!
+
+    # List of Canvas user UUIDs to fetch
+    uuids: [String!]!
+}
+
+type Mutation {
+    createSkills(input: CreateSkillsInputGQL!): [SkillGQL!]!
+    startSkillExtractionTaskForUser: Boolean!
+    adminDeleteSkills(skillIds: [String!]!): Boolean!
+    adminDeleteExperiences(experienceIds: [String!]!): Boolean!
+    adminRemoveUser(userId: String!): Boolean!
+
+    # Change the skill taxonomy for the given account
+    changeTaxonomySkills(
+        input: ChangeTaxonomySkillsInputGQL!
+    ): ChangeTaxonomySkillsResultGQL!
+    associateSkillsToLearningObjects(
+        input: AssociateSkillsToLearningObjectsInputGQL!
+    ): AssociateSkillsToLearningObjectsResultGQL!
+    upsertSkillTaxonomyGroups(
+        input: UpsertSkillTaxonomyGroupsInputGQL!
+    ): [SkillTaxonomyGroupGQL!]!
+    associateSkillsToCollectionItems(
+        input: AssociateSkillsToCollectionItemsInputGQL!
+    ): AssociateSkillsToCollectionItemsResultGQL!
+    sendEvent(input: EventInputGQL!): Boolean!
+    createContentLibrary(accountId: ID!): ContentLibraryGQL!
+    updateContentLibrary(args: ContentLibraryInputGQL!): ContentLibraryGQL!
+    createContentVersion(
+        assetId: Float!
+        assetType: AssetTypeEnum!
+        title: String!
+        courseId: ID!
+        syncSettings: SyncSettingsInputGQL!
+    ): ContentVersionGQL!
+    importContentVersion(
+        courseId: ID!
+        contentVersionId: ID!
+        moduleId: ID!
+        detached: Boolean!
+    ): ID!
+
+    # Initiates content version import asynchronously. Returns Canvas content migration ID immediately without waiting for completion.
+    importContentVersionAsync(
+        courseId: ID!
+        contentVersionId: ID!
+        moduleId: ID!
+        detached: Boolean!
+    ): ID!
+
+    # Finalizes content version import by creating AssetLink after Canvas migration completes. Verifies migration status before proceeding.
+    finalizeContentVersionImport(
+        courseId: ID!
+        contentVersionId: ID!
+        contentMigrationId: ID!
+        detached: Boolean!
+    ): Boolean!
+
+    # Create a new program
+    createProgram(program: String, accountId: String!): ProgramGQL!
+
+    # Update program metadata
+    updateProgramMetadata(
+        metadata: UpdateProgramMetadataGQL!
+        accountId: String!
+    ): ProgramGQL!
+
+    # Delete a program
+    deleteProgram(programId: String!, accountId: String!): Boolean!
+
+    # Duplicate an existing program
+    duplicateProgram(programId: String!, accountId: String!): ProgramGQL!
+
+    # Unenroll a Journey user from a program
+    unenrollUserFromProgram(
+        enrollmentId: String!
+        canvasUUID: String!
+        accountId: String!
+    ): Boolean!
+
+    # Enroll multiple Journey users to a program
+    batchEnrollUserToProgram(
+        programId: String!
+        userIds: [String!]!
+        accountId: String!
+    ): [ProgramEnrollmentGQL!]!
+
+    # Enroll multiple Journey users to multiple programs
+    batchEnrollUsersToPrograms(
+        programIds: [String!]!
+        enrolleeIds: [String!]!
+        accountId: String!
+    ): [ProgramEnrollmentGQL!]!
+
+    # Override program requirements
+    updateProgramRequirements(
+        programId: String!
+        requirements: [UpdateProgramRequirementsRequirementGQL!]!
+        accountId: String!
+    ): [ProgramRequirementGQL!]!
+
+    # Enroll user to program requirement
+    enroll(progressId: String!): ProgramProgressGQL!
+
+    # Update learner program progresses. This will force recalculation of all progresses for the learner. It can be filtered by Canvas course ID and URL.
+    updateSelfProgresses(
+        canvasCourseFilter: CanvasCourseFilterInputGQL
+    ): ForceProgressRecalcResultGQL!
+
+    # Sync a single course progress from Canvas and trigger recalculation for affected programs. Collections automatically get fresh data via the shared CourseProgressEntity.
+    syncCourseProgress(canvasCourseId: String!): CourseProgressSyncResultGQL!
+
+    # Create a new empty Learning Library Collection
+    createLearningLibraryCollection(
+        input: CreateLearningLibraryInput
+        accountId: String!
+    ): LearningLibraryCollectionGQL!
+
+    # Update a Learning Library Collection
+    updateLearningLibraryCollection(
+        id: String!
+        input: UpdateLearningLibraryCollectionInput!
+    ): LearningLibraryCollectionGQL!
+
+    # Add Canvas courses to a Learning Library collection with metadata enrichment
+    addCoursesToLearningLibraryCollection(
+        input: AddCoursesToCollectionInput!
+    ): [LearningLibraryCourseMembershipGQL!]!
+
+    # Soft delete a Learning Library Collection (uses collection's stored accountId for authorization)
+    deleteLearningLibraryCollection(id: String!): Boolean!
+
+    # Delete a Learning Library Collection item by ID
+    deleteLearningLibraryCollectionItem(itemId: String!): Boolean!
+
+    # Add a learning object (page, quiz, assignment, external URL/tool) to a collection
+    addLearningObjectToCollection(
+        input: AddLearningObjectToCollectionInput!
+    ): LearningLibraryCourseMembershipGQL!
+
+    # Update a learning library item (external URL, external tool, quiz/assessment, or file)
+    updateLearningLibraryItem(
+        input: UpdateLearningLibraryItemInput!
+    ): LearningLibraryCourseMembershipGQL!
+
+    # Initialize an external tool collection item (creates Canvas course and module, returns membership in CREATING state)
+    initializeExternalToolCollectionItem(
+        input: InitializeExternalToolCollectionItemInput!
+    ): LearningLibraryCourseMembershipGQL!
+
+    # Toggle bookmark for a collection item (create if not exists, delete if exists)
+    toggleCollectionItemBookmark(
+        input: ToggleCollectionItemBookmarkInput!
+    ): ToggleCollectionItemBookmarkResponseGQL!
+
+    # Enroll multiple users to multiple learning library collections (creates all user-collection combinations)
+    batchEnrollUsersToCollections(
+        collectionIds: [String!]!
+        userIds: [String!]!
+        accountId: String!
+    ): [LearningLibraryCollectionEnrollmentGQL!]!
+
+    # Unenroll multiple users from a single learning library collection (hard deletes enrollment, progress, and bookmarks)
+    batchUnenrollUsersFromCollection(
+        input: BatchUnenrollUsersFromCollectionInput!
+        accountId: String!
+    ): BatchUnenrollUsersFromCollectionOutput!
+
+    # Enroll the current user in a Canvas course from a collection item
+    enrollLearnerInCollectionItem(
+        input: EnrollLearnerInCollectionItemInput!
+    ): CollectionItemEnrollmentResponseGQL!
+    deleteWidget(id: String!, userAccountId: String!): Boolean!
+    createWidget(input: CreateWidgetInput!, userAccountId: String!): WidgetGQL!
+    updateWidget(
+        id: String!
+        userAccountId: String!
+        input: UpdateWidgetInput!
+    ): WidgetGQL!
+    createWidgetGroup(input: CreateWidgetGroupInput!): WidgetGroupGQL!
+    deleteWidgetGroup(id: String!, userAccountId: String!): Boolean!
+    updateWidgetGroup(
+        id: String!
+        userAccountId: String!
+        input: UpdateWidgetGroupInput!
+    ): WidgetGroupGQL!
+    createWidgetAction(
+        widgetId: String!
+        userAccountId: String!
+        inputs: [CreateWidgetActionInput!]!
+    ): [WidgetActionGQL!]!
+    setWidgetGroupUserData(
+        widgetGroupId: String!
+        userAccountId: String!
+        input: SetWidgetGroupUserDataInput!
+    ): WidgetGroupUserDataGQL!
+
+    # Bulk upsert users and metadata
+    bulkUpsertMetadata(input: BulkUpsertMetadataInputGQL!): MetadataUsersGql!
+
+    # Remove a leader from all users in the specified root account
+    removeLeaderFromAllUsers(input: RemoveLeaderInputGQL!): Boolean!
+
+    # Delete users from Canvas and remove their metadata from Journey
+    deleteUsersFromCanvas(
+        input: DeleteUsersFromCanvasInputGQL!
+    ): DeleteUsersResultGQL!
+
+    #
+    #       Answer a prompt using the Cedar AI service
+    #
+    answerPrompt(prompt: String!): String!
+
+    #
+    #       Execute a GraphQL query or mutation on the Redwood service.
+    #       This is a generic proxy that forwards any GraphQL operation to Redwood
+    #       while preserving user authentication via Canvas JWT.
+    #
+    executeRedwoodQuery(input: RedwoodQueryInput!): RedwoodResponseGQL!
+
+    # Mark an insight feed message as read.
+    markInsightAsRead(insight: String!): Boolean!
+
+    # Mark an insight feed message as dismissed.
+    dismissInsights(insights: [String!]!): Boolean!
+
+    #
+    #       Encourage learners who aren't engaging enough with the platform by sending
+    #       them a motivational email. Returns a handle to the InsightAction.
+    #
+    encourageLearners(
+        insight: String!
+        subject: String!
+        body: String!
+        learners: [String!]!
+        sendIndividualMessages: Boolean!
+    ): String!
+
+    #
+    #       Remind learners to begin a course they were enrolled in by sending them
+    #       an email. Returns a handle to the InsightAction.
+    #
+    remindLearners(
+        insight: String!
+        subject: String!
+        body: String!
+        course: String!
+        learners: [String!]!
+        sendIndividualMessages: Boolean!
+    ): String!
+
+    #
+    #       Recognize top-skill achievers by sending them a motivational message to
+    #       their Canvas Inbox. Returns a handle to the InsightAction.
+    #
+    praiseLearners(
+        insight: String!
+        subject: String!
+        body: String!
+        learners: [String!]!
+        sendIndividualMessages: Boolean!
+    ): String!
 }
 
 input CreateSkillsInputGQL {
-  skills: [CreateSkillInputGQL!]!
-  skillExtractionId: String
+    skills: [CreateSkillInputGQL!]!
+    skillExtractionId: String
 }
 
 input CreateSkillInputGQL {
-  name: String!
+    name: String!
 }
 
 input ChangeTaxonomySkillsInputGQL {
-  # Canvas account ID
-  accountId: String!
+    # Canvas account ID
+    accountId: String!
 
-  # List of skills to be created/updated in the taxonomy
-  skillsToPersist: [CreateOrUpdateTaxonomySkillInputGQL!]!
+    # List of skills to be created/updated in the taxonomy
+    skillsToPersist: [CreateOrUpdateTaxonomySkillInputGQL!]!
 
-  # List of skill IDs to be removed from the taxonomy
-  skillsToDelete: [ID!]!
+    # List of skill IDs to be removed from the taxonomy
+    skillsToDelete: [ID!]!
 
-  # List of skills to be merged into a single skill
-  merges: [MergeSkillsInputGQL!]!
+    # List of skills to be merged into a single skill
+    merges: [MergeSkillsInputGQL!]!
 
-  # If true, bypasses semantic similarity checks and persists immediately
-  skipSimilarityCheck: Boolean! = false
+    # If true, bypasses semantic similarity checks and persists immediately
+    skipSimilarityCheck: Boolean! = false
 }
 
 input CreateOrUpdateTaxonomySkillInputGQL {
-  # Unique identifier for the skill
-  id: ID
+    # Unique identifier for the skill
+    id: ID
 
-  # Name of the skill
-  name: String!
+    # Name of the skill
+    name: String!
 
-  # Description of the skill
-  description: String!
+    # Description of the skill
+    description: String!
 
-  # Group ID to which the skill belongs
-  groupId: String
+    # Group ID to which the skill belongs
+    groupId: String
 }
 
 input MergeSkillsInputGQL {
-  # Resulting skill after merging
-  mergedSkill: CreateOrUpdateTaxonomySkillInputGQL!
+    # Resulting skill after merging
+    mergedSkill: CreateOrUpdateTaxonomySkillInputGQL!
 
-  # List of skill IDs to be merged into the resulting skill
-  sourceSkillIds: [ID!]!
+    # List of skill IDs to be merged into the resulting skill
+    sourceSkillIds: [ID!]!
 }
 
 input AssociateSkillsToLearningObjectsInputGQL {
-  # Unique identifier for the course
-  courseId: String!
-  learningObjects: [CreateOrUpdateAlignmentLearningObjectInputGQL!]!
+    # Unique identifier for the course
+    courseId: String!
+    learningObjects: [CreateOrUpdateAlignmentLearningObjectInputGQL!]!
 
-  # List of skill alignment IDs to delete
-  alignmentsToDelete: [ID!]!
+    # List of skill alignment IDs to delete
+    alignmentsToDelete: [ID!]!
 }
 
 input CreateOrUpdateAlignmentLearningObjectInputGQL {
-  # Unique identifier for the learning object
-  id: ID
+    # Unique identifier for the learning object
+    id: ID
 
-  # Unique identifier of the content behind the module item
-  contentId: String!
+    # Unique identifier of the content behind the module item
+    contentId: String!
 
-  # Type of the learning object
-  type: String!
+    # Type of the learning object
+    type: String!
 
-  # List of skill alignments to create or update for the learning object
-  alignmentsToPersist: [CreateOrUpdateSkillTaxonomyAlignmentInputGQL!]!
+    # List of skill alignments to create or update for the learning object
+    alignmentsToPersist: [CreateOrUpdateSkillTaxonomyAlignmentInputGQL!]!
 }
 
 input CreateOrUpdateSkillTaxonomyAlignmentInputGQL {
-  # Unique identifier for the alignment
-  id: ID
+    # Unique identifier for the alignment
+    id: ID
 
-  # Unique identifier of the module
-  moduleId: String!
+    # Unique identifier of the module
+    moduleId: String!
 
-  # Unique identifier of the module item
-  moduleItemId: String!
+    # Unique identifier of the module item
+    moduleItemId: String!
 
-  # Unique identifier for the skill
-  skillId: ID!
+    # Unique identifier for the skill
+    skillId: ID!
 
-  # Unique identifiers for the proficiency scale values
-  proficiencyScaleValues: [ID!]!
+    # Unique identifiers for the proficiency scale values
+    proficiencyScaleValues: [ID!]!
 }
 
 input UpsertSkillTaxonomyGroupsInputGQL {
-  # Canvas account ID
-  accountId: String!
+    # Canvas account ID
+    accountId: String!
 
-  # List of skill taxonomy groups to be upserted
-  groups: [UpsertSkillTaxonomyGroupInputGQL!]!
+    # List of skill taxonomy groups to be upserted
+    groups: [UpsertSkillTaxonomyGroupInputGQL!]!
 }
 
 input UpsertSkillTaxonomyGroupInputGQL {
-  # The unique identifier of the group, if updating an existing one
-  id: String
+    # The unique identifier of the group, if updating an existing one
+    id: String
+
+    # The name of the skill taxonomy group
+    name: String!
+}
+
+input AssociateSkillsToCollectionItemsInputGQL {
+    # Unique identifier for the learning library collection
+    collectionId: String!
+
+    # List of collection items with skill alignments to create or update
+    learningObjects: [CreateOrUpdateAlignmentCollectionItemInputGQL!]!
 
-  # The name of the skill taxonomy group
-  name: String!
+    # List of skill alignment IDs to delete
+    alignmentsToDelete: [ID!]!
+}
+
+input CreateOrUpdateAlignmentCollectionItemInputGQL {
+    # Unique identifier for the learning object (null to create new)
+    id: ID
+
+    # Unique identifier of the collection item (learning library course membership)
+    collectionItemId: String!
+
+    # List of skill alignments to create or update for the collection item
+    alignmentsToPersist: [CreateOrUpdateCollectionItemAlignmentInputGQL!]!
+}
+
+input CreateOrUpdateCollectionItemAlignmentInputGQL {
+    # Unique identifier for the alignment (null to create new)
+    id: ID
+
+    # Unique identifier for the skill
+    skillId: ID!
+
+    # Unique identifiers for the proficiency scale values
+    proficiencyScaleValues: [ID!]!
 }
 
 input EventInputGQL {
-  eventType: String!
-  courseId: String
-  learningObject: EventLearningObjectInputGQL
-  learningObjectType: String
-  moduleId: String
-  moduleItemId: String
-  accountId: String
+    eventType: String!
+    courseId: String
+    learningObject: EventLearningObjectInputGQL
+    learningObjectType: String
+    moduleId: String
+    moduleItemId: String
+    accountId: String
 }
 
 input EventLearningObjectInputGQL {
-  id: String!
-  type: String!
+    id: String!
+    type: String!
 }
 
 input ContentLibraryInputGQL {
-  id: ID!
-  externalLinksModuleId: ID
-  externalToolsModuleId: ID
-  courseId: ID
+    id: ID!
+    externalLinksModuleId: ID
+    externalToolsModuleId: ID
+    courseId: ID
 }
 
 input SyncSettingsInputGQL {
-  unpublished: Boolean
-  published: Boolean
-  notStarted: Boolean
-  inProgress: Boolean
-  completed: Boolean
-  concluded: Boolean
+    unpublished: Boolean
+    published: Boolean
+    notStarted: Boolean
+    inProgress: Boolean
+    completed: Boolean
+    concluded: Boolean
 }
 
 input UpdateProgramMetadataGQL {
-  id: String!
-  name: String!
-  publicName: String
-  customerId: String
-  description: String
-  publishStatus: String
-  startDate: DateTime
-  endDate: DateTime
-  variant: String
-  courseCompletionCount: Int
-  courseEnrollment: CourseEnrollmentType
+    id: String!
+    name: String!
+    publicName: String
+    customerId: String
+    description: String
+    publishStatus: String
+    startDate: DateTime
+    endDate: DateTime
+    variant: String
+    courseCompletionCount: Int
+    courseEnrollment: CourseEnrollmentType
 }
 
 input UpdateProgramRequirementsRequirementGQL {
-  dependency: ProgramRequirementCourseInputGQL
-  dependent: ProgramRequirementCourseInputGQL!
-  isCompletionRequired: Boolean! = true
-  isPlaceholder: Boolean! = false
-  description: String
+    dependency: ProgramRequirementCourseInputGQL
+    dependent: ProgramRequirementCourseInputGQL!
+    isCompletionRequired: Boolean! = true
+    isPlaceholder: Boolean! = false
+    description: String
 
-  # Course enrollment type for this requirement
-  courseEnrollment: String! = "self-enrollment"
+    # Course enrollment type for this requirement
+    courseEnrollment: String! = "self-enrollment"
 }
 
 input ProgramRequirementCourseInputGQL {
-  canvasCourseId: String!
-  canvasUrl: String!
+    canvasCourseId: String!
+    canvasUrl: String!
 }
 
 input CanvasCourseFilterInputGQL {
-  canvasCourseId: String!
-  canvasUrl: String!
+    canvasCourseId: String!
+    canvasUrl: String!
 }
 
 input CreateLearningLibraryInput {
-  # Internal name of the learning library collection
-  name: String
+    # Internal name of the learning library collection
+    name: String
 
-  # Public-facing name of the collection
-  publicName: String
+    # Public-facing name of the collection
+    publicName: String
 
-  # Description of the collection
-  description: String
+    # Description of the collection
+    description: String
+}
+
+input UpdateLearningLibraryCollectionInput {
+    # Internal name of the learning library collection
+    name: String!
+
+    # Public-facing name of the collection
+    publicName: String
+
+    # Description of the collection
+    description: String
+}
+
+input AddCoursesToCollectionInput {
+    # Learning Library Collection ID
+    collectionId: String!
+
+    # Array of Canvas course IDs to add
+    courseIds: [String!]!
+}
+
+input AddLearningObjectToCollectionInput {
+    # Learning Library Collection ID
+    collectionId: String!
+
+    # Type of learning object to add
+    itemType: CollectionItemType!
+
+    # Title of the item. Required for EXTERNAL_URL and EXTERNAL_TOOL. Optional for PAGE (defaults to "New Page").
+    title: String
+
+    # Body content of the page. Required for PAGE items.
+    body: String
+
+    # Name of the item. Required for QUIZ and ASSIGNMENT items.
+    name: String
+
+    # External URL. Required for EXTERNAL_URL and EXTERNAL_TOOL items.
+    externalUrl: String
+
+    # Whether the URL should open in a new tab. Required for EXTERNAL_URL and EXTERNAL_TOOL items.
+    newTab: Boolean
+
+    # Canvas course ID from a previously initialized external tool item. Required for EXTERNAL_TOOL items when completing a two-phase creation.
+    canvasCourseId: String
+}
+
+input UpdateLearningLibraryItemInput {
+    # ID of the LearningLibraryCourseMembership to update
+    itemId: String!
+
+    # Name/title of the item. Updates the Canvas course name and the module item title.
+    name: String
+
+    # Body/content of the item. Applies to page items only.
+    body: String
+
+    # Whether the item should open in a new tab. Applies to external URL, external tool, and file items.
+    newTab: Boolean
+
+    # External URL. Applies to external URL and external tool items.
+    externalUrl: String
+
+    # Grading type. Applies to assessment (quiz) items.
+    gradingType: GradingType
+
+    # Points possible. Applies to assessment (quiz) items.
+    pointsPossible: Int
+
+    # Estimated duration in minutes. Applies to assessment (quiz) and file items.
+    estimatedDurationMinutes: Int
+}
+
+# Grading type for assessments
+enum GradingType {
+    POINTS
+    PERCENTAGE
+    GPA_SCALE
+    PASS_FAIL
+    NOT_GRADED
+}
+
+input InitializeExternalToolCollectionItemInput {
+    # Learning Library Collection ID
+    collectionId: String!
+}
+
+input ToggleCollectionItemBookmarkInput {
+    # Collection item (course membership) ID to toggle bookmark for
+    collectionItemId: String!
+}
+
+input BatchUnenrollUsersFromCollectionInput {
+    # The ID of the collection to unenroll users from
+    collectionId: String!
+
+    # Array of Canvas user IDs to unenroll from the collection
+    userIds: [String!]!
+}
+
+input EnrollLearnerInCollectionItemInput {
+    # The collection item (course membership) ID to enroll in
+    collectionItemId: String!
 }
 
 input CreateWidgetInput {
-  type: String!
-  queryParams: WidgetParamsInput!
-  position: Int
-  widgetGroupId: String
-  prismQueryId: String
+    type: String!
+    queryParams: WidgetParamsInput!
+    position: Int
+    colSpan: Int
+    widgetGroupId: String
+    prismQueryId: String
 }
 
 input WidgetParamsInput {
-  courseIds: [Float!]
-  courseId: Float
-  userId: String
-  userUuids: [String!]
-  maxLateAssignments: Float
-  maxMissingAssignments: Float
-  minLowScorePercentage: Float
-  delayDaysAfterAction: Float
-  year: Float
-  month: Float
+    courseIds: [Float!]
+    courseId: Float
+    userId: String
+    userUuids: [String!]
+    maxLateAssignments: Float
+    maxMissingAssignments: Float
+    minLowScorePercentage: Float
+    delayDaysAfterAction: Float
+    year: Float
+    month: Float
 }
 
 input UpdateWidgetInput {
-  type: String
-  queryParams: WidgetParamsInput
-  position: Int
-  prismQueryId: String
+    type: String
+    queryParams: WidgetParamsInput
+    position: Int
+    colSpan: Int
+    prismQueryId: String
 }
 
 input CreateWidgetGroupInput {
-  name: String!
-  userAccountId: ID!
-  description: String
-  widgets: [CreateWidgetInput!]
+    name: String!
+    userAccountId: ID!
+    description: String
+    widgets: [CreateWidgetInput!]
 }
 
 input UpdateWidgetGroupInput {
-  name: String
-  description: String
-  updatedWidgets: [UpdatedWidgetInGroupInput!]
-  newWidgets: [CreateWidgetInput!]
+    name: String
+    description: String
+    updatedWidgets: [UpdatedWidgetInGroupInput!]
+    newWidgets: [CreateWidgetInput!]
 }
 
 input UpdatedWidgetInGroupInput {
-  id: String!
-  position: Int!
+    id: String!
+    position: Int!
+    colSpan: Int
 }
 
 input CreateWidgetActionInput {
-  action: String!
-  canvasUserUuid: String!
-  courseId: String!
-  actionReason: String!
+    action: String!
+    canvasUserUuid: String!
+    courseId: String!
+    actionReason: String!
 }
 
 input SetWidgetGroupUserDataInput {
-  isPinned: Boolean
-  lastCheckedAt: DateTime
+    isPinned: Boolean
+    lastCheckedAt: DateTime
 }
 
 input BulkUpsertMetadataInputGQL {
-  # List of users with their metadata to upsert
-  users: [MetadataUserInputGQL!]!
+    # List of users with their metadata to upsert
+    users: [MetadataUserInputGQL!]!
 }
 
 input MetadataUserInputGQL {
-  # UUID of the user's Canvas root account
-  canvasRootAccountUuid: ID!
+    # UUID of the user's Canvas root account
+    canvasRootAccountUuid: ID!
 
-  # User's Canvas UUID
-  canvasUserUuid: ID!
+    # User's Canvas UUID
+    canvasUserUuid: ID!
 
-  # List of user's leaders Canvas UUIDs. Set to null to delete the leader association.
-  leaderCanvasUserUuids: [ID!]
+    # List of user's leaders Canvas UUIDs. Set to null to delete the leader association.
+    leaderCanvasUserUuids: [ID!]
 
-  # List of metadata to upsert for this user
-  metadata: [UserMetadataInputGQL!]
+    # List of metadata to upsert for this user
+    metadata: [UserMetadataInputGQL!]
 }
 
 input UserMetadataInputGQL {
-  # Key for the metadata
-  key: String!
+    # Key for the metadata
+    key: String!
 
-  # Value for the metadata. Set to null to delete the metadata entry.
-  value: String
+    # Value for the metadata. Set to null to delete the metadata entry.
+    value: String
 }
 
 input RemoveLeaderInputGQL {
-  # UUID of the leader to be removed from all users
-  userUuid: String!
+    # UUID of the leader to be removed from all users
+    userUuid: String!
+}
+
+input DeleteUsersFromCanvasInputGQL {
+    # UUID of the Canvas root account
+    rootAccountUuid: ID!
+
+    # ID of the Canvas root account
+    accountId: ID!
+
+    # List of Canvas user UUIDs
+    userUuids: [ID!]!
+
+    # List of Canvas user IDs
+    userIds: [ID!]!
 }
 
 input RedwoodQueryInput {
-  # GraphQL query or mutation string to execute on Redwood
-  query: String!
+    # GraphQL query or mutation string to execute on Redwood
+    query: String!
 
-  # Variables for the GraphQL operation
-  variables: JSON
+    # Variables for the GraphQL operation
+    variables: JSON
 
-  # Name of the operation to execute (if query contains multiple)
-  operationName: String
+    # Name of the operation to execute (if query contains multiple)
+    operationName: String
 }
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/SubmissionStateTypeAdapter.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/SubmissionStateTypeAdapter.kt
index aebfa80881..32787da82d 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/SubmissionStateTypeAdapter.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/SubmissionStateTypeAdapter.kt
@@ -20,6 +20,7 @@ import com.google.gson.*
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
 import com.instructure.canvasapi2.models.SubmissionState
+import com.instructure.canvasapi2.utils.toDate
 import java.lang.reflect.Type
 
 class SubmissionStateTypeAdapter : JsonDeserializer<SubmissionState?> {
@@ -34,7 +35,8 @@ class SubmissionStateTypeAdapter : JsonDeserializer<SubmissionState?> {
             val needsGrading = json.asJsonObject?.get("needs_grading")?.asBoolean ?: false
             val withFeedback = json.asJsonObject?.get("with_feedback")?.asBoolean ?: false
             val redoRequest = json.asJsonObject?.get("redo_request")?.asBoolean ?: false
-            return SubmissionState(submitted, missing, late, excused, graded, needsGrading, withFeedback, redoRequest)
+            val postedAt = json.asJsonObject?.get("posted_at")?.takeIf { !it.isJsonNull }?.asString?.toDate()
+            return SubmissionState(submitted, missing, late, excused, graded, needsGrading, withFeedback, redoRequest, postedAt)
         } else {
             return null
         }
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/AccountDomainAPI.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/AccountDomainAPI.kt
index 037ff195e1..df900a20fb 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/AccountDomainAPI.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/AccountDomainAPI.kt
@@ -17,39 +17,25 @@
 
 package com.instructure.canvasapi2.apis
 
-import com.instructure.canvasapi2.StatusCallback
-import com.instructure.canvasapi2.builders.RestBuilder
 import com.instructure.canvasapi2.builders.RestParams
 import com.instructure.canvasapi2.models.AccountDomain
-
-import retrofit2.Call
+import com.instructure.canvasapi2.utils.DataResult
 import retrofit2.http.GET
 import retrofit2.http.Query
+import retrofit2.http.Tag
 import retrofit2.http.Url
 
+interface AccountDomainInterface {
 
-object AccountDomainAPI {
-    private const val DEFAULT_DOMAIN = "https://sso.canvaslms.com/"
-
-    interface AccountDomainInterface {
-        @GET
-        fun next(@Url nextURL: String): Call<List<AccountDomain>>
-
-        @GET("accounts/search")
-        fun campusSearch(@Query("search_term") term: String): Call<List<AccountDomain>>
-    }
-
-    fun searchAccounts(query: String?, callback: StatusCallback<List<AccountDomain>>) {
-        if (query == null || query.length < 3) return
-
-        val adapter = RestBuilder(callback)
-        val params = RestParams(
-                shouldIgnoreToken = true,
-                usePerPageQueryParam = true,
-                isForceReadFromNetwork = true,
-                domain = DEFAULT_DOMAIN
-        )
+    @GET
+    suspend fun next(
+        @Url nextURL: String,
+        @Tag restParams: RestParams
+    ): DataResult<List<AccountDomain>>
 
-        callback.addCall(adapter.build(AccountDomainInterface::class.java, params).campusSearch(query)).enqueue(callback)
-    }
+    @GET("accounts/search")
+    suspend fun campusSearch(
+        @Query("search_term") term: String,
+        @Tag restParams: RestParams
+    ): DataResult<List<AccountDomain>>
 }
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/JourneyAssistAPI.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/JourneyAssistAPI.kt
index 0e7db49635..94f6076ab9 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/JourneyAssistAPI.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/apis/JourneyAssistAPI.kt
@@ -1,7 +1,7 @@
 package com.instructure.canvasapi2.apis
 
-import com.instructure.canvasapi2.models.journey.JourneyAssistRequestBody
-import com.instructure.canvasapi2.models.journey.JourneyAssistResponse
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRequestBody
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/builders/RestParams.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/builders/RestParams.kt
index a2d3017807..6073636718 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/builders/RestParams.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/builders/RestParams.kt
@@ -33,5 +33,6 @@ data class RestParams(
     val isForceReadFromNetwork: Boolean = false,
     val acceptLanguageOverride: String? = null,
     val disableFileVerifiers: Boolean = true,
-    val shouldLoginOnTokenError: Boolean = true
+    val shouldLoginOnTokenError: Boolean = true,
+    val shouldRefreshToken: Boolean = true
 ) : Parcelable
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/ApiModule.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/ApiModule.kt
index bdb4ea6f4b..c9540cdeeb 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/ApiModule.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/ApiModule.kt
@@ -3,6 +3,7 @@ package com.instructure.canvasapi2.di
 import android.content.Context
 import com.instructure.canvasapi2.LoginRouter
 import com.instructure.canvasapi2.TokenRefresher
+import com.instructure.canvasapi2.apis.AccountDomainInterface
 import com.instructure.canvasapi2.apis.AccountNotificationAPI
 import com.instructure.canvasapi2.apis.AnnouncementAPI
 import com.instructure.canvasapi2.apis.AssignmentAPI
@@ -84,7 +85,7 @@ import javax.inject.Named
 import javax.inject.Singleton
 
 const val PLANNER_API_SERIALIZE_NULLS = "PLANNER_API_SERIALIZE_NULLS"
-
+private const val DEFAULT_DOMAIN = "https://sso.canvaslms.com/"
 @Module
 @InstallIn(SingletonComponent::class)
 class ApiModule {
@@ -451,6 +452,17 @@ class ApiModule {
     fun provideHelpLinksInterfaceApi(): HelpLinksAPI.HelpLinksAPI {
         return RestBuilder().build(HelpLinksAPI.HelpLinksAPI::class.java, RestParams())
     }
+
+    @Provides
+    fun provideAccountDomainApi(): AccountDomainInterface {
+        return RestBuilder().build(
+            AccountDomainInterface::class.java,
+            RestParams(
+                shouldIgnoreToken = true,
+                domain = DEFAULT_DOMAIN
+            )
+        )
+    }
 }
 
 @EarlyEntryPoint
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/graphql/JourneyModule.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/graphql/JourneyModule.kt
index 823d5d9bd2..9644da3ecd 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/graphql/JourneyModule.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/di/graphql/JourneyModule.kt
@@ -18,12 +18,16 @@ package com.instructure.canvasapi2.di.graphql
 
 import com.apollographql.apollo.ApolloClient
 import com.instructure.canvasapi2.di.JourneyApolloClient
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManagerImpl
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramManagerImpl
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetSkillsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetSkillsManagerImpl
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetWidgetsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetWidgetsManagerImpl
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManagerImpl
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.JourneyRedwoodManagerImpl
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.RedwoodApiManager
 import dagger.Module
@@ -62,4 +66,18 @@ class JourneyModule {
         return JourneyRedwoodManagerImpl(journeyClient)
     }
 
+    @Provides
+    fun provideGetLearningLibraryManager(
+        @JourneyApolloClient journeyClient: ApolloClient
+    ): GetLearningLibraryManager {
+        return GetLearningLibraryManagerImpl(journeyClient)
+    }
+
+    @Provides
+    fun provideMyContentManager(
+        @JourneyApolloClient journeyClient: ApolloClient
+    ): MyContentManager {
+        return MyContentManagerImpl(journeyClient)
+    }
+
 }
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/OAuthManager.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/OAuthManager.kt
index e3bc6ca538..0af408c137 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/OAuthManager.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/OAuthManager.kt
@@ -50,9 +50,9 @@ object OAuthManager {
 
     fun getAuthenticatedSessionAsync(targetUrl: String) = apiAsync<AuthenticatedSession> { getAuthenticatedSession(targetUrl, it) }
 
-    fun getAuthenticatedSession(targetUrl: String, callback: StatusCallback<AuthenticatedSession>, domain: String? = null) {
+    fun getAuthenticatedSession(targetUrl: String, callback: StatusCallback<AuthenticatedSession>, domain: String? = null, shouldRefreshToken: Boolean = true) {
         val adapter = RestBuilder(callback)
-        val params = RestParams(isForceReadFromNetwork = true, domain = domain)
+        val params = RestParams(isForceReadFromNetwork = true, domain = domain, shouldRefreshToken = shouldRefreshToken)
         Logger.d("targetURL to be authed: $targetUrl")
         val userId = ApiPrefs.user?.id
         if (ApiPrefs.isMasquerading && userId != null) {
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/graphql/horizon/journey/GetLearningLibraryManager.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/graphql/horizon/journey/GetLearningLibraryManager.kt
new file mode 100644
index 0000000000..7071ea384b
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/graphql/horizon/journey/GetLearningLibraryManager.kt
@@ -0,0 +1,439 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.managers.graphql.horizon.journey
+
+import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.api.Optional
+import com.instructure.canvasapi2.di.JourneyApolloClient
+import com.instructure.canvasapi2.enqueueMutation
+import com.instructure.canvasapi2.enqueueQuery
+import com.instructure.canvasapi2.models.ModuleItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollectionsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItemsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryModuleInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageCursor
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import com.instructure.canvasapi2.models.journey.learninglibrary.RecommendationSourceContext
+import com.instructure.canvasapi2.models.journey.learninglibrary.toApolloType
+import com.instructure.canvasapi2.models.journey.learninglibrary.toModel
+import com.instructure.journey.EnrollLearningLibraryItemMutation
+import com.instructure.journey.GetEnrolledLearningLibraryCollectionQuery
+import com.instructure.journey.GetEnrolledLearningLibraryCollectionsQuery
+import com.instructure.journey.GetLearningLibraryCollectionItemQuery
+import com.instructure.journey.GetLearningLibraryCollectionItemsQuery
+import com.instructure.journey.GetLearningLibraryRecommendationsQuery
+import com.instructure.journey.ToggleLearningLibraryItemIsBookmarkedMutation
+import com.instructure.journey.type.EnrollLearnerInCollectionItemInput
+import com.instructure.journey.type.ToggleCollectionItemBookmarkInput
+import javax.inject.Inject
+
+interface GetLearningLibraryManager {
+    suspend fun getLearningLibraryCollectionItems(
+        cursor: String? = null,
+        limit: Int? = null,
+        forward: Boolean? = null,
+        bookmarkedOnly: Boolean? = null,
+        searchTerm: String? = null,
+        types: List<CollectionItemType>? = null,
+        completedOnly: Boolean? = null,
+        sortBy: CollectionItemSortOption? = null,
+        forceNetwork: Boolean = false
+    ): LearningLibraryCollectionItemsResponse
+
+    suspend fun getEnrolledLearningLibraryCollections(
+        itemLimitPerCollection: Int? = null,
+        forceNetwork: Boolean = false
+    ): EnrolledLearningLibraryCollectionsResponse
+
+    suspend fun getEnrolledLearningLibraryCollection(
+        id: String,
+        forceNetwork: Boolean = false
+    ): EnrolledLearningLibraryCollection
+
+    suspend fun toggleLearningLibraryItemIsBookmarked(itemId: String): Boolean
+
+    suspend fun enrollLearningLibraryItem(itemId: String): LearningLibraryCollectionItem
+
+    suspend fun getLearningLibraryItem(itemId: String, forceNetwork: Boolean): LearningLibraryCollectionItem
+
+    suspend fun getLearningLibraryRecommendations(forceNetwork: Boolean): List<LearningLibraryRecommendation>
+}
+
+class GetLearningLibraryManagerImpl @Inject constructor(
+    @JourneyApolloClient private val journeyClient: ApolloClient,
+): GetLearningLibraryManager {
+    override suspend fun getLearningLibraryCollectionItems(
+        cursor: String?,
+        limit: Int?,
+        forward: Boolean?,
+        bookmarkedOnly: Boolean?,
+        searchTerm: String?,
+        types: List<CollectionItemType>?,
+        completedOnly: Boolean?,
+        sortBy: CollectionItemSortOption?,
+        forceNetwork: Boolean
+    ): LearningLibraryCollectionItemsResponse {
+        val query = GetLearningLibraryCollectionItemsQuery(
+            Optional.presentIfNotNull(cursor),
+            Optional.presentIfNotNull(limit),
+            Optional.presentIfNotNull(forward),
+            Optional.presentIfNotNull(bookmarkedOnly),
+            Optional.presentIfNotNull(searchTerm),
+            Optional.presentIfNotNull(types?.map { it.toApolloType() }),
+            Optional.presentIfNotNull(completedOnly),
+            sortBy = Optional.presentIfNotNull(sortBy?.toApolloModel())
+        )
+        val result = journeyClient.enqueueQuery(query, forceNetwork = forceNetwork).dataOrThrow().learningLibraryCollectionItems
+
+        return LearningLibraryCollectionItemsResponse(
+            items = result.items.map { item ->
+                LearningLibraryCollectionItem(
+                    id = item.id,
+                    libraryId = item.libraryId,
+                    itemType = item.itemType.toModel(),
+                    displayOrder = item.displayOrder,
+                    canvasCourse = item.canvasCourse?.let { course ->
+                        CanvasCourseInfo(
+                            courseId = course.courseId,
+                            canvasUrl = course.canvasUrl,
+                            courseName = course.courseName,
+                            courseImageUrl = course.courseImageUrl,
+                            moduleCount = course.moduleCount,
+                            moduleItemCount = course.moduleItemCount,
+                            estimatedDurationMinutes = course.estimatedDurationMinutes
+                        )
+                    },
+                    moduleInfo = if (item.canvasModuleItemId != null) {
+                        LearningLibraryModuleInfo(
+                            moduleId = item.canvasModuleId,
+                            moduleItemId = item.canvasModuleItemId,
+                            resourceId = item.canvasResourceId,
+                            moduleItemType = item.itemType.toModuleItemType()?.name
+                        )
+                    } else {
+                        null
+                    },
+                    programId = item.programId,
+                    programCourseId = item.programCourseId,
+                    createdAt = item.createdAt,
+                    updatedAt = item.updatedAt,
+                    isBookmarked = item.isBookmarked,
+                    completionPercentage = item.completionPercentage,
+                    isEnrolledInCanvas = item.isEnrolledInCanvas,
+                    canvasEnrollmentId = item.canvasEnrollmentId
+                )
+            },
+            pageInfo = LearningLibraryPageInfo(
+                nextCursor = result.pageInfo.nextCursor,
+                previousCursor = result.pageInfo.previousCursor,
+                hasNextPage = result.pageInfo.hasNextPage,
+                hasPreviousPage = result.pageInfo.hasPreviousPage,
+                totalCount = result.pageInfo.totalCount,
+                pageCursors = result.pageInfo.pageCursors?.mapNotNull {
+                    LearningLibraryPageCursor(
+                        cursor = it.cursor ?: return@mapNotNull null,
+                        page = it.page
+                    )
+                }
+            )
+        )
+    }
+
+    override suspend fun getEnrolledLearningLibraryCollections(
+        itemLimitPerCollection: Int?,
+        forceNetwork: Boolean
+    ): EnrolledLearningLibraryCollectionsResponse {
+        val query = GetEnrolledLearningLibraryCollectionsQuery(
+            Optional.presentIfNotNull(itemLimitPerCollection)
+        )
+        val result = journeyClient.enqueueQuery(query, forceNetwork = forceNetwork).dataOrThrow().enrolledLearningLibraryCollections
+
+        return EnrolledLearningLibraryCollectionsResponse(
+            collections = result.collections.map { collection ->
+                EnrolledLearningLibraryCollection(
+                    id = collection.id,
+                    name = collection.name,
+                    publicName = collection.publicName,
+                    description = collection.description,
+                    createdAt = collection.createdAt,
+                    updatedAt = collection.updatedAt,
+                    totalItemCount = collection.totalItemCount,
+                    items = collection.items.map { item ->
+                        LearningLibraryCollectionItem(
+                            id = item.id,
+                            libraryId = item.libraryId,
+                            itemType = item.itemType.toModel(),
+                            displayOrder = item.displayOrder,
+                            canvasCourse = item.canvasCourse?.let { course ->
+                                CanvasCourseInfo(
+                                    courseId = course.courseId,
+                                    canvasUrl = course.canvasUrl,
+                                    courseName = course.courseName,
+                                    courseImageUrl = course.courseImageUrl,
+                                    moduleCount = course.moduleCount,
+                                    moduleItemCount = course.moduleItemCount,
+                                    estimatedDurationMinutes = course.estimatedDurationMinutes
+                                )
+                            },
+                            moduleInfo = if (item.canvasModuleItemId != null) {
+                                LearningLibraryModuleInfo(
+                                    moduleId = item.canvasModuleId,
+                                    moduleItemId = item.canvasModuleItemId,
+                                    resourceId = item.canvasResourceId,
+                                    moduleItemType = item.itemType.toModuleItemType()?.name
+                                )
+                            } else {
+                                null
+                            },
+                            programId = item.programId,
+                            programCourseId = item.programCourseId,
+                            createdAt = item.createdAt,
+                            updatedAt = item.updatedAt,
+                            isBookmarked = item.isBookmarked,
+                            completionPercentage = item.completionPercentage,
+                            isEnrolledInCanvas = item.isEnrolledInCanvas,
+                            canvasEnrollmentId = item.canvasEnrollmentId
+                        )
+                    }
+                )
+            }
+        )
+    }
+
+    override suspend fun getEnrolledLearningLibraryCollection(
+        id: String,
+        forceNetwork: Boolean
+    ): EnrolledLearningLibraryCollection {
+        val query = GetEnrolledLearningLibraryCollectionQuery(id)
+        val result = journeyClient.enqueueQuery(query, forceNetwork = forceNetwork).dataOrThrow().enrolledLearningLibraryCollection
+
+        return EnrolledLearningLibraryCollection(
+            id = result.id,
+            name = result.name,
+            publicName = result.publicName,
+            description = result.description,
+            createdAt = result.createdAt,
+            updatedAt = result.updatedAt,
+            totalItemCount = result.totalItemCount,
+            items = result.items.map { item ->
+                LearningLibraryCollectionItem(
+                    id = item.id,
+                    libraryId = item.libraryId,
+                    itemType = item.itemType.toModel(),
+                    displayOrder = item.displayOrder,
+                    canvasCourse = item.canvasCourse?.let { course ->
+                        CanvasCourseInfo(
+                            courseId = course.courseId,
+                            canvasUrl = course.canvasUrl,
+                            courseName = course.courseName,
+                            courseImageUrl = course.courseImageUrl,
+                            moduleCount = course.moduleCount,
+                            moduleItemCount = course.moduleItemCount,
+                            estimatedDurationMinutes = course.estimatedDurationMinutes
+                        )
+                    },
+                    moduleInfo = if (item.canvasModuleItemId != null) {
+                        LearningLibraryModuleInfo(
+                            moduleId = item.canvasModuleId,
+                            moduleItemId = item.canvasModuleItemId,
+                            resourceId = item.canvasResourceId,
+                            moduleItemType = item.itemType.toModuleItemType()?.name
+                        )
+                    } else {
+                        null
+                    },
+                    programId = item.programId,
+                    programCourseId = item.programCourseId,
+                    createdAt = item.createdAt,
+                    updatedAt = item.updatedAt,
+                    isBookmarked = item.isBookmarked,
+                    completionPercentage = item.completionPercentage,
+                    isEnrolledInCanvas = item.isEnrolledInCanvas,
+                    canvasEnrollmentId = item.canvasEnrollmentId
+                )
+            }
+        )
+    }
+
+    override suspend fun toggleLearningLibraryItemIsBookmarked(itemId: String): Boolean {
+        val mutation = ToggleLearningLibraryItemIsBookmarkedMutation(
+            ToggleCollectionItemBookmarkInput(itemId)
+        )
+        val result = journeyClient.enqueueMutation(mutation).dataOrThrow().toggleCollectionItemBookmark
+
+        return result.isBookmarked
+    }
+
+    override suspend fun enrollLearningLibraryItem(itemId: String): LearningLibraryCollectionItem {
+        val mutation = EnrollLearningLibraryItemMutation(
+            EnrollLearnerInCollectionItemInput(itemId)
+        )
+        val result = journeyClient.enqueueMutation(mutation).dataOrThrow().enrollLearnerInCollectionItem
+
+        return LearningLibraryCollectionItem(
+            id = result.item.id,
+            libraryId = result.item.libraryId,
+            itemType = result.item.itemType.toModel(),
+            displayOrder = result.item.displayOrder,
+            canvasCourse = result.item.canvasCourse?.let { course ->
+                CanvasCourseInfo(
+                    courseId = course.courseId,
+                    canvasUrl = course.canvasUrl,
+                    courseName = course.courseName,
+                    courseImageUrl = course.courseImageUrl,
+                    moduleCount = course.moduleCount,
+                    moduleItemCount = course.moduleItemCount,
+                    estimatedDurationMinutes = course.estimatedDurationMinutes
+                )
+            },
+            moduleInfo = if (result.item.canvasModuleItemId != null) {
+                LearningLibraryModuleInfo(
+                    moduleId = result.item.canvasModuleId,
+                    moduleItemId = result.item.canvasModuleItemId,
+                    resourceId = result.item.canvasResourceId,
+                    moduleItemType = result.item.itemType.toModuleItemType()?.name
+                )
+            } else {
+                null
+            },
+            programId = result.item.programId,
+            programCourseId = result.item.programCourseId,
+            createdAt = result.item.createdAt,
+            updatedAt = result.item.updatedAt,
+            isBookmarked = result.item.isBookmarked,
+            completionPercentage = result.item.completionPercentage,
+            isEnrolledInCanvas = result.item.isEnrolledInCanvas,
+            canvasEnrollmentId = result.item.canvasEnrollmentId
+        )
+    }
+
+    override suspend fun getLearningLibraryItem(itemId: String, forceNetwork: Boolean): LearningLibraryCollectionItem {
+        val query = GetLearningLibraryCollectionItemQuery(itemId)
+
+        val result = journeyClient.enqueueQuery(query, forceNetwork).dataOrThrow().learningLibraryCollectionItem
+
+        return LearningLibraryCollectionItem(
+            id = result.id,
+            libraryId = result.libraryId,
+            itemType = result.itemType.toModel(),
+            displayOrder = result.displayOrder,
+            canvasCourse = result.canvasCourse?.let { course ->
+                CanvasCourseInfo(
+                    courseId = course.courseId,
+                    canvasUrl = course.canvasUrl,
+                    courseName = course.courseName,
+                    courseImageUrl = course.courseImageUrl,
+                    moduleCount = course.moduleCount,
+                    moduleItemCount = course.moduleItemCount,
+                    estimatedDurationMinutes = course.estimatedDurationMinutes
+                )
+            },
+            moduleInfo = if (result.canvasModuleItemId != null) {
+                LearningLibraryModuleInfo(
+                    moduleId = result.canvasModuleId,
+                    moduleItemId = result.canvasModuleItemId,
+                    resourceId = result.canvasResourceId,
+                    moduleItemType = result.itemType.toModuleItemType()?.name
+                )
+            } else {
+                null
+            },
+            programId = result.programId,
+            programCourseId = result.programCourseId,
+            createdAt = result.createdAt,
+            updatedAt = result.updatedAt,
+            isBookmarked = result.isBookmarked,
+            completionPercentage = result.completionPercentage,
+            isEnrolledInCanvas = result.isEnrolledInCanvas,
+            canvasEnrollmentId = result.canvasEnrollmentId
+        )
+    }
+
+    override suspend fun getLearningLibraryRecommendations(forceNetwork: Boolean): List<LearningLibraryRecommendation> {
+        val query = GetLearningLibraryRecommendationsQuery()
+        val result = journeyClient.enqueueQuery(query, forceNetwork).dataOrThrow().learningRecommendations.recommendations
+
+        return result.mapNotNull { recommendation ->
+            LearningLibraryRecommendation(
+                courseId = recommendation.courseId,
+                primaryReason = recommendation.primaryReason.toModel(),
+                sourceContext = RecommendationSourceContext(
+                    sourceCourseId = recommendation.sourceContext?.sourceCourseId,
+                    sourceCourseName = recommendation.sourceContext?.sourceCourseName,
+                    sourceSkillName = recommendation.sourceContext?.sourceSkillName
+                ),
+                popularityCount = recommendation.popularityCount,
+                item = recommendation.membership?.let { membership->
+                    LearningLibraryCollectionItem(
+                        id = membership.id,
+                        libraryId = membership.libraryId,
+                        itemType = membership.itemType.toModel(),
+                        displayOrder = membership.displayOrder,
+                        canvasCourse = membership.canvasCourse?.let { course ->
+                            CanvasCourseInfo(
+                                courseId = course.courseId,
+                                canvasUrl = course.canvasUrl,
+                                courseName = course.courseName,
+                                courseImageUrl = course.courseImageUrl,
+                                moduleCount = course.moduleCount,
+                                moduleItemCount = course.moduleItemCount,
+                                estimatedDurationMinutes = course.estimatedDurationMinutes
+                            )
+                        },
+                        moduleInfo = if (membership.canvasModuleItemId != null) {
+                            LearningLibraryModuleInfo(
+                                moduleId = membership.canvasModuleId,
+                                moduleItemId = membership.canvasModuleItemId,
+                                resourceId = membership.canvasResourceId,
+                                moduleItemType = membership.itemType.toModuleItemType()?.name
+                            )
+                        } else {
+                            null
+                        },
+                        programId = membership.programId,
+                        programCourseId = membership.programCourseId,
+                        createdAt = membership.createdAt,
+                        updatedAt = membership.updatedAt,
+                        isBookmarked = membership.isBookmarked,
+                        completionPercentage = membership.completionPercentage,
+                        isEnrolledInCanvas = membership.isEnrolledInCanvas,
+                        canvasEnrollmentId = membership.canvasEnrollmentId
+                    )
+                } ?: return@mapNotNull null
+            )
+        }
+    }
+
+}
+
+private fun com.instructure.journey.type.CollectionItemType.toModuleItemType(): ModuleItem.Type? {
+    return when(this) {
+        com.instructure.journey.type.CollectionItemType.PAGE -> ModuleItem.Type.Page
+        com.instructure.journey.type.CollectionItemType.ASSIGNMENT -> ModuleItem.Type.Assignment
+        com.instructure.journey.type.CollectionItemType.QUIZ -> ModuleItem.Type.Quiz
+        com.instructure.journey.type.CollectionItemType.EXTERNAL_URL -> ModuleItem.Type.ExternalUrl
+        com.instructure.journey.type.CollectionItemType.EXTERNAL_TOOL -> ModuleItem.Type.ExternalTool
+        com.instructure.journey.type.CollectionItemType.FILE -> ModuleItem.Type.File
+        else -> null
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/graphql/horizon/journey/MyContentManager.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/graphql/horizon/journey/MyContentManager.kt
new file mode 100644
index 0000000000..4a00e27f06
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/graphql/horizon/journey/MyContentManager.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.managers.graphql.horizon.journey
+
+import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.api.Optional
+import com.instructure.canvasapi2.di.JourneyApolloClient
+import com.instructure.canvasapi2.enqueueQuery
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.toLearnItemSortOption
+import com.instructure.canvasapi2.models.journey.mycontent.CourseEnrollmentItem
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItem
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemStatus
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemType
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemsResponse
+import com.instructure.canvasapi2.models.journey.mycontent.ProgramEnrollmentItem
+import com.instructure.journey.GetLearnItemsQuery
+import javax.inject.Inject
+
+interface MyContentManager {
+    suspend fun getLearnItems(
+        cursor: String? = null,
+        limit: Int? = null,
+        forward: Boolean? = null,
+        searchTerm: String? = null,
+        itemTypes: List<LearnItemType>? = null,
+        status: List<LearnItemStatus>? = null,
+        sortBy: CollectionItemSortOption? = null,
+        forceNetwork: Boolean = false,
+    ): LearnItemsResponse
+}
+
+class MyContentManagerImpl @Inject constructor(
+    @JourneyApolloClient private val journeyClient: ApolloClient,
+) : MyContentManager {
+    override suspend fun getLearnItems(
+        cursor: String?,
+        limit: Int?,
+        forward: Boolean?,
+        searchTerm: String?,
+        itemTypes: List<LearnItemType>?,
+        status: List<LearnItemStatus>?,
+        sortBy: CollectionItemSortOption?,
+        forceNetwork: Boolean,
+    ): LearnItemsResponse {
+        val query = GetLearnItemsQuery(
+            cursor = Optional.presentIfNotNull(cursor),
+            limit = Optional.presentIfNotNull(limit),
+            forward = Optional.presentIfNotNull(forward),
+            searchTerm = Optional.presentIfNotNull(searchTerm),
+            itemTypes = Optional.presentIfNotNull(itemTypes?.map { it.toApolloType() }),
+            status = Optional.presentIfNotNull(status?.map { it.toApolloType() }),
+            sortBy = Optional.presentIfNotNull(sortBy?.toLearnItemSortOption()),
+        )
+        val result = journeyClient.enqueueQuery(query, forceNetwork = forceNetwork).dataOrThrow().learnItems
+
+        return LearnItemsResponse(
+            items = result.items.mapNotNull { item ->
+                item.onProgramEnrollmentItemGQL?.let { program ->
+                    ProgramEnrollmentItem(
+                        id = program.id,
+                        name = program.name,
+                        position = program.position,
+                        enrolledAt = program.enrolledAt,
+                        completionPercentage = program.completionPercentage,
+                        startDate = program.startDate,
+                        endDate = program.endDate,
+                        status = program.status,
+                        description = program.description,
+                        variant = program.variant,
+                        estimatedDurationMinutes = program.estimatedDurationMinutes,
+                        courseCount = program.courseCount,
+                    )
+                } ?: item.onCourseEnrollmentItemGQL?.let { course ->
+                    CourseEnrollmentItem(
+                        id = course.id,
+                        name = course.name,
+                        position = course.position,
+                        enrolledAt = course.enrolledAt,
+                        completionPercentage = course.completionPercentage,
+                        startAt = course.startAt,
+                        endAt = course.endAt,
+                        requirementCount = course.requirementCount,
+                        requirementCompletedCount = course.requirementCompletedCount,
+                        completedAt = course.completedAt,
+                        grade = course.grade,
+                        imageUrl = course.imageUrl,
+                        workflowState = course.workflowState,
+                        lastActivityAt = course.lastActivityAt,
+                    )
+                }
+            },
+            pageInfo = LearningLibraryPageInfo(
+                nextCursor = result.pageInfo.nextCursor,
+                previousCursor = result.pageInfo.previousCursor,
+                hasNextPage = result.pageInfo.hasNextPage,
+                hasPreviousPage = result.pageInfo.hasPreviousPage,
+                totalCount = result.pageInfo.totalCount,
+                pageCursors = null,
+            ),
+        )
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/SubmissionState.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/SubmissionState.kt
index 817a14e476..efa3be9969 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/SubmissionState.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/SubmissionState.kt
@@ -21,6 +21,7 @@ import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
 import com.instructure.canvasapi2.SubmissionStateTypeAdapter
 import kotlinx.parcelize.Parcelize
+import java.util.Date
 
 /**
  * If this class is expanded with other fields, the type adapter should be updated as well.
@@ -43,5 +44,7 @@ data class SubmissionState(
     @SerializedName("with_feedback")
     val withFeedback: Boolean = false,
     @SerializedName("redo_request")
-    val redoRequest: Boolean = false
+    val redoRequest: Boolean = false,
+    @SerializedName("posted_at")
+    val postedAt: Date? = null
 ): Parcelable
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistChatMessage.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistChatMessage.kt
similarity index 63%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistChatMessage.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistChatMessage.kt
index 66827e5187..3bfcd01879 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistChatMessage.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistChatMessage.kt
@@ -1,4 +1,4 @@
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 data class JourneyAssistChatMessage(
     val text: String = "",
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistChipOption.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistChipOption.kt
similarity index 93%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistChipOption.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistChipOption.kt
index 7cb8875da8..b1e2369b6b 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistChipOption.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistChipOption.kt
@@ -14,7 +14,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 data class JourneyAssistChipOption(
     val chip: String,
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistCitation.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistCitation.kt
similarity index 95%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistCitation.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistCitation.kt
index 4558bda23c..4d6b980bb1 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistCitation.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistCitation.kt
@@ -14,7 +14,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistFlashCard.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistFlashCard.kt
similarity index 93%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistFlashCard.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistFlashCard.kt
index 60b1688192..6cf96bd334 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistFlashCard.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistFlashCard.kt
@@ -14,7 +14,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 data class JourneyAssistFlashCard(
     val question: String,
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistQuizItem.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistQuizItem.kt
similarity index 93%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistQuizItem.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistQuizItem.kt
index 62b6995e42..b03ab2ddda 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistQuizItem.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistQuizItem.kt
@@ -14,7 +14,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 data class JourneyAssistQuizItem(
     val question: String,
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistRequestBody.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistRequestBody.kt
similarity index 93%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistRequestBody.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistRequestBody.kt
index 66db1f3d41..6340bdede3 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistRequestBody.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistRequestBody.kt
@@ -14,7 +14,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 data class JourneyAssistRequestBody(
     val prompt: String,
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistResponse.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistResponse.kt
similarity index 88%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistResponse.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistResponse.kt
index b70d7cf373..0c4fd1d8cb 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistResponse.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistResponse.kt
@@ -1,4 +1,4 @@
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 data class JourneyAssistResponse(
     val state: JourneyAssistState? = null,
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistRole.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistRole.kt
similarity index 92%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistRole.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistRole.kt
index 0bbc20da93..196896007b 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistRole.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistRole.kt
@@ -14,7 +14,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 enum class JourneyAssistRole {
     Assistant,
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistState.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistState.kt
similarity index 93%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistState.kt
rename to libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistState.kt
index 352a16d03f..a226139dc8 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/JourneyAssistState.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/assist/JourneyAssistState.kt
@@ -14,7 +14,7 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.canvasapi2.models.journey
+package com.instructure.canvasapi2.models.journey.assist
 
 data class JourneyAssistState(
     val courseID: String? = null,
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CanvasCourseInfo.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CanvasCourseInfo.kt
new file mode 100644
index 0000000000..aabec95e32
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CanvasCourseInfo.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+data class CanvasCourseInfo(
+    val courseId: String,
+    val canvasUrl: String,
+    val courseName: String?,
+    val courseImageUrl: String?,
+    val moduleCount: Double,
+    val moduleItemCount: Double,
+    val estimatedDurationMinutes: Double?
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CollectionItemSortOption.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CollectionItemSortOption.kt
new file mode 100644
index 0000000000..dae8b3ca7f
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CollectionItemSortOption.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+import com.instructure.journey.type.CollectionItemSortOption as ApolloCollectionItemSortOption
+import com.instructure.journey.type.LearnItemSortOption as ApolloLearnItemSortOption
+
+enum class CollectionItemSortOption {
+    MOST_RECENT,
+    LEAST_RECENT,
+    NAME_A_Z,
+    NAME_Z_A;
+
+    fun toApolloModel(): ApolloCollectionItemSortOption {
+        return when (this) {
+            MOST_RECENT -> ApolloCollectionItemSortOption.MOST_RECENT
+            LEAST_RECENT -> ApolloCollectionItemSortOption.LEAST_RECENT
+            NAME_A_Z -> ApolloCollectionItemSortOption.NAME_A_Z
+            NAME_Z_A -> ApolloCollectionItemSortOption.NAME_Z_A
+        }
+    }
+}
+
+fun ApolloCollectionItemSortOption.toModel(): CollectionItemSortOption? {
+    return when (this) {
+        ApolloCollectionItemSortOption.MOST_RECENT -> CollectionItemSortOption.MOST_RECENT
+        ApolloCollectionItemSortOption.LEAST_RECENT -> CollectionItemSortOption.LEAST_RECENT
+        ApolloCollectionItemSortOption.NAME_A_Z -> CollectionItemSortOption.NAME_A_Z
+        ApolloCollectionItemSortOption.NAME_Z_A -> CollectionItemSortOption.NAME_Z_A
+        else -> null
+    }
+}
+
+fun CollectionItemSortOption.toLearnItemSortOption(): ApolloLearnItemSortOption {
+    return when (this) {
+        CollectionItemSortOption.MOST_RECENT -> ApolloLearnItemSortOption.MOST_RECENT
+        CollectionItemSortOption.LEAST_RECENT -> ApolloLearnItemSortOption.LEAST_RECENT
+        CollectionItemSortOption.NAME_A_Z -> ApolloLearnItemSortOption.NAME_A_Z
+        CollectionItemSortOption.NAME_Z_A -> ApolloLearnItemSortOption.NAME_Z_A
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CollectionItemType.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CollectionItemType.kt
new file mode 100644
index 0000000000..3bbd7968cc
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/CollectionItemType.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+import com.instructure.journey.type.CollectionItemType as ApolloCollectionItemType
+
+enum class CollectionItemType {
+    COURSE,
+    PAGE,
+    ASSIGNMENT,
+    QUIZ,
+    EXTERNAL_URL,
+    EXTERNAL_TOOL,
+    FILE,
+    PROGRAM
+}
+
+fun ApolloCollectionItemType.toModel(): CollectionItemType {
+    return when (this) {
+        ApolloCollectionItemType.COURSE -> CollectionItemType.COURSE
+        ApolloCollectionItemType.PAGE -> CollectionItemType.PAGE
+        ApolloCollectionItemType.ASSIGNMENT -> CollectionItemType.ASSIGNMENT
+        ApolloCollectionItemType.QUIZ -> CollectionItemType.QUIZ
+        ApolloCollectionItemType.EXTERNAL_URL -> CollectionItemType.EXTERNAL_URL
+        ApolloCollectionItemType.EXTERNAL_TOOL -> CollectionItemType.EXTERNAL_TOOL
+        ApolloCollectionItemType.FILE -> CollectionItemType.FILE
+        ApolloCollectionItemType.PROGRAM -> CollectionItemType.PROGRAM
+        ApolloCollectionItemType.UNKNOWN__ -> throw IllegalArgumentException("Unknown CollectionItemType: $this")
+    }
+}
+
+fun CollectionItemType.toApolloType(): ApolloCollectionItemType {
+    return when (this) {
+        CollectionItemType.COURSE -> ApolloCollectionItemType.COURSE
+        CollectionItemType.PAGE -> ApolloCollectionItemType.PAGE
+        CollectionItemType.ASSIGNMENT -> ApolloCollectionItemType.ASSIGNMENT
+        CollectionItemType.QUIZ -> ApolloCollectionItemType.QUIZ
+        CollectionItemType.EXTERNAL_URL -> ApolloCollectionItemType.EXTERNAL_URL
+        CollectionItemType.EXTERNAL_TOOL -> ApolloCollectionItemType.EXTERNAL_TOOL
+        CollectionItemType.FILE -> ApolloCollectionItemType.FILE
+        CollectionItemType.PROGRAM -> ApolloCollectionItemType.PROGRAM
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/EnrolledLearningLibraryCollection.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/EnrolledLearningLibraryCollection.kt
new file mode 100644
index 0000000000..f4455913c2
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/EnrolledLearningLibraryCollection.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+import java.util.Date
+
+data class EnrolledLearningLibraryCollection(
+    val id: String,
+    val name: String,
+    val publicName: String?,
+    val description: String?,
+    val createdAt: Date,
+    val updatedAt: Date,
+    val totalItemCount: Int,
+    val items: List<LearningLibraryCollectionItem>
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/EnrolledLearningLibraryCollectionsResponse.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/EnrolledLearningLibraryCollectionsResponse.kt
new file mode 100644
index 0000000000..9af76f29d5
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/EnrolledLearningLibraryCollectionsResponse.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+data class EnrolledLearningLibraryCollectionsResponse(
+    val collections: List<EnrolledLearningLibraryCollection>
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollection.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollection.kt
new file mode 100644
index 0000000000..01087b0048
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollection.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+import java.util.Date
+
+data class LearningLibraryCollection(
+    val id: String,
+    val name: String,
+    val publicName: String?,
+    val description: String?,
+    val rootAccountUuid: String,
+    val accountId: String,
+    val deletedAt: Date?,
+    val createdAt: Date,
+    val updatedAt: Date
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionItem.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionItem.kt
new file mode 100644
index 0000000000..e3077ceb31
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionItem.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+import java.util.Date
+
+data class LearningLibraryCollectionItem(
+    val id: String,
+    val libraryId: String,
+    val itemType: CollectionItemType,
+    val displayOrder: Double,
+    val canvasCourse: CanvasCourseInfo?,
+    val moduleInfo: LearningLibraryModuleInfo?,
+    val programId: String?,
+    val programCourseId: String?,
+    val createdAt: Date,
+    val updatedAt: Date,
+    val isBookmarked: Boolean,
+    val completionPercentage: Double?,
+    val isEnrolledInCanvas: Boolean?,
+    val canvasEnrollmentId: String?,
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionItemsResponse.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionItemsResponse.kt
new file mode 100644
index 0000000000..81fae3b767
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionItemsResponse.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+data class LearningLibraryCollectionItemsResponse(
+    val items: List<LearningLibraryCollectionItem>,
+    val pageInfo: LearningLibraryPageInfo
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionResponse.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionResponse.kt
new file mode 100644
index 0000000000..20c4955f9d
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryCollectionResponse.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+data class LearningLibraryCollectionResponse(
+    val learningLibraryCollections: List<LearningLibraryCollection>,
+    val pageInfo: LearningLibraryPageInfo
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryModuleInfo.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryModuleInfo.kt
new file mode 100644
index 0000000000..9f069e5b8c
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryModuleInfo.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+data class LearningLibraryModuleInfo(
+    val moduleId: String?,
+    val moduleItemId: String,
+    val moduleItemType: String?,
+    val resourceId: String?
+)
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryPageInfo.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryPageInfo.kt
new file mode 100644
index 0000000000..6b5734821a
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryPageInfo.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+data class LearningLibraryPageInfo(
+    val nextCursor: String?,
+    val previousCursor: String?,
+    val hasNextPage: Boolean,
+    val hasPreviousPage: Boolean,
+    val totalCount: Int?,
+    val pageCursors: List<LearningLibraryPageCursor>?
+)
+
+data class LearningLibraryPageCursor(
+    val cursor: String,
+    val page: Int
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryRecommendation.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryRecommendation.kt
new file mode 100644
index 0000000000..03ee328e2f
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningLibraryRecommendation.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+data class LearningLibraryRecommendation(
+    val courseId: String,
+    val primaryReason: LearningRecommendationReason?,
+    val sourceContext: RecommendationSourceContext?,
+    val popularityCount: Int,
+    val item: LearningLibraryCollectionItem
+)
+
+data class RecommendationSourceContext(
+    val sourceCourseId: String?,
+    val sourceCourseName: String?,
+    val sourceSkillName: String?,
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningRecommendationReason.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningRecommendationReason.kt
new file mode 100644
index 0000000000..6748dc93ea
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/learninglibrary/LearningRecommendationReason.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.learninglibrary
+
+import com.instructure.journey.type.LearningRecommendationReason as ApolloLearningRecommendationReason
+
+enum class LearningRecommendationReason {
+    PAST_LEARNINGS,
+    BOOKMARKED_ITEMS,
+    EXISTING_SKILLS,
+    POPULARITY;
+
+    fun toApiModel(): ApolloLearningRecommendationReason {
+        return when (this) {
+            PAST_LEARNINGS -> ApolloLearningRecommendationReason.PAST_LEARNINGS
+            BOOKMARKED_ITEMS -> ApolloLearningRecommendationReason.BOOKMARKED_ITEMS
+            EXISTING_SKILLS -> ApolloLearningRecommendationReason.EXISTING_SKILLS
+            POPULARITY -> ApolloLearningRecommendationReason.POPULARITY
+        }
+    }
+}
+
+fun ApolloLearningRecommendationReason.toModel(): LearningRecommendationReason? {
+    return when (this) {
+        ApolloLearningRecommendationReason.PAST_LEARNINGS -> LearningRecommendationReason.PAST_LEARNINGS
+        ApolloLearningRecommendationReason.BOOKMARKED_ITEMS -> LearningRecommendationReason.BOOKMARKED_ITEMS
+        ApolloLearningRecommendationReason.EXISTING_SKILLS -> LearningRecommendationReason.EXISTING_SKILLS
+        ApolloLearningRecommendationReason.POPULARITY -> LearningRecommendationReason.POPULARITY
+        else -> null
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItem.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItem.kt
new file mode 100644
index 0000000000..651b825f76
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItem.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.mycontent
+
+import java.util.Date
+
+sealed class LearnItem {
+    abstract val id: String
+    abstract val name: String
+    abstract val position: Int
+    abstract val enrolledAt: Date?
+    abstract val completionPercentage: Double?
+}
+
+data class ProgramEnrollmentItem(
+    override val id: String,
+    override val name: String,
+    override val position: Int,
+    override val enrolledAt: Date?,
+    override val completionPercentage: Double?,
+    val startDate: Date?,
+    val endDate: Date?,
+    val status: String,
+    val description: String?,
+    val variant: String,
+    val estimatedDurationMinutes: Int?,
+    val courseCount: Int,
+) : LearnItem()
+
+data class CourseEnrollmentItem(
+    override val id: String,
+    override val name: String,
+    override val position: Int,
+    override val enrolledAt: Date?,
+    override val completionPercentage: Double?,
+    val startAt: Date?,
+    val endAt: Date?,
+    val requirementCount: Int?,
+    val requirementCompletedCount: Int?,
+    val completedAt: Date?,
+    val grade: Double?,
+    val imageUrl: String?,
+    val workflowState: String,
+    val lastActivityAt: Date?,
+) : LearnItem()
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemStatus.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemStatus.kt
new file mode 100644
index 0000000000..bd121c705b
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemStatus.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.mycontent
+
+import com.instructure.journey.type.LearnItemStatus as ApolloLearnItemStatus
+
+enum class LearnItemStatus {
+    IN_PROGRESS,
+    COMPLETED,
+    NOT_STARTED;
+
+    fun toApolloType(): ApolloLearnItemStatus {
+        return when (this) {
+            IN_PROGRESS -> ApolloLearnItemStatus.IN_PROGRESS
+            COMPLETED -> ApolloLearnItemStatus.COMPLETED
+            NOT_STARTED -> ApolloLearnItemStatus.NOT_STARTED
+        }
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemType.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemType.kt
new file mode 100644
index 0000000000..a8a8286f98
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemType.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.mycontent
+
+import com.instructure.journey.type.LearnItemType as ApolloLearnItemType
+
+enum class LearnItemType {
+    PROGRAM,
+    COURSE;
+
+    fun toApolloType(): ApolloLearnItemType {
+        return when (this) {
+            PROGRAM -> ApolloLearnItemType.PROGRAM
+            COURSE -> ApolloLearnItemType.COURSE
+        }
+    }
+}
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemsResponse.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemsResponse.kt
new file mode 100644
index 0000000000..a81cf23bd6
--- /dev/null
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/models/journey/mycontent/LearnItemsResponse.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.canvasapi2.models.journey.mycontent
+
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+
+data class LearnItemsResponse(
+    val items: List<LearnItem>,
+    val pageInfo: LearningLibraryPageInfo,
+)
\ No newline at end of file
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/Analytics.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/Analytics.kt
index a15b3626c1..6c3b3639b3 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/Analytics.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/Analytics.kt
@@ -217,4 +217,6 @@ object AnalyticsParamConstants {
 
     //dashboard survey
     const val SELECTED_REASON = "selected_reason"
+
+    const val NEW_DASHBOARD_ENABLED = "new_dashboard_enabled"
 }
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/CanvasAuthenticator.kt b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/CanvasAuthenticator.kt
index ac045fd785..83293dfa90 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/CanvasAuthenticator.kt
+++ b/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/utils/CanvasAuthenticator.kt
@@ -32,6 +32,12 @@ private const val RETRY_HEADER = "mobile_refresh"
 class CanvasAuthenticator(private val tokenRefresher: TokenRefresher) : Authenticator {
 
     override fun authenticate(route: Route?, response: Response): Request? {
+        // This is used to prevent user logout on embedded LTIs in pages where we can't obtain an authenticated session for the LTI url.
+        val params = response.request.restParams()
+        if (params?.shouldRefreshToken == false) {
+            return null
+        }
+
         if (response.request.header(RETRY_HEADER) != null) {
             logAuthAnalytics(AnalyticsEventConstants.TOKEN_REFRESH_FAILURE)
             EventBus.getDefault().post(CanvasAuthError("Failed to authenticate"))
diff --git a/libs/canvas-api-2/src/main/res/values-ca/strings.xml b/libs/canvas-api-2/src/main/res/values-ca/strings.xml
index f22db3b14a..ffaaf6794e 100644
--- a/libs/canvas-api-2/src/main/res/values-ca/strings.xml
+++ b/libs/canvas-api-2/src/main/res/values-ca/strings.xml
@@ -65,8 +65,8 @@
     <string name="always">Sempre</string>
     <string name="graded_quiz">Prova qualificada</string>
     <string name="practice_quiz">Prova sobre pràctiques</string>
-    <string name="graded_survey">Estudi qualificat</string>
-    <string name="ungraded_survey">Estudi sense nota</string>
+    <string name="graded_survey">Enquesta qualificada</string>
+    <string name="ungraded_survey">Enquesta sense nota</string>
     <string name="andMore"> i %d més</string>
 
     <!-- Enrollment Types -->
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/dashboard/HorizonDashboardInteractionTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/dashboard/HorizonDashboardInteractionTest.kt
index 6d13485683..9cb58cdcce 100644
--- a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/dashboard/HorizonDashboardInteractionTest.kt
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/dashboard/HorizonDashboardInteractionTest.kt
@@ -20,17 +20,21 @@ import com.instructure.canvas.espresso.mockcanvas.MockCanvas
 import com.instructure.canvas.espresso.mockcanvas.addItemToModule
 import com.instructure.canvas.espresso.mockcanvas.addModuleToCourse
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetHorizonCourseManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetLearningLibraryManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetProgramsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetSkillsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetWidgetsManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeMyContentManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeRedwoodApiManager
 import com.instructure.canvas.espresso.mockcanvas.init
 import com.instructure.canvasapi2.di.graphql.GetCoursesModule
 import com.instructure.canvasapi2.di.graphql.JourneyModule
 import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetSkillsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetWidgetsManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManager
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.RedwoodApiManager
 import com.instructure.canvasapi2.models.Page
 import com.instructure.horizon.espresso.HorizonTest
@@ -48,6 +52,8 @@ class HorizonDashboardInteractionTest: HorizonTest() {
     private val fakeGetWidgetsManager = FakeGetWidgetsManager()
     private val fakeGetSkillsManager = FakeGetSkillsManager()
     private val fakeRedwoodApiManager = FakeRedwoodApiManager()
+    private val fakeLearningLibraryManager = FakeGetLearningLibraryManager()
+    private val fakeMyContentManager = FakeMyContentManager()
 
     @BindValue
     @JvmField
@@ -69,6 +75,14 @@ class HorizonDashboardInteractionTest: HorizonTest() {
     @JvmField
     val redwoodApiManager: RedwoodApiManager = fakeRedwoodApiManager
 
+    @BindValue
+    @JvmField
+    val learningLibraryManager: GetLearningLibraryManager = fakeLearningLibraryManager
+
+    @BindValue
+    @JvmField
+    val myContentManager: MyContentManager = fakeMyContentManager
+
     @Test
     fun testDashboardCards() {
         val data = MockCanvas.init(
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/home/HorizonHomeInteractionTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/home/HorizonHomeInteractionTest.kt
index 3c7deca3ae..ed506b9a05 100644
--- a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/home/HorizonHomeInteractionTest.kt
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/home/HorizonHomeInteractionTest.kt
@@ -18,17 +18,21 @@ package com.instructure.horizon.interaction.features.home
 
 import com.instructure.canvas.espresso.mockcanvas.MockCanvas
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetHorizonCourseManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetLearningLibraryManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetProgramsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetSkillsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetWidgetsManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeMyContentManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeRedwoodApiManager
 import com.instructure.canvas.espresso.mockcanvas.init
 import com.instructure.canvasapi2.di.graphql.GetCoursesModule
 import com.instructure.canvasapi2.di.graphql.JourneyModule
 import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetSkillsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetWidgetsManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManager
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.RedwoodApiManager
 import com.instructure.horizon.espresso.HorizonTest
 import com.instructure.horizon.pages.HorizonHomePage
@@ -45,6 +49,8 @@ class HorizonHomeInteractionTest : HorizonTest() {
     private val fakeGetWidgetsManager = FakeGetWidgetsManager()
     private val fakeGetSkillsManager = FakeGetSkillsManager()
     private val fakeRedwoodApiManager = FakeRedwoodApiManager()
+    private val fakeLearningLibraryManager = FakeGetLearningLibraryManager()
+    private val fakeMyContentManager = FakeMyContentManager()
 
     @BindValue
     @JvmField
@@ -66,6 +72,14 @@ class HorizonHomeInteractionTest : HorizonTest() {
     @JvmField
     val redwoodApiManager: RedwoodApiManager = fakeRedwoodApiManager
 
+    @BindValue
+    @JvmField
+    val learningLibraryManager: GetLearningLibraryManager = fakeLearningLibraryManager
+
+    @BindValue
+    @JvmField
+    val myContentManager: MyContentManager = fakeMyContentManager
+
     private val homePage: HorizonHomePage by lazy { HorizonHomePage(composeTestRule) }
 
     @Test
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notebook/NotebookInteractionTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notebook/NotebookInteractionTest.kt
index da4f289aec..58ae3d02c3 100644
--- a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notebook/NotebookInteractionTest.kt
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notebook/NotebookInteractionTest.kt
@@ -18,17 +18,21 @@ package com.instructure.horizon.interaction.features.notebook
 
 import com.instructure.canvas.espresso.mockcanvas.MockCanvas
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetHorizonCourseManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetLearningLibraryManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetProgramsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetSkillsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetWidgetsManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeMyContentManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeRedwoodApiManager
 import com.instructure.canvas.espresso.mockcanvas.init
 import com.instructure.canvasapi2.di.graphql.GetCoursesModule
 import com.instructure.canvasapi2.di.graphql.JourneyModule
 import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetSkillsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetWidgetsManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManager
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.NoteHighlightedData
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.NoteHighlightedDataRange
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.NoteHighlightedDataTextPosition
@@ -50,6 +54,8 @@ class NotebookInteractionTest : HorizonTest() {
     private val fakeGetWidgetsManager = FakeGetWidgetsManager()
     private val fakeGetSkillsManager = FakeGetSkillsManager()
     private val fakeRedwoodApiManager = FakeRedwoodApiManager()
+    private val fakeLearningLibraryManager = FakeGetLearningLibraryManager()
+    private val fakeMyContentManager = FakeMyContentManager()
 
     @BindValue
     @JvmField
@@ -71,6 +77,14 @@ class NotebookInteractionTest : HorizonTest() {
     @JvmField
     val redwoodApiManager: RedwoodApiManager = fakeRedwoodApiManager
 
+    @BindValue
+    @JvmField
+    val learningLibraryManager: GetLearningLibraryManager = fakeLearningLibraryManager
+
+    @BindValue
+    @JvmField
+    val myContentManager: MyContentManager = fakeMyContentManager
+
     private val notebookPage: HorizonNotebookPage by lazy { HorizonNotebookPage(composeTestRule) }
 
     @Before
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notification/HorizonNotificationInteractionTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notification/HorizonNotificationInteractionTest.kt
index c992482300..9073d7ed40 100644
--- a/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notification/HorizonNotificationInteractionTest.kt
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/interaction/features/notification/HorizonNotificationInteractionTest.kt
@@ -21,17 +21,21 @@ import com.instructure.canvas.espresso.mockcanvas.addAssignment
 import com.instructure.canvas.espresso.mockcanvas.addSubmissionForAssignment
 import com.instructure.canvas.espresso.mockcanvas.addSubmissionStreamItem
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetHorizonCourseManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetLearningLibraryManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetProgramsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetSkillsManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeGetWidgetsManager
+import com.instructure.canvas.espresso.mockcanvas.fakes.FakeMyContentManager
 import com.instructure.canvas.espresso.mockcanvas.fakes.FakeRedwoodApiManager
 import com.instructure.canvas.espresso.mockcanvas.init
 import com.instructure.canvasapi2.di.graphql.GetCoursesModule
 import com.instructure.canvasapi2.di.graphql.JourneyModule
 import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetSkillsManager
 import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetWidgetsManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManager
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.RedwoodApiManager
 import com.instructure.horizon.espresso.HorizonTest
 import dagger.hilt.android.testing.BindValue
@@ -47,6 +51,8 @@ class HorizonNotificationInteractionTest: HorizonTest() {
     private val fakeGetWidgetsManager = FakeGetWidgetsManager()
     private val fakeGetSkillsManager = FakeGetSkillsManager()
     private val fakeRedwoodApiManager = FakeRedwoodApiManager()
+    private val fakeLearningLibraryManager = FakeGetLearningLibraryManager()
+    private val fakeMyContentManager = FakeMyContentManager()
 
     @BindValue
     @JvmField
@@ -68,6 +74,14 @@ class HorizonNotificationInteractionTest: HorizonTest() {
     @JvmField
     val redwoodApiManager: RedwoodApiManager = fakeRedwoodApiManager
 
+    @BindValue
+    @JvmField
+    val learningLibraryManager: GetLearningLibraryManager = fakeLearningLibraryManager
+
+    @BindValue
+    @JvmField
+    val myContentManager: MyContentManager = fakeMyContentManager
+
     @Test
     fun testNotifications() {
         val data = MockCanvas.init(
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/pages/HorizonLearnPage.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/pages/HorizonLearnPage.kt
index 2acbc847d2..1b7c8479be 100644
--- a/libs/horizon/src/androidTest/java/com/instructure/horizon/pages/HorizonLearnPage.kt
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/pages/HorizonLearnPage.kt
@@ -43,7 +43,17 @@ class HorizonLearnPage(private val composeTestRule: ComposeTestRule) {
     }
 
     fun assertEmptyState() {
-        composeTestRule.onNodeWithText("No courses", substring = true)
+        composeTestRule.onNodeWithText("No results found", substring = true)
             .assertIsDisplayed()
     }
+
+    fun assertMyContentTabDisplayed(tabLabel: String) {
+        composeTestRule.onNodeWithText(tabLabel)
+            .assertIsDisplayed()
+    }
+
+    fun clickMyContentTab(tabLabel: String) {
+        composeTestRule.onNodeWithText(tabLabel)
+            .performClick()
+    }
 }
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/pages/LearnMyContentPage.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/pages/LearnMyContentPage.kt
new file mode 100644
index 0000000000..babac2f688
--- /dev/null
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/pages/LearnMyContentPage.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.pages
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+
+class LearnMyContentPage(private val composeTestRule: ComposeTestRule) {
+
+    fun assertTabDisplayed(tabLabel: String) {
+        composeTestRule.onNodeWithText(tabLabel)
+            .assertIsDisplayed()
+    }
+
+    fun assertTabIsSelected(tabLabel: String) {
+        composeTestRule.onNodeWithText(tabLabel)
+            .assertIsSelected()
+    }
+
+    fun clickTab(tabLabel: String) {
+        composeTestRule.onNodeWithText(tabLabel)
+            .performClick()
+    }
+
+    fun assertItemCardDisplayed(name: String) {
+        composeTestRule.onNodeWithText(name)
+            .assertIsDisplayed()
+    }
+
+    fun assertEmptyMessageDisplayed() {
+        composeTestRule.onNodeWithText("No results found", substring = true)
+            .assertIsDisplayed()
+    }
+
+    fun assertItemCountDisplayed(count: Int) {
+        composeTestRule.onNodeWithText("$count item", substring = true)
+            .assertIsDisplayed()
+    }
+
+    fun assertShowMoreButtonDisplayed() {
+        composeTestRule.onNodeWithText("Show more", substring = true)
+            .assertIsDisplayed()
+    }
+
+    fun assertShowMoreButtonNotDisplayed() {
+        composeTestRule.onNodeWithText("Show more", substring = true)
+            .assertDoesNotExist()
+    }
+
+    fun clickShowMore() {
+        composeTestRule.onNodeWithText("Show more", substring = true)
+            .performClick()
+    }
+}
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnCourseListUiTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnCourseListUiTest.kt
deleted file mode 100644
index 6df401607b..0000000000
--- a/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnCourseListUiTest.kt
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2025 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.ui.features.learn
-
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performScrollToNode
-import androidx.navigation.compose.rememberNavController
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.instructure.horizon.features.learn.course.list.LearnCourseListScreen
-import com.instructure.horizon.features.learn.course.list.LearnCourseListUiState
-import com.instructure.horizon.features.learn.course.list.LearnCourseState
-import com.instructure.horizon.horizonui.platform.LoadingState
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class LearnCourseListUiTest {
-    @get:Rule
-    val composeTestRule = createComposeRule()
-
-    private val testCourses = listOf(
-        LearnCourseState(
-            imageUrl = "https://example.com/course1.png",
-            courseName = "Introduction to Programming",
-            courseId = 1L,
-            progress = 0.0
-        ),
-        LearnCourseState(
-            imageUrl = "https://example.com/course2.png",
-            courseName = "Advanced Mathematics",
-            courseId = 2L,
-            progress = 50.0
-        ),
-        LearnCourseState(
-            imageUrl = "https://example.com/course3.png",
-            courseName = "Web Development",
-            courseId = 3L,
-            progress = 100.0
-        )
-    )
-
-    @Test
-    fun testLoadingStateDisplaysSpinner() {
-        val state = LearnCourseListUiState(
-            loadingState = LoadingState(isLoading = true),
-            coursesToDisplay = emptyList()
-        )
-
-        composeTestRule.setContent {
-            LearnCourseListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithTag("LoadingSpinner")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun testCourseListDisplaysCourses() {
-        val state = LearnCourseListUiState(
-            loadingState = LoadingState(isLoading = false),
-            coursesToDisplay = testCourses
-        )
-
-        composeTestRule.setContent {
-            LearnCourseListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Introduction to Programming"))
-        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true)
-            .assertIsDisplayed()
-
-        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Advanced Mathematics"))
-        composeTestRule.onNodeWithText("Advanced Mathematics", useUnmergedTree = true)
-            .assertIsDisplayed()
-
-        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Web Development"))
-        composeTestRule.onNodeWithText("Web Development", useUnmergedTree = true)
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun testCourseProgressDisplayed() {
-        val state = LearnCourseListUiState(
-            loadingState = LoadingState(isLoading = false),
-            coursesToDisplay = listOf(
-                LearnCourseState(
-                    imageUrl = null,
-                    courseName = "Test Course",
-                    courseId = 1L,
-                    progress = 75.0
-                )
-            )
-        )
-
-        composeTestRule.setContent {
-            LearnCourseListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithText("Test Course", useUnmergedTree = true)
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun testFilteredCoursesDisplay() {
-        val state = LearnCourseListUiState(
-            loadingState = LoadingState(isLoading = false),
-            coursesToDisplay = listOf(testCourses[2])
-        )
-
-        composeTestRule.setContent {
-            LearnCourseListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithText("Web Development", useUnmergedTree = true)
-            .assertIsDisplayed()
-        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true)
-            .assertDoesNotExist()
-    }
-
-    @Test
-    fun testShowMoreButtonNotDisplayedWhenAllCoursesVisible() {
-        val state = LearnCourseListUiState(
-            loadingState = LoadingState(isLoading = false),
-            coursesToDisplay = testCourses,
-            visibleItemCount = 10
-        )
-
-        composeTestRule.setContent {
-            LearnCourseListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithText("Show More", useUnmergedTree = true)
-            .assertDoesNotExist()
-    }
-}
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnLearningLibraryDetailsUiTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnLearningLibraryDetailsUiTest.kt
new file mode 100644
index 0000000000..35c26e24fe
--- /dev/null
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnLearningLibraryDetailsUiTest.kt
@@ -0,0 +1,471 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.ui.features.learn
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollToNode
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.navigation.compose.rememberNavController
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemChipState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryStatusFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.learninglibrary.details.LearnLearningLibraryDetailsScreen
+import com.instructure.horizon.features.learn.learninglibrary.details.LearnLearningLibraryDetailsUiState
+import com.instructure.horizon.horizonui.platform.LoadingState
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LearnLearningLibraryDetailsUiTest {
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    private val testItems = listOf(
+        LearnLearningLibraryCollectionItemState(
+            id = "item1",
+            imageUrl = "https://example.com/course1.png",
+            name = "Introduction to Programming",
+            description = null,
+            isBookmarked = false,
+            bookmarkLoading = false,
+            canEnroll = true,
+            type = CollectionItemType.COURSE,
+            route = null,
+            chips = listOf(
+                LearnLearningLibraryCollectionItemChipState(label = "Course"),
+                LearnLearningLibraryCollectionItemChipState(label = "60 mins")
+            )
+        ),
+        LearnLearningLibraryCollectionItemState(
+            id = "item2",
+            imageUrl = "https://example.com/course2.png",
+            name = "Advanced Algorithms",
+            description = null,
+            isBookmarked = true,
+            bookmarkLoading = false,
+            canEnroll = false,
+            type = CollectionItemType.ASSIGNMENT,
+            route = null,
+            chips = listOf(
+                LearnLearningLibraryCollectionItemChipState(label = "Assignment")
+            )
+        ),
+        LearnLearningLibraryCollectionItemState(
+            id = "item3",
+            imageUrl = "https://example.com/course3.png",
+            name = "Data Structures",
+            description = null,
+            isBookmarked = false,
+            bookmarkLoading = false,
+            canEnroll = false,
+            type = CollectionItemType.PAGE,
+            route = null,
+            chips = listOf(
+                LearnLearningLibraryCollectionItemChipState(label = "Page")
+            )
+        )
+    )
+
+    @Test
+    fun testLoadingStateDisplaysSpinner() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = true),
+            items = emptyList()
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithTag("LoadingSpinner")
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testCollectionNameDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            collectionName = "Software Engineering Collection",
+            items = testItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("Software Engineering Collection")
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testBackButtonDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = testItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithContentDescription("Navigate back")
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testSearchBarDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = testItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("Search collection", useUnmergedTree = true)
+            .assertExists()
+    }
+
+    @Test
+    fun testStatusFilterChipDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = testItems,
+            itemsToDisplay = 10,
+            selectedStatusFilter = LearnLearningLibraryStatusFilter.All
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("Any status", useUnmergedTree = true)
+            .assertExists()
+    }
+
+    @Test
+    fun testTypeFilterChipDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = testItems,
+            itemsToDisplay = 10,
+            selectedTypeFilter = LearnLearningLibraryTypeFilter.All
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("Any type", useUnmergedTree = true)
+            .assertExists()
+    }
+
+    @Test
+    fun testItemCountDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = testItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("3", useUnmergedTree = true)
+            .assertExists()
+    }
+
+    @Test
+    fun testLearningLibraryItemsRender() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = testItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Introduction to Programming"))
+        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true)
+            .assertIsDisplayed()
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Advanced Algorithms"))
+        composeTestRule.onNodeWithText("Advanced Algorithms", useUnmergedTree = true)
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testEmptyStateDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = emptyList(),
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText(
+            "No results found. Try adjusting your search terms.",
+            useUnmergedTree = true
+        ).assertExists()
+    }
+
+    @Test
+    fun testShowMoreButtonDisplayedWhenMoreItems() {
+        val manyItems = (1..15).map {
+            LearnLearningLibraryCollectionItemState(
+                id = "item$it",
+                imageUrl = "https://example.com/course$it.png",
+                name = "Course $it",
+                description = null,
+                isBookmarked = false,
+                bookmarkLoading = false,
+                canEnroll = false,
+                type = CollectionItemType.COURSE,
+                route = null,
+                chips = emptyList()
+            )
+        }
+
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = manyItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Show more"))
+        composeTestRule.onNodeWithText("Show more", useUnmergedTree = true)
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testShowMoreButtonHiddenWhenAllItemsDisplayed() {
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = testItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("Show more", useUnmergedTree = true)
+            .assertDoesNotExist()
+    }
+
+    @Test
+    fun testBookmarkedItemDisplaysBookmarkIcon() {
+        val bookmarkedItem = listOf(
+            testItems[1]
+        )
+
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = bookmarkedItem,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Advanced Algorithms"))
+        composeTestRule.onNodeWithText("Advanced Algorithms", useUnmergedTree = true)
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testEnrollButtonDisplayedForEnrollableItems() {
+        val enrollableItem = listOf(
+            testItems[0]
+        )
+
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = enrollableItem,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Introduction to Programming"))
+        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true)
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testFilteredItemsDisplay() {
+        val filteredItems = listOf(testItems[0])
+
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = filteredItems,
+            itemsToDisplay = 10,
+            searchQuery = TextFieldValue("Introduction")
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true)
+            .assertIsDisplayed()
+
+        composeTestRule.onNodeWithText("Advanced Algorithms", useUnmergedTree = true)
+            .assertDoesNotExist()
+    }
+
+    @Test
+    fun testPaginationDisplaysLimitedItems() {
+        val manyItems = (1..20).map {
+            LearnLearningLibraryCollectionItemState(
+                id = "item$it",
+                imageUrl = "https://example.com/course$it.png",
+                name = "Course $it",
+                description = null,
+                isBookmarked = false,
+                bookmarkLoading = false,
+                canEnroll = false,
+                type = CollectionItemType.COURSE,
+                route = null,
+                chips = emptyList()
+            )
+        }
+
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = manyItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Show more"))
+
+        composeTestRule.onNodeWithText("Course 10", useUnmergedTree = true)
+            .assertExists()
+
+        composeTestRule.onNodeWithText("Course 11", useUnmergedTree = true)
+            .assertDoesNotExist()
+    }
+
+    @Test
+    fun testItemCountReflectsPaginatedItems() {
+        val manyItems = (1..20).map {
+            LearnLearningLibraryCollectionItemState(
+                id = "item$it",
+                imageUrl = "https://example.com/course$it.png",
+                name = "Course $it",
+                description = null,
+                isBookmarked = false,
+                bookmarkLoading = false,
+                canEnroll = false,
+                type = CollectionItemType.COURSE,
+                route = null,
+                chips = emptyList()
+            )
+        }
+
+        val state = LearnLearningLibraryDetailsUiState(
+            loadingState = LoadingState(isLoading = false),
+            items = manyItems,
+            itemsToDisplay = 10
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryDetailsScreen(
+                state = state,
+                navController = rememberNavController()
+            )
+        }
+
+        composeTestRule.onNodeWithText("10", useUnmergedTree = true)
+            .assertExists()
+    }
+}
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnLearningLibraryListUiTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnLearningLibraryListUiTest.kt
new file mode 100644
index 0000000000..e2d4d74972
--- /dev/null
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnLearningLibraryListUiTest.kt
@@ -0,0 +1,552 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.ui.features.learn
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.hasContentDescription
+import androidx.compose.ui.test.hasText
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.test.performScrollToNode
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.navigation.compose.rememberNavController
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemChipState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionState
+import com.instructure.horizon.features.learn.learninglibrary.list.LearnLearningLibraryListCollectionUiState
+import com.instructure.horizon.features.learn.learninglibrary.list.LearnLearningLibraryListItemUiState
+import com.instructure.horizon.features.learn.learninglibrary.list.LearnLearningLibraryListScreen
+import com.instructure.horizon.features.learn.learninglibrary.list.LearnLearningLibraryListUiState
+import com.instructure.horizon.horizonui.platform.LoadingState
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LearnLearningLibraryListUiTest {
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    private val testCollections = listOf(
+        LearnLearningLibraryCollectionState(
+            id = "collection1",
+            name = "Software Engineering Basics",
+            itemCount = 2,
+            items = listOf(
+                LearnLearningLibraryCollectionItemState(
+                    id = "item1",
+                    imageUrl = null,
+                    name = "Introduction to Programming",
+                    description = null,
+                    isBookmarked = false,
+                    bookmarkLoading = false,
+                    canEnroll = true,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(label = "Course"),
+                        LearnLearningLibraryCollectionItemChipState(label = "60 mins")
+                    )
+                ),
+                LearnLearningLibraryCollectionItemState(
+                    id = "item2",
+                    imageUrl = null,
+                    name = "Advanced Algorithms",
+                    description = null,
+                    isBookmarked = true,
+                    bookmarkLoading = false,
+                    canEnroll = false,
+                    type = CollectionItemType.PAGE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(label = "Page")
+                    )
+                )
+            )
+        ),
+        LearnLearningLibraryCollectionState(
+            id = "collection2",
+            name = "Data Science Fundamentals",
+            itemCount = 1,
+            items = listOf(
+                LearnLearningLibraryCollectionItemState(
+                    id = "item3",
+                    imageUrl = null,
+                    name = "Machine Learning",
+                    description = null,
+                    isBookmarked = false,
+                    bookmarkLoading = false,
+                    canEnroll = false,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(label = "Course")
+                    )
+                )
+            )
+        ),
+        LearnLearningLibraryCollectionState(
+            id = "collection3",
+            name = "Web Development",
+            itemCount = 1,
+            items = listOf(
+                LearnLearningLibraryCollectionItemState(
+                    id = "item4",
+                    imageUrl = null,
+                    name = "React Basics",
+                    description = null,
+                    isBookmarked = false,
+                    bookmarkLoading = false,
+                    canEnroll = true,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(label = "Course")
+                    )
+                )
+            )
+        )
+    )
+
+    private val testItems = listOf(
+        LearnLearningLibraryCollectionItemState(
+            id = "item1",
+            imageUrl = null,
+            name = "Introduction to Programming",
+            description = null,
+            isBookmarked = false,
+            bookmarkLoading = false,
+            canEnroll = true,
+            type = CollectionItemType.COURSE,
+            route = null,
+            chips = listOf(
+                LearnLearningLibraryCollectionItemChipState(label = "Course"),
+                LearnLearningLibraryCollectionItemChipState(label = "60 mins")
+            )
+        ),
+        LearnLearningLibraryCollectionItemState(
+            id = "item2",
+            imageUrl = null,
+            name = "Machine Learning",
+            description = null,
+            isBookmarked = true,
+            bookmarkLoading = false,
+            canEnroll = false,
+            type = CollectionItemType.COURSE,
+            route = null,
+            chips = listOf(
+                LearnLearningLibraryCollectionItemChipState(label = "Course")
+            )
+        )
+    )
+
+    @Test
+    fun testLoadingStateDisplaysSpinner() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                loadingState = LoadingState(isLoading = true)
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithTag("LoadingSpinner").assertIsDisplayed()
+    }
+
+    @Test
+    fun testItemLoadingStateDisplaysSpinnerWhenFilterActive() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                loadingState = LoadingState(isLoading = true)
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithTag("LoadingSpinner").assertIsDisplayed()
+    }
+
+    @Test
+    fun testAllCollectionsDisplayed() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = testCollections,
+                itemsToDisplay = 10
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasContentDescription("Software Engineering Basics"))
+        composeTestRule.onNodeWithText("Software Engineering Basics", useUnmergedTree = true).assertIsDisplayed()
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasContentDescription("Data Science Fundamentals"))
+        composeTestRule.onNodeWithText("Data Science Fundamentals", useUnmergedTree = true).assertIsDisplayed()
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasContentDescription("Web Development"))
+        composeTestRule.onNodeWithText("Web Development", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testSingleFilteredCollectionDisplayed() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = listOf(testCollections[1]),
+                itemsToDisplay = 10
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Data Science Fundamentals", useUnmergedTree = true).assertIsDisplayed()
+        composeTestRule.onNodeWithText("Software Engineering Basics", useUnmergedTree = true).assertDoesNotExist()
+    }
+
+    @Test
+    fun testEmptyCollectionsShowsNoCollectionNames() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = emptyList()
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Software Engineering Basics", useUnmergedTree = true).assertDoesNotExist()
+    }
+
+    @Test
+    fun testCollectionItemNameDisplayedInsideCollection() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = testCollections,
+                itemsToDisplay = 10
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onRoot().performScrollToNode(hasText("Introduction to Programming"))
+        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testShowMoreButtonDisplayedInCollectionViewWhenMoreCollectionsAvailable() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = testCollections,
+                itemsToDisplay = 2
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Show more"))
+        composeTestRule.onNodeWithText("Show more", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testShowMoreButtonNotDisplayedInCollectionViewWhenAllCollectionsVisible() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = testCollections,
+                itemsToDisplay = 10
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Show more", useUnmergedTree = true).assertDoesNotExist()
+    }
+
+    @Test
+    fun testHiddenCollectionNotDisplayedWhenBeyondPageSize() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = testCollections,
+                itemsToDisplay = 2
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Web Development", useUnmergedTree = true).assertDoesNotExist()
+    }
+
+    @Test
+    fun testItemListDisplayedWhenFilterActive() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(items = testItems)
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testItemListDisplayedWhenSearchQuerySet() {
+        val state = LearnLearningLibraryListUiState(
+            searchQuery = TextFieldValue("python"),
+            itemState = LearnLearningLibraryListItemUiState(items = testItems)
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testMultipleItemsDisplayedInItemView() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(items = testItems)
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onRoot().performScrollToNode(hasText("Introduction to Programming"))
+        composeTestRule.onNodeWithText("Introduction to Programming", useUnmergedTree = true).assertIsDisplayed()
+
+        composeTestRule.onRoot().performScrollToNode(hasText("Machine Learning"))
+        composeTestRule.onNodeWithText("Machine Learning", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testCollectionsNotShownWhenFiltersActive() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            collectionState = LearnLearningLibraryListCollectionUiState(collections = testCollections),
+            itemState = LearnLearningLibraryListItemUiState(items = testItems)
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Software Engineering Basics", useUnmergedTree = true).assertDoesNotExist()
+    }
+
+    @Test
+    fun testEmptyMessageDisplayedWhenFilteredItemsAreEmpty() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(items = emptyList())
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("No results found. Try adjusting your search terms.", useUnmergedTree = true)
+            .assertIsDisplayed()
+    }
+
+    @Test
+    fun testEnrollButtonDisplayedForEligibleItem() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                items = listOf(testItems[0])
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Enroll", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testEnrollButtonNotDisplayedWhenItemAlreadyEnrolled() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                items = listOf(testItems[1])
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Enroll", useUnmergedTree = true).assertDoesNotExist()
+    }
+
+    @Test
+    fun testBookmarkButtonDisplayedOnNonBookmarkedItem() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                items = listOf(testItems[0])
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithContentDescription("Bookmark").assertIsDisplayed()
+    }
+
+    @Test
+    fun testRemoveBookmarkButtonDisplayedForBookmarkedItem() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                items = listOf(testItems[1])
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithContentDescription("Remove bookmark").assertIsDisplayed()
+    }
+
+    @Test
+    fun testItemChipDisplayed() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                items = listOf(testItems[0])
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Course", useUnmergedTree = true).assertIsDisplayed()
+        composeTestRule.onNodeWithText("60 mins", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testShowMoreButtonDisplayedInItemViewWhenMoreButton() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                items = testItems,
+                showMoreButton = true
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Show more"))
+        composeTestRule.onNodeWithText("Show more", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testShowMoreButtonNotDisplayedInItemViewWhenNotLoading() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(
+                items = testItems,
+                isMoreButtonLoading = false
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("Show more", useUnmergedTree = true).assertDoesNotExist()
+    }
+
+    @Test
+    fun testFilterButtonDisplayed() {
+        val state = LearnLearningLibraryListUiState(
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = testCollections,
+                itemsToDisplay = 10
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithContentDescription("Filter").assertIsDisplayed()
+    }
+
+    @Test
+    fun testFilterButtonBadgeDisplayedWhenFiltersActive() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 1,
+            itemState = LearnLearningLibraryListItemUiState(items = testItems)
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("1", useUnmergedTree = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun testFilterButtonNoBadgeWhenNoFiltersActive() {
+        val state = LearnLearningLibraryListUiState(
+            activeFilterCount = 0,
+            collectionState = LearnLearningLibraryListCollectionUiState(
+                collections = testCollections,
+                itemsToDisplay = 10
+            )
+        )
+
+        composeTestRule.setContent {
+            LearnLearningLibraryListScreen(state = state, navController = rememberNavController())
+        }
+
+        composeTestRule.onNodeWithText("0", useUnmergedTree = true).assertDoesNotExist()
+    }
+}
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnMyContentScreenUiTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnMyContentScreenUiTest.kt
new file mode 100644
index 0000000000..0fb260bbf8
--- /dev/null
+++ b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnMyContentScreenUiTest.kt
@@ -0,0 +1,358 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.ui.features.learn
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.test.assertIsSelected
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.unit.dp
+import androidx.navigation.compose.rememberNavController
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemChipState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.mycontent.LearnMyContentTab
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardButtonState
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardChipState
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentUiState
+import com.instructure.horizon.features.learn.mycontent.completed.LearnMyContentCompletedContent
+import com.instructure.horizon.features.learn.mycontent.inprogress.LearnMyContentInProgressContent
+import com.instructure.horizon.features.learn.mycontent.saved.LearnMyContentSavedContent
+import com.instructure.horizon.horizonui.molecules.FilterChip
+import com.instructure.horizon.horizonui.molecules.FilterChipSize
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.horizon.horizonui.platform.LoadingState
+import com.instructure.horizon.pages.LearnMyContentPage
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LearnMyContentScreenUiTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    private val page = LearnMyContentPage(composeTestRule)
+
+    @Test
+    fun allThreeTabsAreDisplayed() {
+        composeTestRule.setContent {
+            TabSelectorContent(selectedTab = LearnMyContentTab.InProgress, onTabSelected = {})
+        }
+
+        page.assertTabDisplayed("In Progress")
+        page.assertTabDisplayed("Completed")
+        page.assertTabDisplayed("Saved")
+    }
+
+    @Test
+    fun inProgressTabIsSelectedByDefault() {
+        composeTestRule.setContent {
+            TabSelectorContent(selectedTab = LearnMyContentTab.InProgress, onTabSelected = {})
+        }
+
+        composeTestRule.onNodeWithText("In Progress").assertIsSelected()
+    }
+
+    @Test
+    fun clickingCompletedTabCallsOnTabSelectedWithCompleted() {
+        var selectedTab = LearnMyContentTab.InProgress
+        composeTestRule.setContent {
+            TabSelectorContent(selectedTab = selectedTab, onTabSelected = { selectedTab = it })
+        }
+
+        composeTestRule.onNodeWithText("Completed").performClick()
+
+        assert(selectedTab == LearnMyContentTab.Completed)
+    }
+
+    @Test
+    fun clickingSavedTabCallsOnTabSelectedWithSaved() {
+        var selectedTab = LearnMyContentTab.InProgress
+        composeTestRule.setContent {
+            TabSelectorContent(selectedTab = selectedTab, onTabSelected = { selectedTab = it })
+        }
+
+        composeTestRule.onNodeWithText("Saved").performClick()
+
+        assert(selectedTab == LearnMyContentTab.Saved)
+    }
+
+    @Test
+    fun emptyStateMessageShownWhenInProgressContentCardsIsEmpty() {
+        composeTestRule.setContent {
+            LearnMyContentInProgressContent(
+                uiState = emptyContentState(),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertEmptyMessageDisplayed()
+    }
+
+    @Test
+    fun emptyStateMessageNotShownWhenInProgressHasItems() {
+        composeTestRule.setContent {
+            LearnMyContentInProgressContent(
+                uiState = contentStateWithItems(),
+                navController = rememberNavController(),
+            )
+        }
+
+        composeTestRule.onNodeWithText("No results found", substring = true)
+            .assertDoesNotExist()
+    }
+
+    @Test
+    fun itemCardNameIsDisplayedInInProgress() {
+        composeTestRule.setContent {
+            LearnMyContentInProgressContent(
+                uiState = contentStateWithItems(),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertItemCardDisplayed("Introduction to Programming")
+    }
+
+    @Test
+    fun multipleItemCardsAreDisplayedInInProgress() {
+        composeTestRule.setContent {
+            LearnMyContentInProgressContent(
+                uiState = contentStateWithItems(),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertItemCardDisplayed("Introduction to Programming")
+        page.assertItemCardDisplayed("Advanced Data Structures")
+    }
+
+    @Test
+    fun itemCountDisplayedInInProgress() {
+        composeTestRule.setContent {
+            LearnMyContentInProgressContent(
+                uiState = contentStateWithItems(totalItemCount = 5),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertItemCountDisplayed(5)
+    }
+
+    @Test
+    fun showMoreButtonIsVisibleWhenShowMoreButtonIsTrueInInProgress() {
+        composeTestRule.setContent {
+            LearnMyContentInProgressContent(
+                uiState = contentStateWithItems(showMoreButton = true),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertShowMoreButtonDisplayed()
+    }
+
+    @Test
+    fun showMoreButtonIsNotVisibleWhenShowMoreButtonIsFalseInInProgress() {
+        composeTestRule.setContent {
+            LearnMyContentInProgressContent(
+                uiState = contentStateWithItems(showMoreButton = false),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertShowMoreButtonNotDisplayed()
+    }
+
+    @Test
+    fun emptyStateMessageShownInCompletedTabWhenNoItems() {
+        composeTestRule.setContent {
+            LearnMyContentCompletedContent(
+                uiState = emptyContentState(),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertEmptyMessageDisplayed()
+    }
+
+    @Test
+    fun itemCardDisplayedInCompletedTab() {
+        composeTestRule.setContent {
+            LearnMyContentCompletedContent(
+                uiState = contentStateWithItems(),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertItemCardDisplayed("Introduction to Programming")
+    }
+
+    @Test
+    fun showMoreButtonDisplayedInCompletedTabWhenAvailable() {
+        composeTestRule.setContent {
+            LearnMyContentCompletedContent(
+                uiState = contentStateWithItems(showMoreButton = true),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertShowMoreButtonDisplayed()
+    }
+
+    // ─── Saved content tests ────────────────────────────────────────────────────
+
+    @Test
+    fun emptyStateMessageShownInSavedTabWhenNoItems() {
+        composeTestRule.setContent {
+            LearnMyContentSavedContent(
+                uiState = emptyCollectionItemState(),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertEmptyMessageDisplayed()
+    }
+
+    @Test
+    fun savedTabRendersLearnLearningLibraryItemWithItemName() {
+        composeTestRule.setContent {
+            LearnMyContentSavedContent(
+                uiState = savedContentStateWithItems(),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertItemCardDisplayed("Saved Course")
+    }
+
+    @Test
+    fun showMoreButtonDisplayedInSavedTabWhenAvailable() {
+        composeTestRule.setContent {
+            LearnMyContentSavedContent(
+                uiState = savedContentStateWithItems(showMoreButton = true),
+                navController = rememberNavController(),
+            )
+        }
+
+        page.assertShowMoreButtonDisplayed()
+    }
+
+    @Composable
+    private fun TabSelectorContent(
+        selectedTab: LearnMyContentTab,
+        onTabSelected: (LearnMyContentTab) -> Unit,
+    ) {
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+            FilterChip(
+                label = stringResource(R.string.LearnMyContentInProgressLabel),
+                selected = selectedTab == LearnMyContentTab.InProgress,
+                onClick = { onTabSelected(LearnMyContentTab.InProgress) },
+                size = FilterChipSize.LARGE,
+            )
+            FilterChip(
+                label = stringResource(R.string.LearnMyContentCompletedLabel),
+                selected = selectedTab == LearnMyContentTab.Completed,
+                onClick = { onTabSelected(LearnMyContentTab.Completed) },
+                size = FilterChipSize.LARGE,
+            )
+            FilterChip(
+                label = stringResource(R.string.LearnMyContentSavedLabel),
+                selected = selectedTab == LearnMyContentTab.Saved,
+                onClick = { onTabSelected(LearnMyContentTab.Saved) },
+                size = FilterChipSize.LARGE,
+            )
+        }
+    }
+
+    private fun emptyContentState(totalItemCount: Int = 0) = LearnMyContentUiState<LearnContentCardState>(
+        loadingState = LoadingState(),
+        contentCards = emptyList(),
+        totalItemCount = totalItemCount,
+        showMoreButton = false,
+        isMoreLoading = false,
+    )
+
+    private fun contentStateWithItems(
+        totalItemCount: Int = 2,
+        showMoreButton: Boolean = false,
+    ) = LearnMyContentUiState(
+        loadingState = LoadingState(),
+        contentCards = listOf(
+            LearnContentCardState(
+                name = "Introduction to Programming",
+                progress = 45.0,
+                route = "",
+                cardChips = listOf(
+                    LearnContentCardChipState(label = "Program", color = StatusChipColor.Violet),
+                    LearnContentCardChipState(label = "3 courses"),
+                ),
+            ),
+            LearnContentCardState(
+                name = "Advanced Data Structures",
+                progress = 10.0,
+                route = "",
+                buttonState = LearnContentCardButtonState(label = "Start learning", route = ""),
+                cardChips = listOf(
+                    LearnContentCardChipState(label = "Course", color = StatusChipColor.Institution),
+                ),
+            ),
+        ),
+        totalItemCount = totalItemCount,
+        showMoreButton = showMoreButton,
+        isMoreLoading = false,
+    )
+
+    private fun emptyCollectionItemState() = LearnMyContentUiState<LearnLearningLibraryCollectionItemState>(
+        loadingState = LoadingState(),
+        contentCards = emptyList(),
+        totalItemCount = 0,
+        showMoreButton = false,
+        isMoreLoading = false,
+    )
+
+    private fun savedContentStateWithItems(
+        showMoreButton: Boolean = false,
+    ) = LearnMyContentUiState(
+        loadingState = LoadingState(),
+        contentCards = listOf(
+            LearnLearningLibraryCollectionItemState(
+                id = "item1",
+                imageUrl = null,
+                name = "Saved Course",
+                description = null,
+                isBookmarked = true,
+                bookmarkLoading = false,
+                canEnroll = false,
+                type = CollectionItemType.COURSE,
+                route = null,
+                chips = listOf(LearnLearningLibraryCollectionItemChipState(label = "Course")),
+            )
+        ),
+        totalItemCount = 1,
+        showMoreButton = showMoreButton,
+        isMoreLoading = false,
+    )
+}
diff --git a/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnProgramListUiTest.kt b/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnProgramListUiTest.kt
deleted file mode 100644
index ddd4c5142d..0000000000
--- a/libs/horizon/src/androidTest/java/com/instructure/horizon/ui/features/learn/LearnProgramListUiTest.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.ui.features.learn
-
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performScrollToNode
-import androidx.navigation.compose.rememberNavController
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.instructure.horizon.features.learn.program.list.LearnProgramChipState
-import com.instructure.horizon.features.learn.program.list.LearnProgramListScreen
-import com.instructure.horizon.features.learn.program.list.LearnProgramListUiState
-import com.instructure.horizon.features.learn.program.list.LearnProgramState
-import com.instructure.horizon.horizonui.platform.LoadingState
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class LearnProgramListUiTest {
-    @get:Rule
-    val composeTestRule = createComposeRule()
-
-    private val testPrograms = listOf(
-        LearnProgramState(
-            programName = "Software Engineering",
-            programId = "program1",
-            programProgress = 0.0,
-            programChips = listOf(
-                LearnProgramChipState(label = "2 courses"),
-                LearnProgramChipState(label = "3 hours")
-            )
-        ),
-        LearnProgramState(
-            programName = "Data Science",
-            programId = "program2",
-            programProgress = 50.0,
-            programChips = listOf(
-                LearnProgramChipState(label = "3 courses")
-            )
-        ),
-        LearnProgramState(
-            programName = "Web Development",
-            programId = "program3",
-            programProgress = 100.0,
-            programChips = listOf(
-                LearnProgramChipState(label = "4 courses")
-            )
-        )
-    )
-
-    @Test
-    fun testLoadingStateDisplaysSpinner() {
-        val state = LearnProgramListUiState(
-            loadingState = LoadingState(isLoading = true),
-            filteredPrograms = emptyList()
-        )
-
-        composeTestRule.setContent {
-            LearnProgramListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithTag("LoadingSpinner")
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun testProgramListDisplaysPrograms() {
-        val state = LearnProgramListUiState(
-            loadingState = LoadingState(isLoading = false),
-            filteredPrograms = testPrograms
-        )
-
-        composeTestRule.setContent {
-            LearnProgramListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Software Engineering"))
-        composeTestRule.onNodeWithText("Software Engineering", useUnmergedTree = true)
-            .assertIsDisplayed()
-
-        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Data Science"))
-        composeTestRule.onNodeWithText("Data Science", useUnmergedTree = true)
-            .assertIsDisplayed()
-
-        composeTestRule.onNodeWithTag("CollapsableBody").performScrollToNode(hasText("Web Development"))
-        composeTestRule.onNodeWithText("Web Development", useUnmergedTree = true)
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun testProgramProgressDisplayed() {
-        val state = LearnProgramListUiState(
-            loadingState = LoadingState(isLoading = false),
-            filteredPrograms = listOf(
-                LearnProgramState(
-                    programName = "Test Program",
-                    programId = "program1",
-                    programProgress = 75.0,
-                    programChips = emptyList()
-                )
-            )
-        )
-
-        composeTestRule.setContent {
-            LearnProgramListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithText("Test Program", useUnmergedTree = true)
-            .assertIsDisplayed()
-    }
-
-    @Test
-    fun testFilteredProgramsDisplay() {
-        val state = LearnProgramListUiState(
-            loadingState = LoadingState(isLoading = false),
-            filteredPrograms = listOf(testPrograms[2])
-        )
-
-        composeTestRule.setContent {
-            LearnProgramListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithText("Web Development", useUnmergedTree = true)
-            .assertIsDisplayed()
-        composeTestRule.onNodeWithText("Software Engineering", useUnmergedTree = true)
-            .assertDoesNotExist()
-    }
-
-    @Test
-    fun testShowMoreButtonNotDisplayedWhenAllProgramsVisible() {
-        val state = LearnProgramListUiState(
-            loadingState = LoadingState(isLoading = false),
-            filteredPrograms = testPrograms,
-            visibleItemCount = 10
-        )
-
-        composeTestRule.setContent {
-            LearnProgramListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithText("Show More", useUnmergedTree = true)
-            .assertDoesNotExist()
-    }
-
-    @Test
-    fun testEmptyStateDisplayedWhenNoProgramsMatch() {
-        val state = LearnProgramListUiState(
-            loadingState = LoadingState(isLoading = false),
-            filteredPrograms = emptyList()
-        )
-
-        composeTestRule.setContent {
-            LearnProgramListScreen(
-                state = state,
-                navController = rememberNavController()
-            )
-        }
-
-        composeTestRule.onNodeWithTag("CollapsableBody")
-            .assertIsDisplayed()
-    }
-}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/HorizonActivity.kt b/libs/horizon/src/main/java/com/instructure/horizon/HorizonActivity.kt
index b758ea1205..fffb24c324 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/HorizonActivity.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/HorizonActivity.kt
@@ -19,15 +19,17 @@ import android.content.Intent
 import android.content.pm.ShortcutManager
 import android.content.res.Configuration
 import android.os.Bundle
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-import androidx.core.content.ContextCompat
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavDeepLinkRequest
@@ -46,9 +48,7 @@ import com.instructure.pandautils.utils.ColorKeeper
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.Utils
-import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.WebViewAuthenticator
-import com.instructure.pandautils.utils.getActivityOrNull
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -67,12 +67,14 @@ class HorizonActivity : BaseCanvasActivity() {
         if (ThemePrefs.appTheme != AppTheme.LIGHT.ordinal) {
             setLightTheme() // Force the light theme for Horizon experience to avoid any glitches.
         }
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.light(Color.Transparent.toArgb(), Color.Transparent.toArgb()),
+            navigationBarStyle = SystemBarStyle.light(Color.Transparent.toArgb(), Color.Transparent.toArgb())
+        )
 
         setContent {
             navController = rememberNavController()
 
-            val activity = LocalContext.current.getActivityOrNull()
-            if (activity != null) ViewStyler.setStatusBarColor(activity, ContextCompat.getColor(activity, R.color.surface_pagePrimary))
             HorizonTheme {
                 HorizonNavigation(navController)
             }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/account/AccountScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/account/AccountScreen.kt
index 55664491b9..3b40d1d2ef 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/account/AccountScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/account/AccountScreen.kt
@@ -49,7 +49,9 @@ import com.instructure.horizon.horizonui.foundation.HorizonSpace
 import com.instructure.horizon.horizonui.foundation.HorizonTypography
 import com.instructure.horizon.horizonui.foundation.SpaceSize
 import com.instructure.horizon.horizonui.molecules.HorizonDivider
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+import com.instructure.horizon.util.plus
 import com.instructure.pandautils.utils.LocaleUtils
 import com.instructure.pandautils.utils.getActivityOrNull
 
@@ -77,14 +79,29 @@ fun AccountScreen(
     }
 
     LoadingStateWrapper(state.screenState) {
-        AccountContentScreen(state, navController, state.performLogout, state.switchExperience)
+        EdgeToEdgeScaffold (
+            statusBarColor = HorizonColors.Surface.pagePrimary(),
+        ) { contentPadding ->
+            AccountContentScreen(
+                state,
+                contentPadding,
+                navController,
+                state.performLogout,
+                state.switchExperience)
+        }
     }
 }
 
 @Composable
-private fun AccountContentScreen(state: AccountUiState, navController: NavController, onLogout: () -> Unit, switchExperience: () -> Unit) {
+private fun AccountContentScreen(
+    state: AccountUiState,
+    contentPadding: PaddingValues,
+    navController: NavController,
+    onLogout: () -> Unit,
+    switchExperience: () -> Unit
+) {
     LazyColumn(
-        contentPadding = PaddingValues(24.dp)
+        contentPadding = PaddingValues(24.dp, 24.dp, 24.dp, 24.dp) + contentPadding
     ) {
         item {
             Column {
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/AiAssistantScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/AiAssistantScreen.kt
index 373acc91a8..bf958c5ca1 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/AiAssistantScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/AiAssistantScreen.kt
@@ -17,17 +17,20 @@ package com.instructure.horizon.features.aiassistant
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
+import com.instructure.horizon.R
 import com.instructure.horizon.features.aiassistant.navigation.AiAssistNavigation
 import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.util.bottomSafeDrawing
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -38,10 +41,11 @@ fun AiAssistantScreen(
     val navController = rememberNavController()
     val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     ModalBottomSheet(
-        containerColor = Color.White,
+        containerColor = colorResource(R.color.ai_gradient_end),
         onDismissRequest = { onDismiss() },
         dragHandle = null,
-        sheetState = bottomSheetState
+        sheetState = bottomSheetState,
+        contentWindowInsets = { WindowInsets.bottomSafeDrawing }
     ) {
         Box(
             modifier = Modifier
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatScreen.kt
index bdedd9460e..989e44d257 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatScreen.kt
@@ -39,11 +39,10 @@ import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
 import androidx.navigation.NavDeepLinkRequest
 import androidx.navigation.NavHostController
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.horizon.R
 import com.instructure.horizon.features.aiassistant.common.composable.AiAssistMessage
-import com.instructure.horizon.features.aiassistant.common.composable.AiAssistMessage
 import com.instructure.horizon.features.aiassistant.common.composable.AiAssistScaffold
 import com.instructure.horizon.features.aiassistant.common.model.AiAssistMessage
 import com.instructure.horizon.features.aiassistant.navigation.AiAssistRoute
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModel.kt
index e90465a24d..52c2b224e6 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModel.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModel.kt
@@ -19,7 +19,7 @@ package com.instructure.horizon.features.aiassistant.chat
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
 import com.instructure.canvasapi2.utils.weave.catch
 import com.instructure.canvasapi2.utils.weave.tryLaunch
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistContextProvider.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistContextProvider.kt
index 2b71093f69..884e1bf2f7 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistContextProvider.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistContextProvider.kt
@@ -16,7 +16,7 @@
  */
 package com.instructure.horizon.features.aiassistant.common
 
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 import com.instructure.horizon.features.aiassistant.common.model.AiAssistContext
 import com.instructure.horizon.features.aiassistant.common.model.AiAssistContextSource
 import com.instructure.horizon.features.aiassistant.common.model.AiAssistMessage
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepository.kt
index f69136e619..2f802b4ac3 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepository.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepository.kt
@@ -1,10 +1,10 @@
 package com.instructure.horizon.features.aiassistant.common
 
 import com.instructure.canvasapi2.apis.JourneyAssistAPI
-import com.instructure.canvasapi2.models.journey.JourneyAssistChatMessage
-import com.instructure.canvasapi2.models.journey.JourneyAssistRequestBody
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistChatMessage
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRequestBody
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 import com.instructure.horizon.features.aiassistant.common.model.AiAssistMessage
 import javax.inject.Inject
 
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/composable/AiAssistMessage.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/composable/AiAssistMessage.kt
index c734d2952d..a6d212b80b 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/composable/AiAssistMessage.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/composable/AiAssistMessage.kt
@@ -26,7 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.semantics.semantics
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
 import com.instructure.horizon.features.aiassistant.common.model.AiAssistMessage
 import com.instructure.horizon.features.aiassistant.common.model.toDeepLink
 
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistContext.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistContext.kt
index fb2585964d..7dbb0e3861 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistContext.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistContext.kt
@@ -1,6 +1,6 @@
 package com.instructure.horizon.features.aiassistant.common.model
 
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 
 data class AiAssistContext(
     val contextString: String? = null,
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistMessage.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistMessage.kt
index 744aeb8865..22da954ed4 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistMessage.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/common/model/AiAssistMessage.kt
@@ -16,13 +16,13 @@
  */
 package com.instructure.horizon.features.aiassistant.common.model
 
-import com.instructure.canvasapi2.models.journey.JourneyAssistChatMessage
-import com.instructure.canvasapi2.models.journey.JourneyAssistChipOption
-import com.instructure.canvasapi2.models.journey.JourneyAssistCitation
-import com.instructure.canvasapi2.models.journey.JourneyAssistCitationType
-import com.instructure.canvasapi2.models.journey.JourneyAssistFlashCard
-import com.instructure.canvasapi2.models.journey.JourneyAssistQuizItem
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistChatMessage
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistChipOption
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistCitation
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistCitationType
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistFlashCard
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistQuizItem
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
 import com.instructure.canvasapi2.utils.ApiPrefs
 
 data class AiAssistMessage(
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModel.kt
index a46ab60779..a893e400a5 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModel.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModel.kt
@@ -18,7 +18,7 @@ package com.instructure.horizon.features.aiassistant.flashcard
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
 import com.instructure.canvasapi2.utils.weave.catch
 import com.instructure.canvasapi2.utils.weave.tryLaunch
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModel.kt
index 1249adc6e4..178b7a086c 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModel.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModel.kt
@@ -18,7 +18,7 @@ package com.instructure.horizon.features.aiassistant.main
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
 import com.instructure.canvasapi2.utils.weave.catch
 import com.instructure.canvasapi2.utils.weave.tryLaunch
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModel.kt
index de69d6a9d0..8566210bf1 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModel.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModel.kt
@@ -18,7 +18,7 @@ package com.instructure.horizon.features.aiassistant.quiz
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
 import com.instructure.canvasapi2.utils.weave.catch
 import com.instructure.canvasapi2.utils.weave.tryLaunch
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/DashboardScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/DashboardScreen.kt
index 11dea32673..dba5012b9b 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/DashboardScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/DashboardScreen.kt
@@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
@@ -90,12 +91,10 @@ import com.instructure.horizon.horizonui.molecules.BadgeType
 import com.instructure.horizon.horizonui.molecules.IconButton
 import com.instructure.horizon.horizonui.molecules.IconButtonColor
 import com.instructure.horizon.horizonui.organisms.AnimatedHorizontalPager
-import com.instructure.horizon.horizonui.organisms.CollapsableHeaderScreen
+import com.instructure.horizon.horizonui.organisms.scaffolds.CollapsableHeaderScreen
 import com.instructure.horizon.navigation.MainNavigationRoute
+import com.instructure.horizon.util.zeroScreenInsets
 import com.instructure.pandautils.compose.modifiers.conditional
-import com.instructure.pandautils.utils.ThemePrefs
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.getActivityOrNull
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @Composable
@@ -115,14 +114,6 @@ fun DashboardScreen(uiState: DashboardUiState, navController: NavHostController)
 
     NotificationPermissionRequest()
 
-    val activity = LocalContext.current.getActivityOrNull()
-    if (activity != null) ViewStyler.setStatusBarColor(activity, ContextCompat.getColor(activity, R.color.surface_pagePrimary))
-
-    LaunchedEffect(key1 = uiState.theme) {
-        val theme = uiState.theme
-        if (theme != null && activity != null && !ThemePrefs.isThemeApplied) ThemePrefs.applyCanvasTheme(theme, activity)
-    }
-
     LaunchedEffect(shouldRefresh) {
         if (shouldRefresh) {
             shouldRefresh = false
@@ -148,52 +139,58 @@ fun DashboardScreen(uiState: DashboardUiState, navController: NavHostController)
     }
 
     Scaffold(
+        contentWindowInsets = WindowInsets.zeroScreenInsets,
         containerColor = HorizonColors.Surface.pagePrimary(),
         snackbarHost = { SnackbarHost(snackbarHostState) }
-    ) { paddingValues ->
-        val pullToRefreshState = rememberPullToRefreshState()
-        val isRefreshing = refreshState.any { it }
-        PullToRefreshBox(
-            isRefreshing = isRefreshing,
-            onRefresh = { shouldRefresh = true },
-            state = pullToRefreshState,
-            indicator = {
-                Indicator(
+    ) { innerPadding ->
+        val scrollState = rememberScrollState()
+        CollapsableHeaderScreen(
+            statusBarColor = HorizonColors.Surface.pagePrimary(),
+            modifier = Modifier.padding(innerPadding),
+            headerContent = { paddingValues ->
+                Column(
                     modifier = Modifier
-                        .align(Alignment.TopCenter)
-                        .padding(top = 56.dp),
-                    isRefreshing = isRefreshing,
-                    containerColor = HorizonColors.Surface.pageSecondary(),
-                    color = HorizonColors.Surface.institution(),
-                    state = pullToRefreshState
-                )
-            }
-        ){
-            val scrollState = rememberScrollState()
-            CollapsableHeaderScreen(
-                modifier = Modifier.padding(paddingValues),
-                headerContent = {
-                    Column(
-                        modifier = Modifier.conditional(scrollState.canScrollBackward) {
+                        .padding(paddingValues)
+                        .conditional(scrollState.canScrollBackward) {
                             shadow(
                                 elevation = HorizonElevation.level3,
                                 spotColor = Color.Transparent,
                             )
                         }
-                    ) {
-                        HomeScreenTopBar(
-                            uiState,
-                            navController,
+                ) {
+                    DashboardTopBar(
+                        uiState,
+                        navController,
+                        modifier = Modifier
+                            .height(56.dp)
+                            .padding(bottom = 12.dp)
+                    )
+                }
+            },
+            bodyContent = { contentPadding ->
+                val pullToRefreshState = rememberPullToRefreshState()
+                val isRefreshing = refreshState.any { it }
+                PullToRefreshBox(
+                    isRefreshing = isRefreshing,
+                    onRefresh = { shouldRefresh = true },
+                    state = pullToRefreshState,
+                    indicator = {
+                        Indicator(
                             modifier = Modifier
-                                .height(56.dp)
-                                .padding(bottom = 12.dp)
+                                .align(Alignment.TopCenter)
+                                .padding(contentPadding)
+                                ,//.padding(top = 56.dp),
+                            isRefreshing = isRefreshing,
+                            containerColor = HorizonColors.Surface.pageSecondary(),
+                            color = HorizonColors.Surface.institution(),
+                            state = pullToRefreshState
                         )
                     }
-                },
-                bodyContent = {
+                ) {
                     Column(
                         horizontalAlignment = Alignment.CenterHorizontally,
                         modifier = Modifier
+                            .padding(contentPadding)
                             .verticalScroll(scrollState)
                     ) {
                         HorizonSpace(SpaceSize.SPACE_12)
@@ -221,17 +218,18 @@ fun DashboardScreen(uiState: DashboardUiState, navController: NavHostController)
                         HorizonSpace(SpaceSize.SPACE_24)
                     }
                 }
-            )
-        }
+            }
+        )
     }
 }
 
 @Composable
-private fun HomeScreenTopBar(uiState: DashboardUiState, navController: NavController, modifier: Modifier = Modifier
+private fun DashboardTopBar(uiState: DashboardUiState, navController: NavController, modifier: Modifier = Modifier
 ) {
     Row(
         verticalAlignment = Alignment.Bottom,
-        modifier = modifier.padding(horizontal = 24.dp)
+        modifier = modifier
+            .padding(horizontal = 24.dp)
     ) {
         GlideImage(
             model = uiState.logoUrl,
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/announcement/DashboardAnnouncementBannerWidget.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/announcement/DashboardAnnouncementBannerWidget.kt
index 6ef079da21..12953e54a4 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/announcement/DashboardAnnouncementBannerWidget.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/announcement/DashboardAnnouncementBannerWidget.kt
@@ -16,12 +16,14 @@
  */
 package com.instructure.horizon.features.dashboard.widget.announcement
 
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import com.instructure.horizon.R
@@ -80,7 +82,7 @@ fun DashboardAnnouncementBannerSection(
                 false,
                 DashboardWidgetPageState.Empty,
                 { state.onRefresh {} },
-                modifier
+                modifier.padding(horizontal = 24.dp)
             )
         }
         DashboardItemState.SUCCESS -> {
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/course/DashboardCourseSection.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/course/DashboardCourseSection.kt
index 7a495db305..9fc425ef59 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/course/DashboardCourseSection.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/dashboard/widget/course/DashboardCourseSection.kt
@@ -50,7 +50,7 @@ import com.instructure.horizon.features.dashboard.widget.course.card.DashboardCo
 import com.instructure.horizon.features.dashboard.widget.course.card.DashboardCourseCardError
 import com.instructure.horizon.features.dashboard.widget.course.card.DashboardCourseCardState
 import com.instructure.horizon.features.dashboard.widget.course.card.DashboardMoreCourseCard
-import com.instructure.horizon.features.learn.LearnTab
+import com.instructure.horizon.features.home.HomeNavigationRoute
 import com.instructure.horizon.features.learn.navigation.LearnRoute
 import com.instructure.horizon.horizonui.foundation.HorizonColors
 import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius
@@ -165,7 +165,8 @@ private fun DashboardCourseSectionContent(
                                 .padding(bottom = 12.dp)
                                 .height(maxCardHeight.toDp.dp)
                         ) {
-                            navController.navigate(LearnRoute.LearnScreen.route(LearnTab.COURSES)) {
+                            navController.clearBackStack(HomeNavigationRoute.Learn.route)
+                            navController.navigate(LearnRoute.LearnScreen.route) {
                                 popUpTo(navController.graph.findStartDestination().id) {
                                     saveState = true
                                 }
@@ -180,7 +181,8 @@ private fun DashboardCourseSectionContent(
             Button(
                 stringResource(R.string.dashboardSeeAllCoursesLabel),
                 onClick = {
-                    navController.navigate(LearnRoute.LearnScreen.route(LearnTab.COURSES)) {
+                    navController.clearBackStack(HomeNavigationRoute.Learn.route)
+                    navController.navigate(LearnRoute.LearnScreen.route) {
                         popUpTo(navController.graph.findStartDestination().id) {
                             saveState = true
                         }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/home/HomeBottomNavigationBar.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/home/HomeBottomNavigationBar.kt
index db98b13b6f..4302663d17 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/home/HomeBottomNavigationBar.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/home/HomeBottomNavigationBar.kt
@@ -74,8 +74,9 @@ fun isBottomBarVisible(navController: NavHostController): Boolean {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
     val currentDestination = navBackStackEntry?.destination
 
+    val subPageRoutes = bottomNavItems.filter { it.containsSubPages }.map { it.route }.toSet()
     return bottomNavItems.map { it.route }.contains(currentDestination?.route)
-            || bottomNavItems.filter { it.containsSubPages }.map { it.route }.contains(currentDestination?.parent?.route)
+            || currentDestination?.hierarchy?.drop(1)?.any { it.route in subPageRoutes } == true
 }
 
 @Composable
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/compose/HorizonInboxComposeScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/compose/HorizonInboxComposeScreen.kt
index e4a64e4c0b..67834198b6 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/compose/HorizonInboxComposeScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/compose/HorizonInboxComposeScreen.kt
@@ -30,7 +30,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
@@ -49,7 +48,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.instructure.canvasapi2.utils.ContextKeeper
@@ -88,8 +86,7 @@ import com.instructure.horizon.horizonui.organisms.inputs.textarea.TextAreaState
 import com.instructure.horizon.horizonui.organisms.inputs.textfield.TextField
 import com.instructure.horizon.horizonui.organisms.inputs.textfield.TextFieldInputSize
 import com.instructure.horizon.horizonui.organisms.inputs.textfield.TextFieldState
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.getActivityOrNull
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -107,14 +104,10 @@ fun HorizonInboxComposeScreen(
             }
         }
     }
-    val activity = LocalContext.current.getActivityOrNull()
-    LaunchedEffect(Unit) {
-        if (activity != null) {
-            ViewStyler.setStatusBarColor(activity, ContextCompat.getColor(activity, R.color.surface_pageSecondary))
-        }
-    }
 
-    Scaffold(
+    EdgeToEdgeScaffold(
+        statusBarColor = HorizonColors.Surface.pageSecondary(),
+        navigationBarColor = HorizonColors.Surface.pageSecondary(),
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         containerColor = HorizonColors.Surface.pageSecondary(),
         topBar = {
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/details/HorizonInboxDetailsScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/details/HorizonInboxDetailsScreen.kt
index 184945be90..34a1a43f02 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/details/HorizonInboxDetailsScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/details/HorizonInboxDetailsScreen.kt
@@ -37,7 +37,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
@@ -83,6 +82,7 @@ import com.instructure.horizon.horizonui.organisms.Modal
 import com.instructure.horizon.horizonui.organisms.ModalDialogState
 import com.instructure.horizon.horizonui.organisms.inputs.textarea.TextArea
 import com.instructure.horizon.horizonui.organisms.inputs.textarea.TextAreaState
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
 import com.instructure.horizon.horizonui.platform.LoadingState
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
 import com.instructure.pandautils.compose.composables.ComposeCanvasWebViewWrapper
@@ -101,11 +101,26 @@ fun HorizonInboxDetailsScreen(
     state: HorizonInboxDetailsUiState,
     navController: NavHostController
 ) {
-    Scaffold(
+    EdgeToEdgeScaffold(
+        statusBarColor = null,
+        navigationBarColor = if (state.replyState == null)
+            HorizonColors.Surface.cardPrimary()
+        else
+            HorizonColors.Surface.pagePrimary(),
         containerColor = HorizonColors.Surface.pagePrimary(),
-        topBar = { HorizonInboxDetailsHeader(state.title, state.titleIcon, state, navController) },
+        topBar = {
+            HorizonInboxDetailsHeader(
+                state.title,
+                state.titleIcon,
+                state,
+                navController
+            )
+        },
     ) { innerPadding ->
-        LoadingStateWrapper(state.loadingState, modifier = Modifier.padding(innerPadding)) {
+        LoadingStateWrapper(
+            state.loadingState,
+            modifier = Modifier.padding(innerPadding)
+        ) {
             BackHandler { onExit(state, navController) }
 
             state.replyState?.let { replyState ->
@@ -129,7 +144,11 @@ fun HorizonInboxDetailsScreen(
                                 replyState.updateShowExitConfirmationDialog(false)
                                 navController.popBackStack()
                             },
-                            secondaryButtonClick = { replyState.updateShowExitConfirmationDialog(false) }
+                            secondaryButtonClick = {
+                                replyState.updateShowExitConfirmationDialog(
+                                    false
+                                )
+                            }
                         )
                     )
                 }
@@ -186,7 +205,7 @@ private fun HorizonInboxDetailsHeader(
             containerColor = HorizonColors.Surface.pagePrimary(),
             titleContentColor = HorizonColors.Text.title(),
             navigationIconContentColor = HorizonColors.Icon.default()
-        )
+        ),
     )
 }
 
@@ -218,6 +237,7 @@ private fun HorizonInboxDetailsContent(
                 .semantics {
                     isTraversalGroup = true
                 },
+            reverseLayout = state.bottomLayout,
             contentPadding = PaddingValues(top = 16.dp)
         ) {
             itemsIndexed(state.items) { index, item ->
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/list/HorizonInboxListScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/list/HorizonInboxListScreen.kt
index 08dddce21f..a26b5839a8 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/list/HorizonInboxListScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/inbox/list/HorizonInboxListScreen.kt
@@ -20,6 +20,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -31,7 +32,6 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
@@ -54,7 +54,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.instructure.canvasapi2.utils.ContextKeeper
@@ -83,8 +82,7 @@ import com.instructure.horizon.horizonui.organisms.inputs.multiselectsearch.Mult
 import com.instructure.horizon.horizonui.organisms.inputs.singleselect.SingleSelect
 import com.instructure.horizon.horizonui.organisms.inputs.singleselect.SingleSelectInputSize
 import com.instructure.horizon.horizonui.organisms.inputs.singleselect.SingleSelectState
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.getActivityOrNull
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
 import com.instructure.pandautils.utils.localisedFormat
 import java.util.Date
 
@@ -102,21 +100,17 @@ fun HorizonInboxListScreen(
             }
         }
     }
-    val activity = LocalContext.current.getActivityOrNull()
-    LaunchedEffect(Unit) {
-        if (activity != null) {
-            ViewStyler.setStatusBarColor(activity, ContextCompat.getColor(activity, R.color.surface_pagePrimary))
-        }
-    }
 
-    Scaffold(
+    EdgeToEdgeScaffold(
+        statusBarColor = HorizonColors.Surface.pagePrimary(),
+        navigationBarColor = HorizonColors.Surface.cardPrimary(),
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         containerColor = HorizonColors.Surface.pagePrimary(),
-    ) { padding ->
+    ) { contentPadding ->
         InboxStateWrapper(
             state,
             navController,
-            Modifier.padding(padding)
+            contentPadding
         )
     }
 }
@@ -126,6 +120,7 @@ fun HorizonInboxListScreen(
 private fun InboxStateWrapper(
     state: HorizonInboxListUiState,
     navController: NavHostController,
+    contentPadding: PaddingValues,
     modifier: Modifier = Modifier
 ) {
     val pullToRefreshState = rememberPullToRefreshState()
@@ -138,7 +133,8 @@ private fun InboxStateWrapper(
         indicator = {
             Indicator(
                 modifier = Modifier
-                    .align(Alignment.TopCenter),
+                    .align(Alignment.TopCenter)
+                    .padding(contentPadding),
                 isRefreshing = state.loadingState.isRefreshing,
                 containerColor = HorizonColors.Surface.pageSecondary(),
                 color = HorizonColors.Surface.institution(),
@@ -146,7 +142,9 @@ private fun InboxStateWrapper(
             )
         },
         content = {
-            LazyColumn {
+            LazyColumn(
+                contentPadding = contentPadding
+            ) {
                 inboxHeader(state, navController)
 
                 if (state.loadingState.isLoading) {
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnEventHandler.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnEventHandler.kt
index 5d31ea7f04..3cada1d7e2 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnEventHandler.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnEventHandler.kt
@@ -15,13 +15,24 @@
  */
 package com.instructure.horizon.features.learn
 
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 sealed interface LearnEvent {
-    data object RefreshRequested : LearnEvent
+    data object RefreshCourseProgress : LearnEvent
+    data object RefreshCourseList : LearnEvent
+    data object RefreshProgramList : LearnEvent
+    data object RefreshLearningLibraryList : LearnEvent
+    data class UpdateLearningLibraryFilter(
+        val screenType: LearnLearningLibraryFilterScreenType,
+        val typeFilter: LearnLearningLibraryTypeFilter,
+        val sortOption: LearnLearningLibrarySortOption,
+    ) : LearnEvent
 }
 
 @Singleton
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnRepository.kt
index 4b531fb0c0..c4e1e45dc1 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnRepository.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnRepository.kt
@@ -15,29 +15,14 @@
  */
 package com.instructure.horizon.features.learn
 
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithModuleItemDurations
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
-import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
-import com.instructure.canvasapi2.utils.ApiPrefs
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
 import javax.inject.Inject
 
 class LearnRepository @Inject constructor(
-    private val horizonGetCoursesManager: HorizonGetCoursesManager,
-    private val getProgramsManager: GetProgramsManager,
-    private val apiPrefs: ApiPrefs
+    private val getLearningLibraryManager: GetLearningLibraryManager,
 ) {
-    suspend fun getCoursesWithProgress(forceNetwork: Boolean): List<CourseWithProgress> {
-        val courseWithProgress = horizonGetCoursesManager.getCoursesWithProgress(apiPrefs.user?.id ?: -1, forceNetwork).dataOrThrow
-        return courseWithProgress
-    }
-
-    suspend fun getCoursesById(courseIds: List<Long>, forceNetwork: Boolean = false): List<CourseWithModuleItemDurations> = coroutineScope {
-        courseIds.map { id ->
-            async { horizonGetCoursesManager.getProgramCourses(id, forceNetwork).dataOrThrow }
-        }.awaitAll()
+    suspend fun getEnrolledLearningLibraries(forceNetwork: Boolean): List<EnrolledLearningLibraryCollection> {
+        return getLearningLibraryManager.getEnrolledLearningLibraryCollections(4, forceNetwork).collections
     }
 }
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnScreen.kt
index 0f5faa2a38..f828079442 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnScreen.kt
@@ -36,12 +36,12 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.instructure.canvasapi2.utils.ContextKeeper
-import com.instructure.horizon.features.learn.course.list.LearnCourseListScreen
-import com.instructure.horizon.features.learn.course.list.LearnCourseListViewModel
-import com.instructure.horizon.features.learn.program.list.LearnProgramListScreen
-import com.instructure.horizon.features.learn.program.list.LearnProgramListViewModel
+import com.instructure.horizon.features.learn.learninglibrary.list.LearnLearningLibraryListScreen
+import com.instructure.horizon.features.learn.learninglibrary.list.LearnLearningLibraryListViewModel
+import com.instructure.horizon.features.learn.mycontent.LearnMyContentScreen
+import com.instructure.horizon.features.learn.mycontent.LearnMyContentViewModel
 import com.instructure.horizon.horizonui.foundation.HorizonColors
-import com.instructure.horizon.horizonui.organisms.CollapsableScaffold
+import com.instructure.horizon.horizonui.organisms.scaffolds.CollapsableScaffold
 import com.instructure.horizon.horizonui.organisms.tabrow.TabRow
 
 @Composable
@@ -66,28 +66,30 @@ fun LearnScreen(
 
     CollapsableScaffold(
         containerColor = HorizonColors.Surface.pagePrimary(),
-        topBar = {
+        topBar = { paddingValues ->
             TabRow(
                 tabs = state.tabs,
                 selectedIndex = state.tabs.indexOf(state.selectedTab),
                 onTabSelected = { state.updateSelectedTabIndex(it) },
                 tabAlignment = Alignment.Start,
                 tabItemToLabel = { stringResource(it.labelRes) },
-                modifier = Modifier.padding(horizontal = 24.dp)
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .padding(horizontal = 24.dp)
             )
         }
-    ) {
-        HorizontalPager(pagerState) { pageIndex ->
+    ) { paddingValues ->
+        HorizontalPager(pagerState, Modifier.padding(paddingValues)) { pageIndex ->
             when(LearnTab.entries[pageIndex]) {
-                LearnTab.COURSES -> {
-                    val viewModel = hiltViewModel<LearnCourseListViewModel>()
-                    val state by viewModel.state.collectAsState()
-                    LearnCourseListScreen(state, navController)
+                LearnTab.MY_CONTENT -> {
+                    val viewModel = hiltViewModel<LearnMyContentViewModel>()
+                    val state by viewModel.uiState.collectAsState()
+                    LearnMyContentScreen(state, navController)
                 }
-                LearnTab.PROGRAMS -> {
-                    val viewModel = hiltViewModel<LearnProgramListViewModel>()
+                LearnTab.BROWSE -> {
+                    val viewModel = hiltViewModel<LearnLearningLibraryListViewModel>()
                     val state by viewModel.uiState.collectAsState()
-                    LearnProgramListScreen(state, navController)
+                    LearnLearningLibraryListScreen(state, navController)
                 }
             }
         }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnUiState.kt
index 6791a231b3..39343eb99d 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnUiState.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnUiState.kt
@@ -20,15 +20,14 @@ import com.instructure.horizon.R
 
 data class LearnUiState(
     val tabs: List<LearnTab> = LearnTab.entries,
-    val selectedTab: LearnTab = LearnTab.COURSES,
+    val selectedTab: LearnTab = LearnTab.MY_CONTENT,
     val updateSelectedTabIndex: (Int) -> Unit = {},
     val updateSelectedTab: (String) -> Unit = {},
 )
 
 enum class LearnTab(@get:StringRes val labelRes: Int, val stringValue: String) {
-    COURSES(R.string.learnCoursesTabLabel, "courses"),
-    PROGRAMS(R.string.learnProgramsTabLabel, "programs")
-    // TODO: LEARNING_LIBRARY("Learning Library")
+    MY_CONTENT(R.string.learnMyContentTabLabel, "my-content"),
+    BROWSE(R.string.learnBrowseTabLabel, "browse")
     ;
     companion object {
         fun fromStringValue(stringValue: String?): LearnTab? {
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnViewModel.kt
index 1115c7153a..00235f5377 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnViewModel.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/LearnViewModel.kt
@@ -15,9 +15,10 @@
  */
 package com.instructure.horizon.features.learn
 
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
-import com.instructure.horizon.features.learn.navigation.LearnRoute
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -26,19 +27,22 @@ import javax.inject.Inject
 
 @HiltViewModel
 class LearnViewModel @Inject constructor(
-    savedStateHandle: SavedStateHandle
+    private val repository: LearnRepository,
 ) : ViewModel() {
     private val _uiState = MutableStateFlow(LearnUiState(
         updateSelectedTab = ::updateSelectedTab,
-        updateSelectedTabIndex = ::updateSelectedTabIndex
+        updateSelectedTabIndex = ::updateSelectedTabIndex,
+        tabs = listOf(LearnTab.MY_CONTENT)
     ))
     val state = _uiState.asStateFlow()
 
     init {
-        val selectedTabValue = savedStateHandle.get<String>(LearnRoute.LearnScreen.selectedTabAttr)
-        LearnTab.fromStringValue(selectedTabValue)?.let { selectedTab ->
-            _uiState.update { it.copy(selectedTab = selectedTab) }
-        }
+        viewModelScope.tryLaunch {
+            val enrolledLearningLibraries = repository.getEnrolledLearningLibraries(false)
+            if (enrolledLearningLibraries.isNotEmpty()) {
+                _uiState.update { it.copy(tabs = it.tabs + LearnTab.BROWSE) }
+            }
+        } catch { }
     }
 
     private fun updateSelectedTabIndex(tabIndex: Int) {
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/common/LearnSearchBar.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/common/LearnSearchBar.kt
index 57be7e066e..a7d820f837 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/common/LearnSearchBar.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/common/LearnSearchBar.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Icon
@@ -29,6 +28,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import com.instructure.horizon.R
@@ -37,6 +37,9 @@ import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius
 import com.instructure.horizon.horizonui.foundation.HorizonSpace
 import com.instructure.horizon.horizonui.foundation.HorizonTypography
 import com.instructure.horizon.horizonui.foundation.SpaceSize
+import com.instructure.horizon.horizonui.molecules.IconButton
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.horizon.horizonui.molecules.IconButtonSize
 
 @Composable
 fun LearnSearchBar(
@@ -46,40 +49,60 @@ fun LearnSearchBar(
     modifier: Modifier = Modifier,
 ) {
     BasicTextField(
-        modifier = modifier
-            .fillMaxWidth(),
+        modifier = modifier,
         value = value,
         onValueChange = onValueChange,
         singleLine = true,
         textStyle = HorizonTypography.p1,
-        decorationBox = { SearchBarDecorationBox(value, placeholder) { it() } },
+        decorationBox = { SearchBarDecorationBox(value, onValueChange, placeholder) { it() } },
     )
 }
 
 @Composable
-private fun SearchBarDecorationBox(value: TextFieldValue, placeholder: String, innerTextField: @Composable () -> Unit) {
+private fun SearchBarDecorationBox(
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
+    placeholder: String,
+    innerTextField: @Composable () -> Unit
+) {
     Box(
         contentAlignment = Alignment.CenterStart,
         modifier = Modifier
             .background(HorizonColors.Surface.cardPrimary(), HorizonCornerRadius.level6)
             .border(1.dp, HorizonColors.LineAndBorder.containerStroke(), HorizonCornerRadius.level6)
-            .padding(horizontal = 16.dp, vertical = 12.dp)
+            .padding(horizontal = 16.dp)
     ){
-        innerTextField()
-        if (value.text.isEmpty()) {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.search),
+                contentDescription = null,
+                tint = HorizonColors.Icon.light()
+            )
+            HorizonSpace(SpaceSize.SPACE_8)
+            Box(
+                contentAlignment = Alignment.CenterStart,
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(vertical = 12.dp)
             ) {
-                Icon(
-                    painter = painterResource(R.drawable.search),
-                    contentDescription = null,
-                    tint = HorizonColors.Icon.light()
-                )
-                HorizonSpace(SpaceSize.SPACE_8)
-                Text(
-                    text = placeholder,
-                    style = HorizonTypography.p1,
-                    color = HorizonColors.Text.placeholder()
+                if (value.text.isEmpty()) {
+                    Text(
+                        text = placeholder,
+                        style = HorizonTypography.p1,
+                        color = HorizonColors.Text.placeholder(),
+                    )
+                }
+                innerTextField()
+            }
+             if (value.text.isNotEmpty()) {
+                IconButton(
+                    iconRes = R.drawable.cancel,
+                    size = IconButtonSize.SMALL,
+                    color = IconButtonColor.Ghost,
+                    contentDescription = stringResource(R.string.a11y_learnClearSearchQueryContentDescription),
+                    onClick = { onValueChange(TextFieldValue("")) }
                 )
             }
         }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/CourseDetailsScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/CourseDetailsScreen.kt
index 638563fa28..0cc7a53bf0 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/CourseDetailsScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/CourseDetailsScreen.kt
@@ -57,7 +57,7 @@ import com.instructure.horizon.horizonui.molecules.IconButtonColor
 import com.instructure.horizon.horizonui.molecules.IconButtonSize
 import com.instructure.horizon.horizonui.molecules.ProgressBarSmall
 import com.instructure.horizon.horizonui.molecules.ProgressBarStyle
-import com.instructure.horizon.horizonui.organisms.CollapsableHeaderScreen
+import com.instructure.horizon.horizonui.organisms.scaffolds.CollapsableHeaderScreen
 import com.instructure.horizon.horizonui.organisms.tabrow.TabRow
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
 import com.instructure.horizon.horizonui.selectable
@@ -75,10 +75,12 @@ fun CourseDetailsScreen(
 
     LoadingStateWrapper(state.loadingState){
         CollapsableHeaderScreen(
-            headerContent = {
+            statusBarColor = HorizonColors.Surface.pagePrimary(),
+            headerContent = { paddingValues ->
                 Column(
                     Modifier
                         .fillMaxWidth()
+                        .padding(paddingValues)
                         .padding(horizontal = 24.dp, vertical = 8.dp)
                 ) {
                     Row(
@@ -102,8 +104,8 @@ fun CourseDetailsScreen(
                     CourseProgress(state.courseProgress)
                 }
             },
-            bodyContent = {
-                Column {
+            bodyContent = { paddingValues ->
+                Column(Modifier.padding(paddingValues)) {
                     TabRow(
                         tabs = state.availableTabs,
                         selectedIndex = pagerState.currentPage,
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/progress/CourseProgressViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/progress/CourseProgressViewModel.kt
index be08befb4b..d48c45b535 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/progress/CourseProgressViewModel.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/details/progress/CourseProgressViewModel.kt
@@ -59,7 +59,8 @@ class CourseProgressViewModel @Inject constructor(
         viewModelScope.launch {
             learnEventHandler.events.collect { event ->
                 when (event) {
-                    is LearnEvent.RefreshRequested -> refresh()
+                    is LearnEvent.RefreshCourseProgress -> refresh()
+                    else -> {}
                 }
             }
         }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListScreen.kt
deleted file mode 100644
index acb3973e85..0000000000
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListScreen.kt
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.course.list
-
-import android.graphics.drawable.Drawable
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavHostController
-import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
-import com.bumptech.glide.integration.compose.GlideImage
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
-import com.instructure.horizon.R
-import com.instructure.horizon.features.learn.common.LearnSearchBar
-import com.instructure.horizon.features.learn.course.list.LearnCourseFilterOption.Companion.getProgressOption
-import com.instructure.horizon.features.learn.navigation.LearnRoute
-import com.instructure.horizon.horizonui.animation.shimmerEffect
-import com.instructure.horizon.horizonui.foundation.HorizonColors
-import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius
-import com.instructure.horizon.horizonui.foundation.HorizonElevation
-import com.instructure.horizon.horizonui.foundation.HorizonSpace
-import com.instructure.horizon.horizonui.foundation.HorizonTypography
-import com.instructure.horizon.horizonui.foundation.SpaceSize
-import com.instructure.horizon.horizonui.foundation.horizonBorderShadow
-import com.instructure.horizon.horizonui.foundation.horizonShadow
-import com.instructure.horizon.horizonui.molecules.Button
-import com.instructure.horizon.horizonui.molecules.ButtonColor
-import com.instructure.horizon.horizonui.molecules.ButtonHeight
-import com.instructure.horizon.horizonui.molecules.ButtonWidth
-import com.instructure.horizon.horizonui.molecules.DropdownChip
-import com.instructure.horizon.horizonui.molecules.DropdownItem
-import com.instructure.horizon.horizonui.molecules.ProgressBarSmall
-import com.instructure.horizon.horizonui.molecules.ProgressBarStyle
-import com.instructure.horizon.horizonui.organisms.CollapsableHeaderScreen
-import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
-import com.instructure.pandautils.compose.modifiers.conditional
-import kotlin.math.roundToInt
-
-@Composable
-fun LearnCourseListScreen(
-    state: LearnCourseListUiState,
-    navController: NavHostController
-) {
-    CollapsableHeaderScreen(
-        headerContent = {
-            Searchbar(state)
-        },
-        bodyContent = {
-            LearnCourseListContent(state, navController)
-        }
-    )
-}
-
-@Composable
-private fun Searchbar(state: LearnCourseListUiState) {
-    LearnSearchBar(
-        value = state.searchQuery,
-        onValueChange = { state.updateSearchQuery(it) },
-        placeholder = stringResource(R.string.learnCourseListSearchBarPlaceholder),
-        modifier = Modifier.padding(24.dp)
-    )
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-private fun LearnCourseListContent(
-    state: LearnCourseListUiState,
-    navController: NavHostController
-) {
-    LoadingStateWrapper(state.loadingState) {
-        val scrollState = rememberLazyListState()
-        LazyColumn(
-            state = scrollState,
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-            contentPadding = PaddingValues(bottom = 24.dp),
-            modifier = Modifier.testTag("CollapsableBody")
-        ) {
-            stickyHeader {
-                LearnCourseListFilter(state, scrollState)
-            }
-
-            if (state.coursesToDisplay.isEmpty()) {
-                item {
-                    EmptyMessage()
-                }
-            }
-
-            items(state.coursesToDisplay.take(state.visibleItemCount)) {
-                LearnCourseCard(it, Modifier.padding(horizontal = 24.dp)) {
-                    navController.navigate(LearnRoute.LearnCourseDetailsScreen.route(it.courseId))
-                }
-            }
-
-            if (state.coursesToDisplay.size > state.visibleItemCount) {
-                item {
-                    Button(
-                        label = stringResource(R.string.learnCourseListShowMoreLabel),
-                        width = ButtonWidth.FILL,
-                        height = ButtonHeight.SMALL,
-                        color = ButtonColor.BlackOutline,
-                        onClick = { state.increaseVisibleItemCount() },
-                        modifier = Modifier.padding(horizontal = 24.dp)
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun LearnCourseListFilter(state: LearnCourseListUiState, scrollState: LazyListState) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
-        modifier = Modifier
-            .fillMaxWidth()
-            .conditional(scrollState.canScrollBackward) {
-                horizonBorderShadow(HorizonColors.LineAndBorder.lineStroke(), bottom = 1.dp)
-            }
-            .background(HorizonColors.Surface.pagePrimary())
-            .padding(horizontal = 24.dp, vertical = 16.dp)
-    ) {
-        DropdownChip(
-            items = LearnCourseFilterOption.entries.map {
-                DropdownItem(it, stringResource(it.labelRes))
-            },
-            selectedItem = DropdownItem(
-                state.selectedFilterValue,
-                stringResource(state.selectedFilterValue.labelRes))
-            ,
-            onItemSelected = { state.updateFilterValue(it?.value ?: LearnCourseFilterOption.All) },
-            dropdownWidth = 180.dp,
-            verticalPadding = 6.dp,
-            placeholder = ""
-        )
-
-        Text(
-            text = state.coursesToDisplay.take(state.visibleItemCount).size.toString()
-        )
-    }
-}
-
-@Composable
-private fun LearnCourseCard(
-    course: LearnCourseState,
-    modifier: Modifier = Modifier,
-    onClick: (() -> Unit) = {}
-) {
-    Box(modifier = modifier
-        .horizonShadow(HorizonElevation.level4, shape = HorizonCornerRadius.level4)
-        .background(color = HorizonColors.Surface.cardPrimary(), shape = HorizonCornerRadius.level4)
-        .clickable(onClick = { onClick() })
-    ) {
-        Column(Modifier.fillMaxWidth()) {
-            CourseImage(course.imageUrl)
-
-            HorizonSpace(SpaceSize.SPACE_16)
-
-            Text(
-                text = course.courseName,
-                style = HorizonTypography.labelLargeBold,
-                color = HorizonColors.Text.title(),
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier.padding(horizontal = 24.dp)
-            )
-
-            HorizonSpace(SpaceSize.SPACE_12)
-
-            CourseProgress(
-                course.progress,
-                modifier = Modifier.padding(horizontal = 24.dp)
-            )
-
-            HorizonSpace(SpaceSize.SPACE_16)
-
-            LearnCourseCardButton(
-                course,
-                onClick,
-                modifier = Modifier.padding(horizontal = 24.dp)
-            )
-
-            HorizonSpace(SpaceSize.SPACE_24)
-        }
-    }
-}
-
-@OptIn(ExperimentalGlideComposeApi::class)
-@Composable
-private fun CourseImage(
-    url: String?,
-    modifier: Modifier = Modifier
-) {
-    var isImageLoading by rememberSaveable { mutableStateOf(true) }
-    if (!url.isNullOrEmpty()) {
-        GlideImage(
-            url,
-            contentDescription = null,
-            contentScale = ContentScale.FillBounds,
-            requestBuilderTransform = {
-                it.addListener(object : RequestListener<Drawable> {
-                    override fun onLoadFailed(
-                        e: GlideException?,
-                        model: Any?,
-                        target: com.bumptech.glide.request.target.Target<Drawable>,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        isImageLoading = false
-                        return false
-                    }
-
-                    override fun onResourceReady(
-                        resource: Drawable,
-                        model: Any,
-                        target: Target<Drawable>?,
-                        dataSource: DataSource,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        isImageLoading = false
-                        return false
-                    }
-
-                })
-            },
-            modifier = modifier
-                .aspectRatio(1.69f)
-                .shimmerEffect(isImageLoading)
-        )
-    } else {
-        Box(
-            contentAlignment = Alignment.Center,
-            modifier = modifier
-                .aspectRatio(1.69f)
-                .background(HorizonColors.Surface.institution().copy(alpha = 0.1f))
-        ) {
-            Icon(
-                painterResource(R.drawable.book_2_filled),
-                contentDescription = null,
-                tint = HorizonColors.Surface.institution(),
-                modifier = Modifier.size(32.dp)
-            )
-        }
-    }
-}
-
-@Composable
-private fun CourseProgress(
-    progress: Double,
-    modifier: Modifier = Modifier
-) {
-    Row(
-        modifier = modifier,
-        verticalAlignment = Alignment.CenterVertically,
-    ) {
-        ProgressBarSmall(
-            progress = progress,
-            style = ProgressBarStyle.Institution,
-            showLabels = false,
-            modifier = Modifier.weight(1f)
-        )
-
-        HorizonSpace(SpaceSize.SPACE_8)
-
-        Text(
-            text = stringResource(R.string.progressBar_percent, progress.roundToInt()),
-            style = HorizonTypography.p2,
-            color = HorizonColors.Surface.institution(),
-        )
-    }
-}
-
-@Composable
-private fun LearnCourseCardButton(
-    course: LearnCourseState,
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    val label = when (course.progress.getProgressOption()) {
-        LearnCourseFilterOption.NotStarted -> stringResource(R.string.learnCourseListStartLearningLabel)
-        LearnCourseFilterOption.InProgress -> stringResource(R.string.learnCourseListResumeLearningLabel)
-        else -> stringResource(R.string.learnCourseListViewCourseLabel)
-    }
-
-    Button(
-        modifier = modifier,
-        label = label,
-        height = ButtonHeight.NORMAL,
-        width = ButtonWidth.FILL,
-        color = ButtonColor.WhiteWithOutline,
-        onClick = onClick,
-    )
-}
-
-@Composable
-private fun EmptyMessage() {
-    Text(
-        text = stringResource(R.string.learnCourseListEmptyMessage),
-        style = HorizonTypography.p1,
-        color = HorizonColors.Text.body(),
-        modifier = Modifier.padding(horizontal = 24.dp)
-    )
-}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListUiState.kt
deleted file mode 100644
index 9d37cfa73f..0000000000
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListUiState.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.instructure.horizon.features.learn.course.list
-
-import androidx.annotation.StringRes
-import androidx.compose.ui.text.input.TextFieldValue
-import com.instructure.horizon.R
-import com.instructure.horizon.horizonui.platform.LoadingState
-
-data class LearnCourseListUiState(
-    val loadingState: LoadingState = LoadingState(),
-    val coursesToDisplay: List<LearnCourseState> = emptyList(),
-    val searchQuery: TextFieldValue = TextFieldValue(""),
-    val updateSearchQuery: (TextFieldValue) -> Unit = {},
-    val selectedFilterValue: LearnCourseFilterOption = LearnCourseFilterOption.All,
-    val updateFilterValue: (LearnCourseFilterOption) -> Unit = {},
-    val visibleItemCount: Int = 10,
-    val increaseVisibleItemCount: () -> Unit = {},
-)
-
-data class LearnCourseState(
-    val imageUrl: String? = null,
-    val courseName: String = "",
-    val courseId: Long = -1L,
-    val progress: Double = 0.0,
-)
-
-enum class LearnCourseFilterOption(@StringRes val labelRes: Int) {
-    All(R.string.learnCourseListFilterAll),
-    NotStarted(R.string.learnCourseListFilterNotStarted),
-    InProgress(R.string.learnCourseListFilterInProgress),
-    Completed(R.string.learnCourseListFilterCompleted);
-
-    companion object {
-        internal fun Double.getProgressOption(): LearnCourseFilterOption {
-            return when (this) {
-                0.0 -> NotStarted
-                in 0.0..<100.0 -> InProgress
-                else -> Completed
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListViewModel.kt
deleted file mode 100644
index abfed8b637..0000000000
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListViewModel.kt
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.course.list
-
-import android.content.Context
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.instructure.canvasapi2.utils.weave.catch
-import com.instructure.canvasapi2.utils.weave.tryLaunch
-import com.instructure.horizon.R
-import com.instructure.horizon.features.learn.course.list.LearnCourseFilterOption.Companion.getProgressOption
-import com.instructure.horizon.horizonui.platform.LoadingState
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import javax.inject.Inject
-
-@HiltViewModel
-class LearnCourseListViewModel @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val repository: LearnCourseListRepository
-): ViewModel() {
-    private val _uiState = MutableStateFlow(LearnCourseListUiState(
-        loadingState = LoadingState(onRefresh = ::refresh, onSnackbarDismiss = ::dismissSnackbar),
-        increaseVisibleItemCount = ::increaseVisibleItemCount,
-        updateFilterValue = ::updateFilter,
-        updateSearchQuery = ::updateSearchQuery
-    ))
-    val state = _uiState.asStateFlow()
-
-    private val pageCount = 10
-    private var allCourses: List<LearnCourseState> = emptyList()
-
-    init {
-        loadCourses()
-    }
-
-    private suspend fun fetchData(forceRefresh: Boolean = false): List<LearnCourseState> {
-        val courses = repository.getCoursesWithProgress(forceRefresh).map {
-            LearnCourseState(
-                courseName = it.courseName,
-                courseId = it.courseId,
-                imageUrl = it.courseImageUrl,
-                progress = it.progress
-            )
-        }
-        allCourses = courses
-        return courses
-    }
-
-    private fun loadCourses() {
-        resetScreenValues()
-        viewModelScope.tryLaunch {
-            _uiState.update {
-                it.copy(loadingState = it.loadingState.copy(
-                    isLoading = true,
-                ))
-            }
-            _uiState.value = _uiState.value.copy(
-                coursesToDisplay = fetchData().applyFilters(),
-            )
-            _uiState.update {
-                it.copy(loadingState = it.loadingState.copy(
-                    isLoading = false,
-                ))
-            }
-        } catch {
-            _uiState.update {
-                it.copy(loadingState = it.loadingState.copy(
-                    isLoading = false,
-                    isError = true
-                ))
-            }
-        }
-    }
-
-    private fun resetScreenValues() {
-        _uiState.value = _uiState.value.copy(
-            visibleItemCount = pageCount,
-            searchQuery = TextFieldValue(""),
-            selectedFilterValue = LearnCourseFilterOption.All,
-        )
-    }
-
-    private fun refresh() {
-        viewModelScope.tryLaunch {
-            _uiState.update {
-                it.copy(loadingState = it.loadingState.copy(
-                    isRefreshing = true,
-                ))
-            }
-            _uiState.value = _uiState.value.copy(
-                coursesToDisplay = fetchData(true).applyFilters(),
-            )
-            _uiState.update {
-                it.copy(loadingState = it.loadingState.copy(
-                    isRefreshing = false,
-                ))
-            }
-        } catch {
-            _uiState.update {
-                it.copy(loadingState = it.loadingState.copy(
-                    isRefreshing = false,
-                    snackbarMessage = context.getString(R.string.learnCourseListFailedToLoadCoursesMessage)
-                ))
-            }
-        }
-    }
-
-    private fun dismissSnackbar() {
-        _uiState.update {
-            it.copy(loadingState = it.loadingState.copy(
-                snackbarMessage = null
-            ))
-        }
-    }
-
-    private fun increaseVisibleItemCount() {
-        _uiState.update {
-            it.copy(visibleItemCount = it.visibleItemCount + pageCount)
-        }
-    }
-
-    private fun updateFilter(filterOption: LearnCourseFilterOption) {
-        _uiState.update {
-            it.copy(selectedFilterValue = filterOption)
-        }
-        _uiState.update {
-            it.copy(coursesToDisplay = allCourses.applyFilters())
-        }
-    }
-
-    private fun updateSearchQuery(query: TextFieldValue) {
-        _uiState.update {
-            it.copy(searchQuery = query)
-        }
-        _uiState.update {
-            it.copy(coursesToDisplay = allCourses.applyFilters())
-        }
-    }
-
-    private fun List<LearnCourseState>.applyFilters(): List<LearnCourseState> {
-        return this.filter {
-            (it.progress.getProgressOption() == _uiState.value.selectedFilterValue
-                    || _uiState.value.selectedFilterValue == LearnCourseFilterOption.All)
-                    && it.courseName.contains(_uiState.value.searchQuery.text.trim(), ignoreCase = true)
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterScreen.kt
new file mode 100644
index 0000000000..d10595792d
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterScreen.kt
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.filter
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.horizon.R
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonSpace
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.foundation.SpaceSize
+import com.instructure.horizon.horizonui.foundation.horizonBorder
+import com.instructure.horizon.horizonui.molecules.Button
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.FilterChip
+import com.instructure.horizon.horizonui.molecules.FilterChipSize
+import com.instructure.horizon.horizonui.molecules.IconButton
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.horizon.horizonui.molecules.IconButtonSize
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
+
+@Composable
+fun LearnLearningLibraryFilterScreen(
+    state: LearnLearningLibraryFilterUiState,
+    navController: NavHostController
+) {
+    EdgeToEdgeScaffold(
+        statusBarColor = HorizonColors.Surface.pageSecondary(),
+        navigationBarColor = HorizonColors.Surface.pageSecondary(),
+        containerColor = HorizonColors.Surface.pageSecondary(),
+    ) { contentPadding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(contentPadding)
+                .verticalScroll(rememberScrollState())
+                .padding(vertical = 16.dp),
+            verticalArrangement = Arrangement.spacedBy(24.dp)
+        ) {
+            LearnLearningLibraryFilterTopBar { navController.popBackStack() }
+
+            state.sections.forEach { section ->
+                LearnLearningLibraryFilterSectionRow(section, Modifier.padding(horizontal = 16.dp))
+            }
+
+            Spacer(Modifier.weight(1f))
+
+            LearnLearningLibraryButtonSection(
+                { navController.popBackStack() },
+                state.onClearFilters
+            )
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryFilterTopBar(onClose: () -> Unit) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .horizonBorder(HorizonColors.LineAndBorder.lineStroke(), bottom = 1.dp)
+            .background(HorizonColors.Surface.pageSecondary())
+            .padding(bottom = 16.dp)
+            .padding(horizontal = 16.dp)
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.tune),
+            contentDescription = null
+        )
+        HorizonSpace(SpaceSize.SPACE_8)
+        Text(
+            text = stringResource(R.string.learnLearningLibraryFilterAndSortTitle),
+            style = HorizonTypography.h4,
+            color = HorizonColors.Text.title(),
+            modifier = Modifier.weight(1f)
+        )
+        IconButton(
+            iconRes = R.drawable.close,
+            size = IconButtonSize.SMALL,
+            color = IconButtonColor.DarkOutline,
+            contentDescription = stringResource(R.string.a11y_close),
+            onClick = onClose
+        )
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryButtonSection(
+    onApplyFilters: () -> Unit,
+    onClearFilters: () -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .horizonBorder(HorizonColors.LineAndBorder.lineStroke(), top = 1.dp)
+            .background(HorizonColors.Surface.cardPrimary())
+            .padding(top = 16.dp)
+
+    ) {
+        Button(
+            label = stringResource(R.string.learnLearningLibraryFilterApplyFiltersLabel),
+            height = ButtonHeight.SMALL,
+            width = ButtonWidth.FILL,
+            color = ButtonColor.Black,
+            onClick = onApplyFilters,
+            modifier = Modifier.padding(horizontal = 16.dp)
+        )
+
+        HorizonSpace(SpaceSize.SPACE_4)
+
+        Button(
+            label = stringResource(R.string.learnLearningLibraryFilterClearFiltersLabel),
+            height = ButtonHeight.SMALL,
+            width = ButtonWidth.FILL,
+            color = ButtonColor.BlackOutline,
+            onClick = onClearFilters,
+            modifier = Modifier.padding(horizontal = 16.dp)
+        )
+    }
+}
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+private fun LearnLearningLibraryFilterSectionRow(section: LearnLearningLibraryFilterSection, modifier: Modifier = Modifier) {
+    Column(modifier, verticalArrangement = Arrangement.spacedBy(8.dp)) {
+        Text(
+            text = section.title,
+            style = HorizonTypography.labelMediumBold,
+            color = HorizonColors.Text.body()
+        )
+        FlowRow(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
+            section.items.forEach { item ->
+                FilterChip(
+                    label = item.label,
+                    selected = item.isSelected,
+                    onClick = item.onSelected,
+                    size = FilterChipSize.LARGE
+                )
+            }
+        }
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+private fun LearnLearningLibraryFilterScreenPreview() {
+    ContextKeeper.appContext = LocalContext.current
+    LearnLearningLibraryFilterScreen(
+        state = LearnLearningLibraryFilterUiState(
+            sections = listOf(
+                LearnLearningLibraryFilterSection(
+                    title = "Sort by",
+                    items = listOf(
+                        LearnLearningLibraryFilterItem("Most recent", isSelected = true, onSelected = {}),
+                        LearnLearningLibraryFilterItem("Least recent", isSelected = false, onSelected = {}),
+                        LearnLearningLibraryFilterItem("Name: A-Z", isSelected = false, onSelected = {}),
+                        LearnLearningLibraryFilterItem("Name: Z-A", isSelected = false, onSelected = {})
+                    )
+                ),
+                LearnLearningLibraryFilterSection(
+                    title = "Item type",
+                    items = listOf(
+                        LearnLearningLibraryFilterItem("All", isSelected = true, onSelected = {}),
+                        LearnLearningLibraryFilterItem("Assessments", isSelected = false, onSelected = {}),
+                        LearnLearningLibraryFilterItem("Courses", isSelected = false, onSelected = {}),
+                        LearnLearningLibraryFilterItem("External links", isSelected = false, onSelected = {}),
+                        LearnLearningLibraryFilterItem("External tools", isSelected = false, onSelected = {}),
+                        LearnLearningLibraryFilterItem("Files", isSelected = false, onSelected = {}),
+                        LearnLearningLibraryFilterItem("Pages", isSelected = false, onSelected = {})
+                    )
+                ),
+            )
+        ),
+        navController = rememberNavController()
+    )
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterUiState.kt
new file mode 100644
index 0000000000..7db4c219c3
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterUiState.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.filter
+
+data class LearnLearningLibraryFilterItem(
+    val label: String,
+    val isSelected: Boolean,
+    val onSelected: () -> Unit
+)
+
+data class LearnLearningLibraryFilterSection(
+    val title: String,
+    val items: List<LearnLearningLibraryFilterItem>
+)
+
+data class LearnLearningLibraryFilterUiState(
+    val sections: List<LearnLearningLibraryFilterSection> = emptyList(),
+    val onClearFilters: () -> Unit = {}
+)
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterViewModel.kt
new file mode 100644
index 0000000000..5d201ee5ab
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterViewModel.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.filter
+
+import android.content.res.Resources
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class LearnLearningLibraryFilterViewModel @Inject constructor(
+    private val resources: Resources,
+    private val eventHandler: LearnEventHandler,
+    savedStateHandle: SavedStateHandle
+) : ViewModel() {
+
+    private val screenType: LearnLearningLibraryFilterScreenType = savedStateHandle
+        .get<String>(LearnRoute.LearnLearningLibraryFilterScreen.screenTypeAttr)
+        ?.let { LearnLearningLibraryFilterScreenType.valueOf(it) }
+        ?: LearnLearningLibraryFilterScreenType.Browse
+
+    private var currentTypeFilter: LearnLearningLibraryTypeFilter = savedStateHandle
+        .get<String>(LearnRoute.LearnLearningLibraryFilterScreen.typeFilterAttr)
+        ?.let { LearnLearningLibraryTypeFilter.valueOf(it) }
+        ?: LearnLearningLibraryTypeFilter.All
+
+    private var currentSortOption: LearnLearningLibrarySortOption = savedStateHandle
+        .get<String>(LearnRoute.LearnLearningLibraryFilterScreen.sortOptionAttr)
+        ?.let { LearnLearningLibrarySortOption.valueOf(it) }
+        ?: LearnLearningLibrarySortOption.MostRecent
+
+    private val _uiState = MutableStateFlow(buildUiState())
+    val uiState = _uiState.asStateFlow()
+
+    private fun buildUiState() = LearnLearningLibraryFilterUiState(
+        sections = buildSections(),
+        onClearFilters = ::clearFilters
+    )
+
+    private fun buildSections(): List<LearnLearningLibraryFilterSection> {
+        val sections = mutableListOf<LearnLearningLibraryFilterSection>()
+
+        sections.add(
+            LearnLearningLibraryFilterSection(
+                title = resources.getString(R.string.learnLearningLibraryFilterSortByLabel),
+                items = LearnLearningLibrarySortOption.entries.map { option ->
+                    LearnLearningLibraryFilterItem(
+                        label = resources.getString(option.labelRes),
+                        isSelected = currentSortOption == option,
+                        onSelected = { updateSortOption(option) }
+                    )
+                }
+            )
+        )
+
+        val availableTypeFilters = when (screenType) {
+            LearnLearningLibraryFilterScreenType.Browse,
+            LearnLearningLibraryFilterScreenType.MyContentSaved -> listOf(
+                LearnLearningLibraryTypeFilter.All,
+                LearnLearningLibraryTypeFilter.Assessments,
+                LearnLearningLibraryTypeFilter.Courses,
+                LearnLearningLibraryTypeFilter.ExternalLinks,
+                LearnLearningLibraryTypeFilter.ExternalTools,
+                LearnLearningLibraryTypeFilter.Files,
+                LearnLearningLibraryTypeFilter.Pages
+            )
+            LearnLearningLibraryFilterScreenType.MyContent -> listOf(
+                LearnLearningLibraryTypeFilter.All,
+                LearnLearningLibraryTypeFilter.Programs,
+                LearnLearningLibraryTypeFilter.Courses
+            )
+        }
+        sections.add(
+            LearnLearningLibraryFilterSection(
+                title = resources.getString(R.string.learnLearningLibraryFilterItemTypeLabel),
+                items = availableTypeFilters.map { filter ->
+                    LearnLearningLibraryFilterItem(
+                        label = resources.getString(filter.labelRes),
+                        isSelected = currentTypeFilter == filter,
+                        onSelected = { updateTypeFilter(filter) }
+                    )
+                }
+            )
+        )
+
+        return sections
+    }
+
+    private fun updateTypeFilter(value: LearnLearningLibraryTypeFilter) {
+        currentTypeFilter = value
+        rebuildAndEmit()
+    }
+
+    private fun updateSortOption(value: LearnLearningLibrarySortOption) {
+        currentSortOption = value
+        rebuildAndEmit()
+    }
+
+    private fun clearFilters() {
+        currentTypeFilter = LearnLearningLibraryTypeFilter.All
+        currentSortOption = LearnLearningLibrarySortOption.MostRecent
+        rebuildAndEmit()
+    }
+
+    private fun rebuildAndEmit() {
+        _uiState.update { buildUiState() }
+        viewModelScope.launch {
+            eventHandler.postEvent(
+                LearnEvent.UpdateLearningLibraryFilter(
+                    screenType = screenType,
+                    typeFilter = currentTypeFilter,
+                    sortOption = currentSortOption,
+                )
+            )
+        }
+    }
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryCollection.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryCollection.kt
new file mode 100644
index 0000000000..00941d64c7
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryCollection.kt
@@ -0,0 +1,459 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.horizon.R
+import com.instructure.horizon.horizonui.expandable
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonSpace
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.foundation.SpaceSize
+import com.instructure.horizon.horizonui.molecules.Button
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonIconPosition
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.HorizonDivider
+import com.instructure.horizon.horizonui.molecules.IconButton
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.pandautils.compose.modifiers.conditional
+
+data class LearnLearningLibraryCollectionState(
+    val id: String,
+    val name: String,
+    val itemCount: Int,
+    val items: List<LearnLearningLibraryCollectionItemState>
+)
+
+fun LazyListScope.LearnLearningLibraryCollection(
+    collections: List<LearnLearningLibraryCollectionState>,
+    onBookmarkClick: (itemId: String) -> Unit,
+    onEnrollClick: (itemId: String) -> Unit,
+    onItemClick: (route: LearningLibraryRoute?) -> Unit,
+    onCollectionDetailsClick: (itemId: String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    if (collections.isEmpty()) {
+        item { EmptyMessage() }
+    }
+
+    items(collections) { collectionItem ->
+        LearnLearningLibraryCollectionItem(
+            collectionItem,
+            collections.size > 1,
+            if (collections.size > 1) 2 else 4,
+            onBookmarkClick,
+            onEnrollClick,
+            onItemClick,
+            onCollectionDetailsClick,
+            modifier
+        )
+    }
+}
+
+@Composable
+fun LearnLearningLibraryCollectionItem(
+    state: LearnLearningLibraryCollectionState,
+    isCollapsable: Boolean,
+    itemCount: Int,
+    onBookmarkClick: (itemId: String) -> Unit,
+    onEnrollClick: (itemId: String) -> Unit,
+    onItemClick: (route: LearningLibraryRoute?) -> Unit,
+    onCollectionDetailsClick: (itemId: String) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    var isExpanded by remember { mutableStateOf(true) }
+
+    Column(
+        modifier.fillMaxWidth()
+    ) {
+        LearnLearningLibraryCollectionTitle(
+            state.name,
+            isCollapsable,
+            isExpanded,
+            onExpandedChanged = { isExpanded = it }
+        )
+        HorizonSpace(SpaceSize.SPACE_24)
+
+        AnimatedVisibility(
+            isExpanded,
+            enter = expandVertically(),
+            exit = shrinkVertically()
+        ) {
+            Column(
+                Modifier.fillMaxWidth()
+            ) {
+                if (state.items.isEmpty()) {
+                    Text(
+                        text = stringResource(R.string.learnLearningLibraryEmptyCollectionMessage),
+                        style = HorizonTypography.p1,
+                        color = HorizonColors.Text.body(),
+                        modifier = Modifier.padding(horizontal = 8.dp)
+                    )
+                    HorizonSpace(SpaceSize.SPACE_24)
+                }
+                state.items.take(itemCount).forEach { itemState ->
+                    LearnLearningLibraryItem(
+                        state = itemState,
+                        onClick = { onItemClick(itemState.route) },
+                        onBookmarkClick = { onBookmarkClick(itemState.id) },
+                        onEnrollClick = { onEnrollClick(itemState.id) }
+                    )
+                    HorizonSpace(SpaceSize.SPACE_24)
+                }
+                if (state.itemCount > state.items.size) {
+                    LearnLearningLibraryCollectionDetailsRow(
+                        state.itemCount,
+                        onCollectionDetailsClick = { onCollectionDetailsClick(state.id) }
+                    )
+                }
+                HorizonSpace(SpaceSize.SPACE_24)
+            }
+        }
+
+        if (isCollapsable) {
+            HorizonDivider()
+            HorizonSpace(SpaceSize.SPACE_24)
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryCollectionTitle(
+    title: String,
+    isCollapsable: Boolean,
+    isExpanded: Boolean,
+    onExpandedChanged: (Boolean) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val context = LocalContext.current
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 8.dp)
+            .conditional(isCollapsable) {
+                clickable { onExpandedChanged(!isExpanded) }
+            }
+            .clearAndSetSemantics {
+                contentDescription = title
+                expandable(context, isExpanded)
+            }
+    ) {
+        Text(
+            text = title,
+            style = HorizonTypography.h3,
+            color = HorizonColors.Text.body(),
+            modifier = Modifier.weight(1f)
+        )
+
+        if (isCollapsable) {
+            val rotationAnimation by animateFloatAsState(
+                targetValue = if (isExpanded) 180f else 0f,
+            )
+            HorizonSpace(SpaceSize.SPACE_16)
+            IconButton(
+                iconRes = R.drawable.keyboard_arrow_down,
+                contentDescription = if (isExpanded)
+                    stringResource(R.string.a11y_learnLearningLibraryCollectionCollapseContentDescription)
+                else
+                    stringResource(R.string.a11y_learnLearningLibraryCollectionExpandContentDescription),
+                color = IconButtonColor.DarkOutline,
+                onClick = { onExpandedChanged(!isExpanded) },
+                modifier = Modifier
+                    .rotate(rotationAnimation)
+            )
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryCollectionDetailsRow(
+    itemCount: Int,
+    onCollectionDetailsClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier.padding(horizontal = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = pluralStringResource(R.plurals.learnLearningLibraryCollectionItemCount, itemCount, itemCount),
+            style = HorizonTypography.p2,
+            color = HorizonColors.Text.dataPoint(),
+            modifier = Modifier.weight(1f)
+        )
+        Button(
+            label = stringResource(R.string.learnLearningLibraryCollectionViewCollectionLabel),
+            height = ButtonHeight.SMALL,
+            width = ButtonWidth.RELATIVE,
+            color = ButtonColor.WhiteWithOutline,
+            iconPosition = ButtonIconPosition.End(R.drawable.arrow_forward),
+            onClick = { onCollectionDetailsClick() }
+        )
+    }
+}
+
+@Composable
+private fun EmptyMessage() {
+    Text(
+        text = stringResource(R.string.learnLearningLibraryListEmptyMessage),
+        style = HorizonTypography.p1,
+        color = HorizonColors.Text.body(),
+        modifier = Modifier.padding(horizontal = 24.dp)
+    )
+}
+
+@Composable
+@Preview(showBackground = true)
+private fun LearnLearningLibraryCollectionSingleItem() {
+    ContextKeeper.appContext = LocalContext.current
+    val collections = listOf(
+        LearnLearningLibraryCollectionState(
+            id = "1",
+            name = "Collection 1",
+            itemCount = 1,
+            items = listOf(
+                LearnLearningLibraryCollectionItemState(
+                    id = "1",
+                    imageUrl = null,
+                    name = "Collection Item 1",
+                    description = null,
+                    isBookmarked = true,
+                    canEnroll = true,
+                    bookmarkLoading = false,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Recommended"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Required"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Test chip"
+                        )
+                    )
+                ),
+                LearnLearningLibraryCollectionItemState(
+                    id = "2",
+                    imageUrl = null,
+                    name = "Collection Item 2",
+                    description = null,
+                    isBookmarked = false,
+                    canEnroll = false,
+                    bookmarkLoading = false,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Recommended"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Required"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Test chip"
+                        )
+                    )
+                ),
+            )
+        )
+    )
+    LazyColumn {
+        LearnLearningLibraryCollection(
+            collections,
+            {},
+            {},
+            {},
+            {}
+        )
+    }
+}
+
+@Composable
+@Preview(showBackground = true, heightDp = 2000)
+private fun LearnLearningLibraryCollectionMultipleItems() {
+    ContextKeeper.appContext = LocalContext.current
+    val collections = listOf(
+        LearnLearningLibraryCollectionState(
+            id = "1",
+            name = "Collection 1",
+            itemCount = 2,
+            items = listOf(
+                LearnLearningLibraryCollectionItemState(
+                    id = "1",
+                    imageUrl = null,
+                    name = "Collection Item 1",
+                    description = null,
+                    isBookmarked = true,
+                    canEnroll = true,
+                    bookmarkLoading = false,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Recommended"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Required"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Test chip"
+                        )
+                    )
+                ),
+                LearnLearningLibraryCollectionItemState(
+                    id = "2",
+                    imageUrl = null,
+                    name = "Collection Item 2",
+                    description = null,
+                    isBookmarked = false,
+                    canEnroll = false,
+                    bookmarkLoading = false,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Recommended"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Required"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Test chip"
+                        )
+                    )
+                ),
+            )
+        ),
+        LearnLearningLibraryCollectionState(
+            id = "2",
+            name = "Collection 2",
+            itemCount = 2,
+            items = listOf(
+                LearnLearningLibraryCollectionItemState(
+                    id = "1",
+                    imageUrl = null,
+                    name = "Collection Item 1",
+                    description = null,
+                    isBookmarked = true,
+                    canEnroll = true,
+                    bookmarkLoading = true,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Recommended"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Required"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Test chip"
+                        )
+                    )
+                ),
+                LearnLearningLibraryCollectionItemState(
+                    id = "2",
+                    imageUrl = null,
+                    name = "Collection Item 2",
+                    description = null,
+                    isBookmarked = false,
+                    canEnroll = false,
+                    bookmarkLoading = false,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Recommended"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Required"
+                        ),
+                        LearnLearningLibraryCollectionItemChipState(
+                            label = "Test chip"
+                        )
+                    )
+                ),
+            )
+        )
+    )
+    LazyColumn {
+        LearnLearningLibraryCollection(
+            collections,
+            {},
+            {},
+            {},
+            {}
+        )
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+private fun LearnLearningLibraryEmptyCollectionPreview() {
+    ContextKeeper.appContext = LocalContext.current
+    val collections = listOf(
+        LearnLearningLibraryCollectionState(
+            id = "1",
+            name = "Collection 1",
+            itemCount = 0,
+            items = emptyList()
+        )
+    )
+    LazyColumn {
+        LearnLearningLibraryCollection(
+            collections,
+            {},
+            {},
+            {},
+            {}
+        )
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryExtensions.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryExtensions.kt
new file mode 100644
index 0000000000..2baf63e8eb
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryExtensions.kt
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningRecommendationReason
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.horizon.navigation.MainNavigationRoute
+import com.instructure.pandautils.utils.orDefault
+
+fun List<EnrolledLearningLibraryCollection>.toUiState(
+    resources: Resources,
+    recommendations: List<LearningLibraryRecommendation>
+): List<LearnLearningLibraryCollectionState> {
+    return this.map {
+        LearnLearningLibraryCollectionState(
+            id = it.id,
+            name = it.name,
+            itemCount = it.totalItemCount,
+            items = it.items.map { item ->
+                item.toUiState(resources, recommendations)
+            }
+        )
+    }
+}
+
+fun LearningLibraryCollectionItem.toUiState(
+    resources: Resources,
+    recommendations: List<LearningLibraryRecommendation>
+): LearnLearningLibraryCollectionItemState {
+    val canEnroll = (this.itemType == CollectionItemType.COURSE || this.itemType == CollectionItemType.PROGRAM) && !this.isEnrolledInCanvas.orDefault(true)
+
+    return LearnLearningLibraryCollectionItemState(
+        id = this.id,
+        imageUrl = this.canvasCourse?.courseImageUrl,
+        name = this.canvasCourse?.courseName.orEmpty(),
+        description = null,
+        isBookmarked = this.isBookmarked,
+        canEnroll = canEnroll,
+        bookmarkLoading = false,
+        type = this.itemType,
+        route = this.getRoute(),
+        chips = listOfNotNull(
+            this.recommendedChip(resources, recommendations),
+            this.itemType.toUiChipState(resources),
+            this.toEstimatedDurationUiChipState(resources),
+            this.toUnitsUiChipState(resources),
+            this.toProgressUiChipState(resources),
+        )
+    )
+}
+
+fun LearningLibraryRecommendation.toUiState(
+    resources: Resources,
+): LearnLearningLibraryCollectionItemState {
+    val canEnroll = (this.item.itemType == CollectionItemType.COURSE || this.item.itemType == CollectionItemType.PROGRAM) && !this.item.isEnrolledInCanvas.orDefault(true)
+
+    return LearnLearningLibraryCollectionItemState(
+        id = this.item.id,
+        imageUrl = this.item.canvasCourse?.courseImageUrl,
+        name = this.item.canvasCourse?.courseName.orEmpty(),
+        description = this.item.itemDescription(resources, listOf(this)),
+        isBookmarked = this.item.isBookmarked,
+        canEnroll = canEnroll,
+        bookmarkLoading = false,
+        type = this.item.itemType,
+        route = this.item.getRoute(),
+        chips = listOfNotNull(
+            this.item.recommendedChip(resources, listOf(this)),
+            this.item.itemType.toUiChipState(resources),
+            this.item.toEstimatedDurationUiChipState(resources),
+            this.item.toUnitsUiChipState(resources),
+            this.item.toProgressUiChipState(resources),
+        )
+    )
+}
+
+private fun LearningLibraryCollectionItem.getRoute(): LearningLibraryRoute? {
+    return when(this.itemType) {
+        CollectionItemType.COURSE -> this.canvasCourse?.courseId?.toLongOrNull()?.let{
+            LearningLibraryRoute.StringRoute(LearnRoute.LearnCourseDetailsScreen.route(it))
+        }
+        CollectionItemType.PROGRAM -> this.programId?.let {
+            LearningLibraryRoute.StringRoute(LearnRoute.LearnProgramDetailsScreen.route(it))
+        }
+        else -> LearningLibraryRoute.ObjectRoute(MainNavigationRoute.ModuleItemSequence(
+            courseId = this.canvasCourse?.courseId?.toLongOrNull() ?: -1L,
+            moduleItemId = this.moduleInfo?.moduleItemId?.toLongOrNull(),
+            moduleItemAssetType = this.moduleInfo?.moduleItemType,
+            moduleItemAssetId = this.moduleInfo?.resourceId,
+            showMyProgressButton = this.canvasCourse?.moduleItemCount != 1.0
+        ))
+    }
+}
+
+fun CollectionItemType.toUiChipState(resources: Resources): LearnLearningLibraryCollectionItemChipState? {
+    return when(this) {
+        CollectionItemType.PAGE -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryPageLabel),
+            color = StatusChipColor.Sky,
+            iconRes = R.drawable.text_snippet
+        )
+        CollectionItemType.FILE -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryFileLabel),
+            color = StatusChipColor.Sky,
+            iconRes = R.drawable.attach_file
+        )
+        CollectionItemType.EXTERNAL_URL -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryExternalLinkLabel),
+            color = StatusChipColor.Orange,
+            iconRes = R.drawable.text_snippet
+        )
+        CollectionItemType.EXTERNAL_TOOL -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryExternalToolLabel),
+            color = StatusChipColor.Honey,
+            iconRes = R.drawable.note_alt
+        )
+        CollectionItemType.COURSE -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryCourseLabel),
+            color = StatusChipColor.Institution,
+            iconRes = R.drawable.book_2
+        )
+        CollectionItemType.PROGRAM -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryProgramLabel),
+            color = StatusChipColor.Violet,
+            iconRes = R.drawable.book_5,
+        )
+        CollectionItemType.QUIZ -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryAssessmentLabel),
+            color = StatusChipColor.Green,
+            iconRes = R.drawable.fast_check,
+        )
+        CollectionItemType.ASSIGNMENT -> LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryAssignmentLabel),
+            color = StatusChipColor.Green,
+            iconRes = R.drawable.fast_check,
+        )
+    }
+}
+
+fun LearningLibraryCollectionItem.toProgressUiChipState(resources: Resources): LearnLearningLibraryCollectionItemChipState? {
+    val completionPercentage = this.completionPercentage
+    return if (completionPercentage == null) {
+        null
+    } else if (this.isEnrolledInCanvas.orDefault() && completionPercentage >= 0 && completionPercentage < 100.0) {
+        LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryInProgressLabel),
+            color = StatusChipColor.Grey,
+            iconRes = R.drawable.trending_up
+        )
+    } else if (completionPercentage == 100.0) {
+        LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryCompletedLabel),
+            color = StatusChipColor.Green,
+            iconRes = R.drawable.check_circle
+        )
+    } else {
+        null
+    }
+}
+
+fun LearningLibraryCollectionItem.toEstimatedDurationUiChipState(resources: Resources): LearnLearningLibraryCollectionItemChipState? {
+    val estimatedMinutes = this.canvasCourse?.estimatedDurationMinutes
+    return if (estimatedMinutes != null) {
+        LearnLearningLibraryCollectionItemChipState(
+            label = resources.getQuantityString(R.plurals.learnLearningLibraryEstimatedDuration, estimatedMinutes.toInt(), estimatedMinutes.toInt()),
+            color = StatusChipColor.Grey,
+            iconRes = R.drawable.schedule
+        )
+    } else {
+        null
+    }
+}
+
+fun LearningLibraryCollectionItem.toUnitsUiChipState(resources: Resources): LearnLearningLibraryCollectionItemChipState? {
+    return if (this.itemType == CollectionItemType.COURSE && this.canvasCourse != null && this.canvasCourse?.moduleItemCount.orDefault() > 0) {
+        LearnLearningLibraryCollectionItemChipState(
+            label = resources.getQuantityString(R.plurals.learnLearningLibraryContainedUnits, this.canvasCourse?.moduleCount.orDefault().toInt(), this.canvasCourse?.moduleCount.orDefault().toInt()),
+            color = StatusChipColor.Grey,
+            iconRes = R.drawable.courses_format_list_bulleted
+        )
+    } else {
+        null
+    }
+}
+
+fun LearningLibraryCollectionItem.recommendedChip(
+    resources: Resources,
+    recommendations: List<LearningLibraryRecommendation>
+): LearnLearningLibraryCollectionItemChipState? {
+    return if (recommendations.any { it.item.id == this.id }) {
+        LearnLearningLibraryCollectionItemChipState(
+            label = resources.getString(R.string.learnLearningLibraryRecommendedLabel),
+            color = StatusChipColor.Honey,
+            iconRes = R.drawable.star_filled
+        )
+    } else {
+        null
+    }
+}
+
+fun LearningLibraryCollectionItem.itemDescription(
+    resources: Resources,
+    recommendations: List<LearningLibraryRecommendation>
+): String? {
+    val recommendation = recommendations.firstOrNull { it.item.id == this.id }
+    return if (recommendation != null) {
+        when(recommendation.primaryReason) {
+            LearningRecommendationReason.POPULARITY -> resources.getString(R.string.learnLearningLibraryRecommendationPopularityDescription)
+            LearningRecommendationReason.PAST_LEARNINGS -> resources.getString(R.string.learnLearningLibraryRecommendationPastLearningDescription, recommendation.sourceContext?.sourceCourseName.orEmpty())
+            LearningRecommendationReason.BOOKMARKED_ITEMS -> resources.getString(R.string.learnLearningLibraryRecommendationBookmarkedDescription)
+            LearningRecommendationReason.EXISTING_SKILLS -> resources.getString(R.string.learnLearningLibraryRecommendationExistingSkillsDescription, recommendation.sourceContext?.sourceSkillName.orEmpty())
+            null -> null
+        }
+    } else {
+        null
+    }
+}
+
+fun CollectionItemType.iconRes(): Int? {
+    return when(this) {
+        CollectionItemType.PAGE -> R.drawable.text_snippet
+        CollectionItemType.FILE -> R.drawable.attach_file
+        CollectionItemType.EXTERNAL_URL -> R.drawable.text_snippet
+        CollectionItemType.EXTERNAL_TOOL -> R.drawable.note_alt
+        CollectionItemType.COURSE -> R.drawable.book_2
+        CollectionItemType.PROGRAM -> R.drawable.book_5
+        else -> null
+    }
+}
+
+fun CollectionItemType.statusColor(): StatusChipColor? {
+    return when(this) {
+        CollectionItemType.PAGE -> StatusChipColor.Sky
+        CollectionItemType.FILE -> StatusChipColor.Sky
+        CollectionItemType.EXTERNAL_URL -> StatusChipColor.Orange
+        CollectionItemType.EXTERNAL_TOOL -> StatusChipColor.Honey
+        CollectionItemType.COURSE -> StatusChipColor.Institution
+        CollectionItemType.PROGRAM -> StatusChipColor.Violet
+        else -> null
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryFilterScreenType.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryFilterScreenType.kt
new file mode 100644
index 0000000000..3400865511
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryFilterScreenType.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+enum class LearnLearningLibraryFilterScreenType {
+    Browse,
+    MyContent,
+    MyContentSaved
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryItem.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryItem.kt
new file mode 100644
index 0000000000..c55682a7c8
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryItem.kt
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.horizon.R
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius
+import com.instructure.horizon.horizonui.foundation.HorizonElevation
+import com.instructure.horizon.horizonui.foundation.HorizonSpace
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.foundation.SpaceSize
+import com.instructure.horizon.horizonui.foundation.horizonShadow
+import com.instructure.horizon.horizonui.molecules.Button
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.horizon.horizonui.molecules.IconButtonSize
+import com.instructure.horizon.horizonui.molecules.LoadingIconButton
+import com.instructure.horizon.horizonui.molecules.LoadingImage
+import com.instructure.horizon.horizonui.molecules.StatusChip
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.horizon.horizonui.molecules.StatusChipState
+
+data class LearnLearningLibraryCollectionItemState(
+    val id: String,
+    val imageUrl: String?,
+    val name: String,
+    val description: String?,
+    val isBookmarked: Boolean,
+    val bookmarkLoading: Boolean,
+    val canEnroll: Boolean,
+    val type: CollectionItemType,
+    val route: LearningLibraryRoute?,
+    val chips: List<LearnLearningLibraryCollectionItemChipState>
+)
+
+data class LearnLearningLibraryCollectionItemChipState(
+    val label: String,
+    val color: StatusChipColor = StatusChipColor.Grey,
+    val iconRes: Int? = null
+)
+
+@Composable
+fun LearnLearningLibraryItem(
+    state: LearnLearningLibraryCollectionItemState,
+    onClick: (() -> Unit),
+    onBookmarkClick: (() -> Unit),
+    onEnrollClick: (() -> Unit),
+    modifier: Modifier = Modifier,
+) {
+    Box(modifier = modifier
+        .horizonShadow(HorizonElevation.level4, shape = HorizonCornerRadius.level4)
+        .background(color = HorizonColors.Surface.cardPrimary(), shape = HorizonCornerRadius.level4)
+        .clickable(onClick = {
+            if (state.canEnroll) {
+                onEnrollClick()
+            } else {
+                onClick()
+            }
+        })
+    ) {
+        Column(Modifier.padding(24.dp)) {
+            LoadingImage(
+                imageUrl = state.imageUrl,
+                placeholder = {
+                    LearningLibraryItemImagePlaceholder(
+                        state.type.iconRes(),
+                        state.type.statusColor() ?: StatusChipColor.Grey
+                    )
+                },
+                modifier = Modifier.clip(HorizonCornerRadius.level1_5)
+            )
+            HorizonSpace(SpaceSize.SPACE_16)
+            Text(
+                text = state.name,
+                style = HorizonTypography.labelLargeBold,
+                color = HorizonColors.Text.body(),
+            )
+            HorizonSpace(SpaceSize.SPACE_12)
+
+            if (!state.description.isNullOrEmpty()) {
+                Text(
+                    text = state.description,
+                    style = HorizonTypography.p2,
+                    color = HorizonColors.Text.dataPoint(),
+                )
+                HorizonSpace(SpaceSize.SPACE_12)
+            }
+
+            if (state.canEnroll) {
+                Column {
+                    LearnLearningLibraryItemChipContent(state.chips)
+                    HorizonSpace(SpaceSize.SPACE_12)
+                    LearnLearningLibraryItemButtonContentRow(state, onEnrollClick, onBookmarkClick)
+                }
+            } else {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    LearnLearningLibraryItemChipContent(state.chips, Modifier.weight(1f))
+                    LearnLearningLibraryItemButtonContentRow(state, onEnrollClick, onBookmarkClick)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryItemChipContent(
+    chips: List<LearnLearningLibraryCollectionItemChipState>,
+    modifier: Modifier = Modifier
+) {
+    FlowRow(
+        itemVerticalAlignment = Alignment.CenterVertically,
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = modifier
+    ) {
+        chips.forEach { chipState ->
+            StatusChip(
+                StatusChipState(
+                    chipState.label,
+                    chipState.color,
+                    true,
+                    chipState.iconRes
+                )
+            )
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryItemButtonContentRow(
+    state: LearnLearningLibraryCollectionItemState,
+    onEnrollClick: () -> Unit,
+    onBookmarkClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier,
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(2.dp),
+    ) {
+        if (state.canEnroll) {
+            Button(
+                label = stringResource(R.string.learnLearningLibraryItemEnrollLabel),
+                width = ButtonWidth.FILL,
+                height = ButtonHeight.NORMAL,
+                color = ButtonColor.BlackOutline,
+                onClick = { onEnrollClick() },
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(end = 6.dp)
+            )
+        }
+
+        LoadingIconButton(
+            loading = state.bookmarkLoading,
+            iconRes = if (state.isBookmarked) R.drawable.bookmark_fill else R.drawable.bookmark,
+            contentDescription = if (state.isBookmarked)
+                stringResource(R.string.a11y_learnLearningLibraryItemRemoveBookmarkContentDescription)
+            else
+                stringResource(R.string.a11y_learnLearningLibraryItemBookmarkContentDescription),
+            color = IconButtonColor.WhiteGreyOutline,
+            size = IconButtonSize.NORMAL,
+            onClick = { onBookmarkClick() }
+        )
+    }
+}
+
+@Composable
+private fun LearningLibraryItemImagePlaceholder(
+    iconRes: Int?,
+    color: StatusChipColor
+) {
+    Box(
+        Modifier
+            .fillMaxSize()
+            .background(color.fillColor),
+        contentAlignment = Alignment.Center
+    ) {
+        iconRes?.let {
+            Icon(
+                painter = painterResource(iconRes),
+                contentDescription = null,
+                tint = color.contentColor
+            )
+        }
+    }
+}
+
+@Composable
+@Preview
+private fun LearningLibraryItemEnrollPreview() {
+    val state = LearnLearningLibraryCollectionItemState(
+        id = "1",
+        imageUrl = "https://example.com/image.png",
+        name = "Example Course",
+        description = null,
+        isBookmarked = true,
+        canEnroll = true,
+        bookmarkLoading = false,
+        type = CollectionItemType.COURSE,
+        route = null,
+        chips = listOf(
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Required",
+                color = StatusChipColor.Green,
+            ),
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Completed",
+                color = StatusChipColor.Green,
+            ),
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Locked",
+                color = StatusChipColor.Grey,
+            ),
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Locked",
+                color = StatusChipColor.Grey,
+            )
+        )
+    )
+
+    LearnLearningLibraryItem(state, {}, {}, {})
+}
+
+@Composable
+@Preview
+private fun LearningLibraryItemPreview() {
+    val state = LearnLearningLibraryCollectionItemState(
+        id = "1",
+        imageUrl = "https://example.com/image.png",
+        name = "Example Course",
+        description = null,
+        isBookmarked = false,
+        canEnroll = true,
+        bookmarkLoading = false,
+        type = CollectionItemType.COURSE,
+        route = null,
+        chips = listOf(
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Required",
+                color = StatusChipColor.Green,
+            ),
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Completed",
+                color = StatusChipColor.Green,
+            ),
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Locked",
+                color = StatusChipColor.Grey,
+            ),
+            LearnLearningLibraryCollectionItemChipState(
+                label = "Locked",
+                color = StatusChipColor.Grey,
+            )
+        )
+    )
+
+    LearnLearningLibraryItem(state, {}, {}, {})
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibrarySortOption.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibrarySortOption.kt
new file mode 100644
index 0000000000..58d33a1a1e
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibrarySortOption.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+import androidx.annotation.StringRes
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.horizon.R
+
+enum class LearnLearningLibrarySortOption(@StringRes val labelRes: Int) {
+    MostRecent(R.string.learnLearningLibrarySortMostRecentLabel),
+    LeastRecent(R.string.learnLearningLibrarySortLeastRecentLabel),
+    NameAscending(R.string.learnLearningLibrarySortNameAZLabel),
+    NameDescending(R.string.learnLearningLibrarySortNameZALabel);
+
+    fun toCollectionItemSortOption(): CollectionItemSortOption = when (this) {
+        MostRecent -> CollectionItemSortOption.MOST_RECENT
+        LeastRecent -> CollectionItemSortOption.LEAST_RECENT
+        NameAscending -> CollectionItemSortOption.NAME_A_Z
+        NameDescending -> CollectionItemSortOption.NAME_Z_A
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryStatusFilter.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryStatusFilter.kt
new file mode 100644
index 0000000000..667478f342
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryStatusFilter.kt
@@ -0,0 +1,10 @@
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+import androidx.annotation.StringRes
+import com.instructure.horizon.R
+
+enum class LearnLearningLibraryStatusFilter(@StringRes val labelRes: Int) {
+    All(R.string.learnLearningLibraryStatusFilterAllLabel),
+    Completed(R.string.learnLearningLibraryStatusFilterCompletedLabel),
+    Bookmarked(R.string.learnLearningLibraryStatusFilterBookmarkedLabel)
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryTypeFilter.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryTypeFilter.kt
new file mode 100644
index 0000000000..0f6ce1936a
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearnLearningLibraryTypeFilter.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+import androidx.annotation.StringRes
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemType
+import com.instructure.horizon.R
+
+enum class LearnLearningLibraryTypeFilter(@StringRes val labelRes: Int) {
+    All(R.string.LearnLearningLibraryTypeFilterAllLabel),
+    Programs(R.string.LearnLearningLibraryTypeFilterProgramsLabel),
+    Courses(R.string.LearnLearningLibraryTypeFilterCoursesLabel),
+    Assessments(R.string.LearnLearningLibraryTypeFilterAssessmentsLabel),
+    Assignments(R.string.LearnLearningLibraryTypeFilterAssignmentsLabel),
+    ExternalLinks(R.string.LearnLearningLibraryTypeFilterExternalLinksLabel),
+    ExternalTools(R.string.LearnLearningLibraryTypeFilterExternalToolsLabel),
+    Files(R.string.LearnLearningLibraryTypeFilterFilesLabel),
+    Pages(R.string.LearnLearningLibraryTypeFilterPagesLabel)
+    ;
+
+    fun toCollectionItemType(): CollectionItemType? {
+        return when(this) {
+            All -> null
+            Programs -> CollectionItemType.PROGRAM
+            Courses -> CollectionItemType.COURSE
+            Assessments -> CollectionItemType.QUIZ
+            Assignments -> CollectionItemType.ASSIGNMENT
+            ExternalLinks -> CollectionItemType.EXTERNAL_URL
+            ExternalTools -> CollectionItemType.EXTERNAL_TOOL
+            Files -> CollectionItemType.FILE
+            Pages -> CollectionItemType.PAGE
+        }
+    }
+
+    fun toLearnItemType(): LearnItemType? = when (this) {
+        Programs -> LearnItemType.PROGRAM
+        Courses -> LearnItemType.COURSE
+        else -> null
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearningLibraryRoute.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearningLibraryRoute.kt
new file mode 100644
index 0000000000..e029296123
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/common/LearningLibraryRoute.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.common
+
+sealed class LearningLibraryRoute {
+    data class StringRoute(val route: String): LearningLibraryRoute()
+    data class ObjectRoute(val route: Any): LearningLibraryRoute()
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsRepository.kt
new file mode 100644
index 0000000000..fe2a962b1b
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsRepository.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.details
+
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import javax.inject.Inject
+
+class LearnLearningLibraryDetailsRepository @Inject constructor(
+    private val getLearningLibraryManager: GetLearningLibraryManager,
+) {
+    suspend fun getLearningLibraryItems(collectionId: String, forceRefresh: Boolean): EnrolledLearningLibraryCollection {
+        return getLearningLibraryManager.getEnrolledLearningLibraryCollection(collectionId, forceRefresh)
+    }
+
+    suspend fun toggleLearningLibraryItemIsBookmarked(itemId: String): Boolean {
+        return getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked(itemId)
+    }
+
+    suspend fun getLearningLibraryRecommendedItems(forceNetwork: Boolean): List<LearningLibraryRecommendation> {
+        return getLearningLibraryManager.getLearningLibraryRecommendations(forceNetwork)
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsScreen.kt
new file mode 100644
index 0000000000..283a915a3e
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsScreen.kt
@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.details
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.common.LearnSearchBar
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryItem
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryStatusFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.LearningLibraryRoute
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonSpace
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.foundation.SpaceSize
+import com.instructure.horizon.horizonui.foundation.horizonBorderShadow
+import com.instructure.horizon.horizonui.molecules.Button
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.DropdownChip
+import com.instructure.horizon.horizonui.molecules.DropdownItem
+import com.instructure.horizon.horizonui.molecules.IconButton
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.horizon.horizonui.molecules.IconButtonSize
+import com.instructure.horizon.horizonui.organisms.scaffolds.CollapsableHeaderScreen
+import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+import com.instructure.pandautils.compose.modifiers.conditional
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LearnLearningLibraryDetailsScreen(state: LearnLearningLibraryDetailsUiState, navController: NavHostController) {
+    LoadingStateWrapper(state.loadingState){
+        CollapsableHeaderScreen(
+            statusBarColor = HorizonColors.Surface.pagePrimary(),
+            navigationBarColor = HorizonColors.Surface.pagePrimary(),
+            headerContent = { contentPadding ->
+                LearnLearningLibraryDetailsHeader(state, navController, Modifier.padding(contentPadding))
+            },
+            bodyContent = { contentPadding ->
+                LearnLearningLibraryDetailsContent(state, navController, contentPadding)
+            }
+        )
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryDetailsContent(
+    state: LearnLearningLibraryDetailsUiState,
+    navController: NavHostController,
+    contentPadding: PaddingValues,
+) {
+    val scrollState = rememberLazyListState()
+
+    LazyColumn(
+        state = scrollState,
+        contentPadding = contentPadding,
+        modifier = Modifier.testTag("CollapsableBody")
+    ) {
+        stickyHeader {
+            LearnLearningLibraryDetailsContentFilter(state, scrollState)
+        }
+
+        item {
+            if (state.items.isEmpty()) {
+                EmptyMessage()
+            }
+        }
+
+        items(state.items.take(state.itemsToDisplay)) { collectionItemState ->
+            LearnLearningLibraryItem(
+                state = collectionItemState,
+                onClick = {
+                    when (collectionItemState.route) {
+                        is LearningLibraryRoute.StringRoute -> {
+                            navController.navigate(collectionItemState.route.route)
+                        }
+                        is LearningLibraryRoute.ObjectRoute -> {
+                            navController.navigate(collectionItemState.route.route)
+                        }
+                        null -> {}
+                    }
+                },
+                onBookmarkClick = {
+                    state.onBookmarkClicked(collectionItemState.id)
+                },
+                onEnrollClick = {
+                    navController.navigate(LearnRoute.LearnLearningLibraryEnrollScreen.route(collectionItemState.id))
+                },
+                modifier = Modifier
+                    .padding(horizontal = 24.dp)
+                    .padding(bottom = 24.dp)
+            )
+        }
+
+        if (state.items.size > state.itemsToDisplay) {
+            item {
+                Button(
+                    label = stringResource(R.string.learningLibraryDetailsShowMoreLabel),
+                    height = ButtonHeight.SMALL,
+                    width = ButtonWidth.FILL,
+                    color = ButtonColor.BlackOutline,
+                    onClick = state.increaseItemsToDisplay,
+                    modifier = Modifier
+                        .padding(horizontal = 24.dp)
+                        .padding(bottom = 24.dp)
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryDetailsContentFilter(
+    state: LearnLearningLibraryDetailsUiState,
+    scrollState: LazyListState
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(HorizonColors.Surface.pagePrimary())
+            .padding(horizontal = 24.dp, vertical = 16.dp)
+            .conditional(scrollState.canScrollBackward) {
+                horizonBorderShadow(HorizonColors.LineAndBorder.lineStroke(), bottom = 1.dp)
+            }
+    ) {
+        DropdownChip(
+            items = LearnLearningLibraryStatusFilter.entries.map { DropdownItem(value = it, label = stringResource(it.labelRes)) },
+            selectedItem = DropdownItem(value = state.selectedStatusFilter, label = stringResource(state.selectedStatusFilter.labelRes)),
+            onItemSelected = { it?.let { state.updateSelectedStatusFilter(it.value) } },
+            showSelectedIcon = true,
+            placeholder = "",
+            dropdownWidth = 200.dp,
+            verticalPadding = 6.dp
+        )
+
+        HorizonSpace(SpaceSize.SPACE_8)
+
+        DropdownChip(
+            items = LearnLearningLibraryTypeFilter.entries.map { DropdownItem(value = it, label = stringResource(it.labelRes)) },
+            selectedItem = DropdownItem(value = state.selectedTypeFilter, label = stringResource(state.selectedTypeFilter.labelRes)),
+            onItemSelected = { it?.let { state.updateTypeFilter(it.value) } },
+            showSelectedIcon = true,
+            placeholder = "",
+            dropdownWidth = 200.dp,
+            verticalPadding = 6.dp
+        )
+
+        Spacer(Modifier.weight(1f))
+
+        Text(
+            text = state.items.take(state.itemsToDisplay).size.toString(),
+            style = HorizonTypography.p2,
+            color = HorizonColors.Text.dataPoint()
+        )
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryDetailsHeader(
+    state: LearnLearningLibraryDetailsUiState,
+    navController: NavHostController,
+    modifier: Modifier
+) {
+    Column(modifier) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp)
+        ) {
+            IconButton(
+                iconRes = R.drawable.arrow_back,
+                contentDescription = stringResource(R.string.a11yNavigateBack),
+                color = IconButtonColor.Ghost,
+                size = IconButtonSize.SMALL,
+                onClick = { navController.popBackStack() },
+                modifier = Modifier.padding(end = 16.dp)
+            )
+            Text(
+                text = state.collectionName,
+                style = HorizonTypography.h3,
+                color = HorizonColors.Text.title()
+            )
+        }
+        LearnSearchBar(
+            value = state.searchQuery,
+            onValueChange = state.updateSearchQuery,
+            placeholder = stringResource(R.string.learnLearningLibraryDetailsSearchLabel),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 24.dp)
+        )
+    }
+}
+
+@Composable
+private fun EmptyMessage() {
+    Text(
+        text = stringResource(R.string.learnLearningLibraryDetailsEmptyMessage),
+        style = HorizonTypography.p1,
+        color = HorizonColors.Text.body(),
+        modifier = Modifier.padding(horizontal = 24.dp)
+    )
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsUiState.kt
new file mode 100644
index 0000000000..a6f587068e
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsUiState.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.details
+
+import androidx.compose.ui.text.input.TextFieldValue
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryStatusFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.horizonui.platform.LoadingState
+
+data class LearnLearningLibraryDetailsUiState(
+    val loadingState: LoadingState = LoadingState(),
+    val collectionName: String = "",
+    val items: List<LearnLearningLibraryCollectionItemState> = emptyList(),
+    val searchQuery: TextFieldValue = TextFieldValue(""),
+    val updateSearchQuery: (TextFieldValue) -> Unit = {},
+    val itemsToDisplay: Int = 1,
+    val increaseItemsToDisplay: () -> Unit = {},
+    val selectedStatusFilter: LearnLearningLibraryStatusFilter = LearnLearningLibraryStatusFilter.All,
+    val updateSelectedStatusFilter: (LearnLearningLibraryStatusFilter) -> Unit = {},
+    val selectedTypeFilter: LearnLearningLibraryTypeFilter = LearnLearningLibraryTypeFilter.All,
+    val updateTypeFilter: (LearnLearningLibraryTypeFilter) -> Unit = {},
+    val onBookmarkClicked: (itemId: String) -> Unit = {},
+)
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsViewModel.kt
new file mode 100644
index 0000000000..ed3a5b3dd7
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsViewModel.kt
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.details
+
+import android.content.res.Resources
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryStatusFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.toUiState
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.platform.LoadingState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import javax.inject.Inject
+
+@HiltViewModel
+class LearnLearningLibraryDetailsViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    private val resources: Resources,
+    private val repository: LearnLearningLibraryDetailsRepository
+): ViewModel() {
+    private val collectionId = savedStateHandle.get<String>(LearnRoute.LearnLearningLibraryDetailsScreen.collectionIdAttr) ?: ""
+
+    private var allItems: List<LearningLibraryCollectionItem> = emptyList()
+    private val pageSize = 10
+
+    private var recommendedItems: List<LearningLibraryRecommendation> = emptyList()
+
+    private val _uiState = MutableStateFlow(LearnLearningLibraryDetailsUiState(
+        loadingState = LoadingState(
+            onRefresh = ::refreshData,
+            onSnackbarDismiss = ::onDismissSnackbar
+        ),
+        itemsToDisplay = pageSize,
+        increaseItemsToDisplay = ::increaseItemsToDisplay,
+        updateSearchQuery = ::updateSearchQuery,
+        updateSelectedStatusFilter = ::updateSelectedStatusFilter,
+        updateTypeFilter = ::updateSelectedTypeFilter,
+        onBookmarkClicked = ::toggleItemBookmarked,
+    ))
+    val uiState = _uiState.asStateFlow()
+
+    init {
+        loadData()
+    }
+
+    private fun loadData() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = true)) }
+            val collection = fetchData()
+            fetchRecommendedItems()
+            _uiState.update {
+                it.copy(
+                    collectionName = collection.name,
+                    items = collection.items.applyFilters().map { it.toUiState(resources, recommendedItems) },
+                )
+            }
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = false, isError = false)) }
+        } catch {
+            _uiState.update {
+                it.copy(loadingState = it.loadingState.copy(isLoading = false, isError = true))
+            }
+        }
+    }
+
+    private fun refreshData() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = true)) }
+            val collection = fetchData(true)
+            fetchRecommendedItems(true)
+            _uiState.update {
+                it.copy(
+                    collectionName = collection.name,
+                    items = collection.items.applyFilters().map { it.toUiState(resources, recommendedItems) },
+                )
+            }
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = false, isError = false)) }
+        } catch {
+            _uiState.update {
+                it.copy(
+                    loadingState = it.loadingState.copy(
+                        isRefreshing = false,
+                        snackbarMessage = resources.getString(R.string.learnLearningLibraryFailedToLoadCollectionMessage)
+                    )
+                )
+            }
+        }
+    }
+
+    private suspend fun fetchData(forceRefresh: Boolean = false): EnrolledLearningLibraryCollection {
+        val result = repository.getLearningLibraryItems(collectionId, forceRefresh)
+        allItems = result.items
+
+        return result
+    }
+
+    private suspend fun fetchRecommendedItems(forceNetwork: Boolean = false){
+        recommendedItems = repository.getLearningLibraryRecommendedItems(forceNetwork)
+    }
+
+    private fun toggleItemBookmarked(itemId: String) {
+        viewModelScope.tryLaunch {
+            _uiState.update {
+                it.copy(
+                    items = it.items.map { collectionItemState ->
+                        if (collectionItemState.id == itemId) {
+                            collectionItemState.copy(bookmarkLoading = true)
+                        } else {
+                            collectionItemState
+                        }
+                    }
+                )
+            }
+
+            val newIsBookmarked = repository.toggleLearningLibraryItemIsBookmarked(itemId)
+
+            allItems = allItems.map { collectionItemState ->
+                if (collectionItemState.id == itemId) {
+                    collectionItemState.copy(isBookmarked = newIsBookmarked)
+                } else {
+                    collectionItemState
+                }
+            }
+
+            _uiState.update {
+                it.copy(items = allItems.applyFilters().map { it.toUiState(resources, recommendedItems) })
+            }
+        } catch {
+            _uiState.update {
+                it.copy(
+                    items = it.items.map { collectionItemState ->
+                        if (collectionItemState.id == itemId) {
+                            collectionItemState.copy(
+                                bookmarkLoading = false,
+                            )
+                        } else {
+                            collectionItemState
+                        }
+                    },
+                    loadingState = it.loadingState.copy(snackbarMessage = resources.getString(R.string.learnLearningLibraryFailedToUpdateBookmarkMessage))
+                )
+            }
+        }
+    }
+
+    private fun List<LearningLibraryCollectionItem>.applyFilters(): List<LearningLibraryCollectionItem> {
+        return this.filter {
+            it.canvasCourse?.courseName.orEmpty().contains(_uiState.value.searchQuery.text.trim(), ignoreCase = true)
+                    && it.isSatisfyStatusFilter(_uiState.value.selectedStatusFilter)
+                    && it.isSatisfyTypeFilter(_uiState.value.selectedTypeFilter)
+        }
+    }
+
+    private fun LearningLibraryCollectionItem.isSatisfyStatusFilter(statusFilter: LearnLearningLibraryStatusFilter): Boolean {
+        return when (statusFilter) {
+            LearnLearningLibraryStatusFilter.All -> true
+            LearnLearningLibraryStatusFilter.Completed -> this.completionPercentage == 100.0
+            LearnLearningLibraryStatusFilter.Bookmarked -> this.isBookmarked
+        }
+    }
+
+    private fun LearningLibraryCollectionItem.isSatisfyTypeFilter(typeFilter: LearnLearningLibraryTypeFilter): Boolean {
+        return when (typeFilter) {
+            LearnLearningLibraryTypeFilter.All -> true
+            LearnLearningLibraryTypeFilter.Courses -> this.itemType == CollectionItemType.COURSE
+            LearnLearningLibraryTypeFilter.Programs -> this.itemType == CollectionItemType.PROGRAM
+            LearnLearningLibraryTypeFilter.Assessments -> this.itemType == CollectionItemType.QUIZ
+            LearnLearningLibraryTypeFilter.Assignments -> this.itemType == CollectionItemType.ASSIGNMENT
+            LearnLearningLibraryTypeFilter.ExternalLinks -> this.itemType == CollectionItemType.EXTERNAL_URL
+            LearnLearningLibraryTypeFilter.ExternalTools -> this.itemType == CollectionItemType.EXTERNAL_TOOL
+            LearnLearningLibraryTypeFilter.Files -> this.itemType == CollectionItemType.FILE
+            LearnLearningLibraryTypeFilter.Pages -> this.itemType == CollectionItemType.PAGE
+        }
+    }
+
+    private fun onDismissSnackbar() {
+        _uiState.update { it.copy(loadingState = it.loadingState.copy(snackbarMessage = null)) }
+    }
+
+    private fun increaseItemsToDisplay() {
+        _uiState.update { it.copy(itemsToDisplay = it.itemsToDisplay + pageSize) }
+    }
+
+    private fun updateSearchQuery(value: TextFieldValue) {
+        _uiState.update { it.copy(searchQuery = value) }
+        _uiState.update { it.copy(items = allItems.applyFilters().map { it.toUiState(resources, recommendedItems) }) }
+    }
+
+    private fun updateSelectedStatusFilter(value: LearnLearningLibraryStatusFilter) {
+        _uiState.update { it.copy(selectedStatusFilter = value) }
+        _uiState.update { it.copy(items = allItems.applyFilters().map { it.toUiState(resources, recommendedItems) }) }
+    }
+
+    private fun updateSelectedTypeFilter(value: LearnLearningLibraryTypeFilter) {
+        _uiState.update { it.copy(selectedTypeFilter = value) }
+        _uiState.update { it.copy(items = allItems.applyFilters().map { it.toUiState(resources, recommendedItems) }) }
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollRepository.kt
similarity index 50%
rename from libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListRepository.kt
rename to libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollRepository.kt
index 1dcef72160..b966754b34 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/course/list/LearnCourseListRepository.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollRepository.kt
@@ -14,19 +14,29 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.horizon.features.learn.course.list
+package com.instructure.horizon.features.learn.learninglibrary.enroll
 
 import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
 import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
 import com.instructure.canvasapi2.utils.ApiPrefs
 import javax.inject.Inject
 
-class LearnCourseListRepository @Inject constructor(
-    private val horizonGetCoursesManager: HorizonGetCoursesManager,
+class LearnLearningLibraryEnrollRepository @Inject constructor(
+    private val getLearningLibraryManager: GetLearningLibraryManager,
+    private val getCoursesManager: HorizonGetCoursesManager,
     private val apiPrefs: ApiPrefs
 ) {
-    suspend fun getCoursesWithProgress(forceNetwork: Boolean): List<CourseWithProgress> {
-        val courseWithProgress = horizonGetCoursesManager.getCoursesWithProgress(apiPrefs.user?.id ?: -1, forceNetwork).dataOrThrow
-        return courseWithProgress
+    suspend fun loadLearningLibraryItem(itemId: String): LearningLibraryCollectionItem {
+        return getLearningLibraryManager.getLearningLibraryItem(itemId, false)
+    }
+
+    suspend fun loadCourseDetails(courseId: Long): CourseWithProgress {
+        return getCoursesManager.getCourseWithProgressById(courseId, apiPrefs.user?.id ?: -1L).dataOrThrow
+    }
+
+    suspend fun enrollLearningLibraryItem(itemId: String): LearningLibraryCollectionItem {
+        return getLearningLibraryManager.enrollLearningLibraryItem(itemId)
     }
 }
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollScreen.kt
new file mode 100644
index 0000000000..464bf9eb79
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollScreen.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.enroll
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.BottomAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.foundation.horizonBorder
+import com.instructure.horizon.horizonui.molecules.Button
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.IconButton
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.horizon.horizonui.molecules.IconButtonSize
+import com.instructure.horizon.horizonui.molecules.LoadingButton
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
+import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+import com.instructure.pandautils.compose.composables.ComposeCanvasWebViewWrapper
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LearnLearningLibraryEnrollScreen(
+    state: LearnLearningLibraryEnrollState,
+    navController: NavHostController
+) {
+    LaunchedEffect(state.navigateToCourseId) {
+        state.navigateToCourseId?.let {
+            state.resetNavigateToCourseId()
+            navController.popBackStack()
+            navController.navigate(LearnRoute.LearnCourseDetailsScreen.route(it))
+        }
+    }
+    EdgeToEdgeScaffold(
+        statusBarColor = HorizonColors.Surface.pageSecondary(),
+        navigationBarColor = HorizonColors.Surface.pageSecondary(),
+        containerColor = HorizonColors.Surface.pageSecondary(),
+        topBar = {
+            LearnLearningLibraryEnrollScreenTopBar(
+                state.syllabus,
+                { navController.popBackStack() }
+            )
+        },
+        bottomBar = {
+            LearnLearningLibraryEnrollScreenBottomBar(
+                state.isEnrollLoading,
+                state.onEnrollClicked,
+                { navController.popBackStack() }
+            )
+        }
+    ) { contentPadding ->
+        LoadingStateWrapper(
+            state.loadingState,
+            Modifier.padding(contentPadding),
+            containerColor = HorizonColors.Surface.pageSecondary(),
+        ) {
+            LearnLearningLibraryEnrollScreenContent(state.syllabus)
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryEnrollScreenContent(
+    syllabus: String?,
+) {
+    if (syllabus.isNullOrBlank()) {
+        Text(
+            text = stringResource(R.string.learnLearningLibraryEnrollDialogDetailsMessage),
+            style = HorizonTypography.p1,
+            color = HorizonColors.Text.body(),
+            modifier = Modifier.padding(24.dp)
+        )
+    } else {
+        ComposeCanvasWebViewWrapper(
+            content = syllabus,
+            modifier = Modifier.padding(24.dp)
+        )
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun LearnLearningLibraryEnrollScreenTopBar(
+    syllabus: String?,
+    onDismiss: () -> Unit
+) {
+    TopAppBar(
+        title = {
+            Text(
+                text = if (syllabus.isNullOrBlank())
+                    stringResource(R.string.learnLearningLibraryEnrollDialogReadyToJoinTitle)
+                else
+                    stringResource(R.string.learnLearningLibraryEnrollDialogOverviewTitle),
+                style = HorizonTypography.h3,
+                color = HorizonColors.Text.title()
+            )
+        },
+        actions = {
+            IconButton(
+                iconRes = R.drawable.close,
+                contentDescription = stringResource(R.string.close),
+                onClick = onDismiss,
+                size = IconButtonSize.SMALL,
+                color = IconButtonColor.Ghost
+            )
+        },
+        colors = TopAppBarDefaults.topAppBarColors(
+            containerColor = HorizonColors.Surface.pageSecondary(),
+            titleContentColor = HorizonColors.Text.title(),
+            navigationIconContentColor = HorizonColors.Icon.default()
+        ),
+        modifier = Modifier
+            .horizonBorder(
+                HorizonColors.LineAndBorder.lineStroke(),
+                bottom = 1.dp
+            )
+            .background(HorizonColors.Surface.pageSecondary())
+    )
+}
+
+@Composable
+private fun LearnLearningLibraryEnrollScreenBottomBar(
+    isEnrollButtonLoading: Boolean,
+    onEnroll: () -> Unit,
+    onDismiss: () -> Unit
+) {
+    BottomAppBar(
+        contentPadding = PaddingValues(vertical = 12.dp, horizontal = 16.dp),
+        containerColor = HorizonColors.Surface.pageSecondary(),
+        modifier = Modifier
+            .horizonBorder(
+                HorizonColors.LineAndBorder.lineStroke(),
+                top = 1.dp
+            )
+            .background(HorizonColors.Surface.pageSecondary())
+    ) {
+        Button(
+            label = stringResource(R.string.learnLearningLibraryEnrollDialogNotNowLabel),
+            width = ButtonWidth.RELATIVE,
+            height = ButtonHeight.NORMAL,
+            color = ButtonColor.Ghost,
+            onClick = onDismiss
+        )
+
+        Spacer(Modifier.weight(1f))
+
+        LoadingButton(
+            loading = isEnrollButtonLoading,
+            label = stringResource(R.string.learnLearningLibraryEnrollDialogEnrollLabel),
+            width = ButtonWidth.RELATIVE,
+            height = ButtonHeight.NORMAL,
+            color = ButtonColor.Black,
+            contentAlignment = Alignment.Center,
+            fixedLoadingSize = true,
+            onClick = onEnroll
+        )
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollState.kt
new file mode 100644
index 0000000000..264801c66e
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollState.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.enroll
+
+import com.instructure.horizon.horizonui.platform.LoadingState
+
+data class LearnLearningLibraryEnrollState(
+    val loadingState: LoadingState = LoadingState(),
+    val syllabus: String? = null,
+    val onEnrollClicked: () -> Unit = {},
+    val isEnrollLoading: Boolean = false,
+    val navigateToCourseId: Long? = null,
+    val resetNavigateToCourseId: () -> Unit = {},
+)
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollViewModel.kt
new file mode 100644
index 0000000000..a101cd68ba
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollViewModel.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.enroll
+
+import android.content.res.Resources
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.platform.LoadingState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import javax.inject.Inject
+
+@HiltViewModel
+class LearnLearningLibraryEnrollViewModel @Inject constructor(
+    savedStateHandle: SavedStateHandle,
+    private val resources: Resources,
+    private val repository: LearnLearningLibraryEnrollRepository,
+    private val eventHandler: LearnEventHandler
+) : ViewModel() {
+    private var learningLibraryItemId: String? = savedStateHandle.get<String>(LearnRoute.LearnLearningLibraryEnrollScreen.learningLibraryIdAttr)
+    private var learningLibraryItem: LearningLibraryCollectionItem? = null
+
+    private val _state = MutableStateFlow(
+        LearnLearningLibraryEnrollState(
+            onEnrollClicked = ::onEnroll,
+            resetNavigateToCourseId = ::resetNavigateToCourseId,
+            loadingState = LoadingState(
+                isPullToRefreshEnabled = false
+            )
+        )
+    )
+    val state = _state.asStateFlow()
+
+    init {
+        learningLibraryItemId?.let { loadData(it) }
+    }
+
+    fun loadData(learningLibraryItemId: String) {
+        this.learningLibraryItemId = learningLibraryItemId
+        viewModelScope.tryLaunch {
+            _state.update { it.copy(loadingState = it.loadingState.copy(isLoading = true)) }
+
+            val collectionItem = repository.loadLearningLibraryItem(learningLibraryItemId)
+            learningLibraryItem = collectionItem
+            val courseDetails = repository.loadCourseDetails(collectionItem.canvasCourse!!.courseId.toLong())
+
+            _state.update { it.copy(
+                loadingState = it.loadingState.copy(isLoading = false),
+                syllabus = courseDetails.courseSyllabus,
+            ) }
+        } catch {
+            // Silent error
+            _state.update { it.copy(loadingState = it.loadingState.copy(isLoading = false)) }
+        }
+    }
+
+    private fun onEnroll() {
+        viewModelScope.tryLaunch {
+            _state.update { it.copy(isEnrollLoading = true) }
+            repository.enrollLearningLibraryItem(learningLibraryItem!!.id)
+            _state.update { it.copy(isEnrollLoading = false, navigateToCourseId = learningLibraryItem!!.canvasCourse!!.courseId.toLong()) }
+            eventHandler.postEvent(LearnEvent.RefreshLearningLibraryList)
+        } catch {
+            _state.update { it.copy(
+                loadingState = it.loadingState.copy(
+                    snackbarMessage = resources.getString(R.string.learnLearningLibraryEnrollDialogFailedToEnrollMessage)
+                ),
+                isEnrollLoading = false
+            ) }
+        }
+    }
+
+    private fun resetNavigateToCourseId() {
+        _state.update { it.copy(navigateToCourseId = null) }
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListRepository.kt
new file mode 100644
index 0000000000..add6321fd0
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListRepository.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.list
+
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItemsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import javax.inject.Inject
+
+class LearnLearningLibraryListRepository @Inject constructor(
+    private val getLearningLibraryManager: GetLearningLibraryManager,
+) {
+    private val itemLimitPerCollection = 4
+
+    suspend fun getLearningLibraryItems(
+        afterCursor: String? = null,
+        limit: Int? = 10,
+        searchQuery: String? = null,
+        typeFilter: CollectionItemType? = null,
+        bookmarkedOnly: Boolean = false,
+        completedOnly: Boolean = false,
+        sortBy: CollectionItemSortOption? = null,
+        forceNetwork: Boolean
+    ): LearningLibraryCollectionItemsResponse {
+        return getLearningLibraryManager.getLearningLibraryCollectionItems(
+            cursor = afterCursor,
+            limit = limit,
+            bookmarkedOnly = bookmarkedOnly,
+            completedOnly = completedOnly,
+            searchTerm = searchQuery,
+            types = typeFilter?.let { listOf(it) },
+            sortBy = sortBy,
+            forceNetwork = forceNetwork
+        )
+    }
+
+    suspend fun getEnrolledLearningLibraries(forceNetwork: Boolean): List<EnrolledLearningLibraryCollection> {
+        return getLearningLibraryManager.getEnrolledLearningLibraryCollections(itemLimitPerCollection, forceNetwork).collections
+    }
+
+    suspend fun toggleLearningLibraryItemIsBookmarked(itemId: String): Boolean {
+        return getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked(itemId)
+    }
+
+    suspend fun getLearningLibraryRecommendedItems(forceNetwork: Boolean): List<LearningLibraryRecommendation> {
+        return getLearningLibraryManager.getLearningLibraryRecommendations(forceNetwork)
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListScreen.kt
new file mode 100644
index 0000000000..6ce4ec1b67
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListScreen.kt
@@ -0,0 +1,416 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.list
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.common.LearnSearchBar
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollection
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryItem
+import com.instructure.horizon.features.learn.learninglibrary.common.LearningLibraryRoute
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonElevation
+import com.instructure.horizon.horizonui.foundation.HorizonSpace
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.foundation.SpaceSize
+import com.instructure.horizon.horizonui.foundation.horizonBorderShadow
+import com.instructure.horizon.horizonui.molecules.Badge
+import com.instructure.horizon.horizonui.molecules.BadgeContent
+import com.instructure.horizon.horizonui.molecules.BadgeType
+import com.instructure.horizon.horizonui.molecules.Button
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.IconButton
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.horizon.horizonui.molecules.IconButtonSize
+import com.instructure.horizon.horizonui.molecules.LoadingButton
+import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+import com.instructure.pandautils.compose.modifiers.conditional
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LearnLearningLibraryListScreen(
+    state: LearnLearningLibraryListUiState,
+    navController: NavHostController
+) {
+    val collectionScrollState = rememberLazyListState()
+    val itemScrollState = rememberLazyListState()
+
+    Column(Modifier.fillMaxSize()) {
+        LearnLearningLibraryListFilterRow(
+            state,
+            if (state.isEmptyFilter()) collectionScrollState else itemScrollState,
+            navController
+        )
+
+        if (state.isEmptyFilter()) {
+            LearnLearningLibraryCollections(
+                state,
+                collectionScrollState,
+                navController
+            )
+        } else {
+            LearnLearningLibraryItems(
+                state,
+                itemScrollState,
+                navController
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun LearnLearningLibraryCollections(
+    state: LearnLearningLibraryListUiState,
+    scrollState: LazyListState,
+    navController: NavHostController,
+) {
+    LoadingStateWrapper(state.collectionState.loadingState) {
+        LazyColumn(
+            state = scrollState,
+            contentPadding = PaddingValues(top = 16.dp),
+            modifier = Modifier.testTag("CollapsableBody")
+        ) {
+            if (state.collectionState.recommendedItems.isNotEmpty()) {
+                item {
+                    LearnLearningLibraryRecommendedSection(state, navController)
+                }
+            }
+
+            item {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier
+                        .padding(bottom = 24.dp)
+                        .padding(horizontal = 24.dp)
+                ) {
+                    Box(
+                        contentAlignment = Alignment.Center,
+                        modifier = Modifier
+                            .size(28.dp)
+                            .background(HorizonColors.PrimitivesGrey.grey12(), CircleShape)
+                    ) {
+                        Icon(
+                            painter = painterResource(R.drawable.stacks_filled),
+                            contentDescription = null,
+                            tint = HorizonColors.PrimitivesGrey.grey45(),
+                            modifier = Modifier.size(16.dp)
+                        )
+                    }
+                    HorizonSpace(SpaceSize.SPACE_8)
+                    Text(
+                        text = stringResource(R.string.learnLearningLibraryCollectionsHeader),
+                        style = HorizonTypography.labelMediumBold,
+                        color = HorizonColors.Text.dataPoint()
+                    )
+                }
+            }
+
+            LearnLearningLibraryCollection(
+                state.collectionState.collections.take(state.collectionState.itemsToDisplay),
+                state.collectionState.onBookmarkClicked,
+                { itemId ->
+                    navController.navigate(LearnRoute.LearnLearningLibraryEnrollScreen.route(itemId))
+                },
+                { route ->
+                    when (route) {
+                        is LearningLibraryRoute.StringRoute -> {
+                            navController.navigate(route.route)
+                        }
+                        is LearningLibraryRoute.ObjectRoute -> {
+                            navController.navigate(route.route)
+                        }
+                        null -> {}
+                    }
+                },
+                {
+                    navController.navigate(LearnRoute.LearnLearningLibraryDetailsScreen.route(it))
+                },
+                Modifier.padding(horizontal = 24.dp)
+            )
+
+            if (state.collectionState.collections.size > state.collectionState.itemsToDisplay) {
+                item {
+                    Button(
+                        label = stringResource(R.string.learningLibraryListShowMoreLabel),
+                        height = ButtonHeight.SMALL,
+                        width = ButtonWidth.FILL,
+                        color = ButtonColor.BlackOutline,
+                        onClick = state.collectionState.increaseItemsToDisplay,
+                        modifier = Modifier.padding(horizontal = 24.dp)
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryRecommendedSection(
+    state: LearnLearningLibraryListUiState,
+    navController: NavHostController,
+) {
+    Column(Modifier.fillMaxWidth()) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(horizontal = 24.dp)
+        ) {
+            Box(
+                contentAlignment = Alignment.Center,
+                modifier = Modifier
+                    .size(28.dp)
+                    .background(HorizonColors.Surface.aiGradient(), CircleShape, 0.15f)
+            ) {
+                Icon(
+                    painter = painterResource(R.drawable.ai_filled),
+                    contentDescription = null,
+                    tint = HorizonColors.Icon.default(),
+                    modifier = Modifier.size(16.dp)
+                )
+            }
+            HorizonSpace(SpaceSize.SPACE_8)
+            Text(
+                text = stringResource(
+                    R.string.learnLearningLibraryListRecommendedForLabel,
+                    state.collectionState.userName
+                ),
+                style = HorizonTypography.labelMediumBold,
+                color = HorizonColors.Text.dataPoint()
+            )
+        }
+        HorizonSpace(SpaceSize.SPACE_16)
+
+        val pagerState = rememberPagerState { state.collectionState.recommendedItems.size }
+        HorizontalPager(
+            pagerState,
+            pageSpacing = 24.dp,
+            contentPadding = PaddingValues(horizontal = 24.dp)
+        ) { pageIndex ->
+            val itemState = state.collectionState.recommendedItems[pageIndex]
+
+            LearnLearningLibraryItem(
+                itemState,
+                onClick = {
+                    when (itemState.route) {
+                        is LearningLibraryRoute.StringRoute -> {
+                            navController.navigate(itemState.route.route)
+                        }
+                        is LearningLibraryRoute.ObjectRoute -> {
+                            navController.navigate(itemState.route.route)
+                        }
+                        null -> {}
+                    }
+                },
+                onBookmarkClick = {
+                    state.itemState.onBookmarkClicked(itemState.id)
+                },
+                onEnrollClick = {
+                    navController.navigate(LearnRoute.LearnLearningLibraryEnrollScreen.route(itemState.id))
+                },
+            )
+        }
+
+        if (state.collectionState.recommendedItems.size > 1) {
+            HorizonSpace(SpaceSize.SPACE_16)
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+                modifier = Modifier.align(Alignment.CenterHorizontally).padding(horizontal = 24.dp)
+            ) {
+                val coroutineScope = rememberCoroutineScope()
+                IconButton(
+                    iconRes = R.drawable.chevron_left,
+                    contentDescription = stringResource(R.string.a11y_learningLibraryRecommendedPreviousContentDescription),
+                    size = IconButtonSize.NORMAL,
+                    color = IconButtonColor.WhiteGreyOutline,
+                    enabled = pagerState.currentPage > 0,
+                    onClick = {
+                        coroutineScope.launch { pagerState.animateScrollToPage(pagerState.currentPage - 1) }
+                    }
+                )
+                IconButton(
+                    iconRes = R.drawable.chevron_right,
+                    contentDescription = stringResource(R.string.a11y_learningLibraryRecommendedNextContentDescription),
+                    size = IconButtonSize.NORMAL,
+                    color = IconButtonColor.WhiteGreyOutline,
+                    enabled = pagerState.currentPage < state.collectionState.recommendedItems.lastIndex,
+                    onClick = {
+                        coroutineScope.launch { pagerState.animateScrollToPage(pagerState.currentPage + 1) }
+                    }
+                )
+            }
+        }
+        HorizonSpace(SpaceSize.SPACE_24)
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun LearnLearningLibraryItems(
+    state: LearnLearningLibraryListUiState,
+    scrollState: LazyListState,
+    navController: NavHostController,
+) {
+    LoadingStateWrapper(state.itemState.loadingState) {
+        LazyColumn(
+            state = scrollState,
+            modifier = Modifier.testTag("CollapsableBody")
+        ) {
+            item {
+                if (state.itemState.items.isEmpty()) {
+                    EmptyMessage()
+                }
+            }
+
+            items(state.itemState.items) { collectionItemState ->
+                LearnLearningLibraryItem(
+                    state = collectionItemState,
+                    onClick = {
+                        when (collectionItemState.route) {
+                            is LearningLibraryRoute.StringRoute -> {
+                                navController.navigate(collectionItemState.route.route)
+                            }
+                            is LearningLibraryRoute.ObjectRoute -> {
+                                navController.navigate(collectionItemState.route.route)
+                            }
+                            null -> {}
+                        }
+                    },
+                    onBookmarkClick = {
+                        state.itemState.onBookmarkClicked(collectionItemState.id)
+                    },
+                    onEnrollClick = {
+                        navController.navigate(LearnRoute.LearnLearningLibraryEnrollScreen.route(collectionItemState.id))
+                    },
+                    modifier = Modifier
+                        .padding(horizontal = 24.dp)
+                        .padding(bottom = 24.dp)
+                )
+            }
+
+            if (state.itemState.showMoreButton) {
+                item {
+                    LoadingButton(
+                        loading = state.itemState.isMoreButtonLoading,
+                        label = stringResource(R.string.learningLibraryListShowMoreLabel),
+                        height = ButtonHeight.SMALL,
+                        width = ButtonWidth.FILL,
+                        color = ButtonColor.BlackOutline,
+                        onClick = state.itemState.onShowMoreClicked,
+                        contentAlignment = Alignment.Center,
+                        modifier = Modifier
+                            .padding(horizontal = 24.dp)
+                            .padding(bottom = 24.dp)
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun LearnLearningLibraryListFilterRow(
+    state: LearnLearningLibraryListUiState,
+    scrollState: LazyListState,
+    navController: NavHostController
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .conditional(scrollState.canScrollBackward) {
+                horizonBorderShadow(HorizonColors.LineAndBorder.lineStroke(), bottom = 1.dp)
+            }
+            .background(HorizonColors.Surface.pagePrimary())
+            .padding(24.dp)
+    ) {
+        LearnSearchBar(
+            value = state.searchQuery,
+            onValueChange = state.updateSearchQuery,
+            placeholder = stringResource(R.string.learnLearningLibraryListSearchPlaceholder),
+            modifier = Modifier.weight(1f)
+        )
+        HorizonSpace(SpaceSize.SPACE_16)
+        IconButton(
+            iconRes = R.drawable.tune,
+            size = IconButtonSize.NORMAL,
+            color = IconButtonColor.White,
+            elevation = HorizonElevation.level4,
+            contentDescription = stringResource(R.string.a11y_learnLearningLibraryFilterContentDescription),
+            onClick = {
+                navController.navigate(
+                    LearnRoute.LearnLearningLibraryFilterScreen.route(
+                        screenType = LearnLearningLibraryFilterScreenType.Browse,
+                        typeFilter = state.typeFilter,
+                        sortOption = state.sortOption,
+                    )
+                )
+            },
+            badge = if (state.activeFilterCount > 0) {
+                {
+                    Badge(
+                        content = BadgeContent.Text(state.activeFilterCount.toString()),
+                        type = BadgeType.Primary
+                    )
+                }
+            } else null
+        )
+    }
+}
+
+@Composable
+private fun EmptyMessage() {
+    Text(
+        text = stringResource(R.string.learnLearningLibraryListEmptyMessage),
+        style = HorizonTypography.p1,
+        color = HorizonColors.Text.body(),
+        modifier = Modifier.padding(horizontal = 24.dp)
+    )
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListUiState.kt
new file mode 100644
index 0000000000..8c5ab1d7c1
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListUiState.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.list
+
+import androidx.compose.ui.text.input.TextFieldValue
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.horizonui.platform.LoadingState
+
+data class LearnLearningLibraryListUiState(
+    val searchQuery: TextFieldValue = TextFieldValue(""),
+    val updateSearchQuery: (TextFieldValue) -> Unit = {},
+    val typeFilter: LearnLearningLibraryTypeFilter = LearnLearningLibraryTypeFilter.All,
+    val sortOption: LearnLearningLibrarySortOption = LearnLearningLibrarySortOption.MostRecent,
+    val activeFilterCount: Int = 0,
+    val collectionState: LearnLearningLibraryListCollectionUiState = LearnLearningLibraryListCollectionUiState(),
+    val itemState: LearnLearningLibraryListItemUiState = LearnLearningLibraryListItemUiState()
+) {
+    fun isEmptyFilter(): Boolean {
+        return searchQuery.text.isEmpty() && activeFilterCount == 0
+    }
+}
+
+data class LearnLearningLibraryListCollectionUiState(
+    val loadingState: LoadingState = LoadingState(),
+    val collections: List<LearnLearningLibraryCollectionState> = emptyList(),
+    val itemsToDisplay: Int = 1,
+    val increaseItemsToDisplay: () -> Unit = {},
+    val onBookmarkClicked: (itemId: String) -> Unit = {},
+    val userName: String = "",
+    val recommendedItems: List<LearnLearningLibraryCollectionItemState> = emptyList()
+)
+
+data class LearnLearningLibraryListItemUiState(
+    val loadingState: LoadingState = LoadingState(),
+    val items: List<LearnLearningLibraryCollectionItemState> = emptyList(),
+    val onShowMoreClicked: () -> Unit = {},
+    val showMoreButton: Boolean = false,
+    val isMoreButtonLoading: Boolean = false,
+    val onBookmarkClicked: (itemId: String) -> Unit = {},
+)
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListViewModel.kt
new file mode 100644
index 0000000000..29fad0657c
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListViewModel.kt
@@ -0,0 +1,471 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.list
+
+import android.content.res.Resources
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.toUiState
+import com.instructure.horizon.horizonui.platform.LoadingState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@OptIn(FlowPreview::class)
+@HiltViewModel
+class LearnLearningLibraryListViewModel @Inject constructor(
+    private val resources: Resources,
+    private val repository: LearnLearningLibraryListRepository,
+    private val eventHandler: LearnEventHandler,
+    private val apiPrefs: ApiPrefs,
+): ViewModel() {
+
+    private var currentTypeFilter: LearnLearningLibraryTypeFilter = LearnLearningLibraryTypeFilter.All
+    private var currentSortOption: LearnLearningLibrarySortOption = LearnLearningLibrarySortOption.MostRecent
+
+    private var allCollections: List<LearnLearningLibraryCollectionState> = emptyList()
+    private val collectionPageSize: Int = 3
+
+    private var itemNextCursor: String? = null
+    private val itemPageSize: Int = 10
+    private val searchQueryFlow = MutableStateFlow("")
+
+    private val _uiState = MutableStateFlow(LearnLearningLibraryListUiState(
+        updateSearchQuery = ::updateSearchQuery,
+        collectionState = LearnLearningLibraryListCollectionUiState(
+            loadingState = LoadingState(
+                onRefresh = ::refreshCollections,
+                onSnackbarDismiss = ::onDismissSnackbar
+            ),
+            userName = apiPrefs.user?.shortName ?: resources.getString(R.string.learnLEarningLibraryListYou),
+            collections = allCollections,
+            itemsToDisplay = collectionPageSize,
+            increaseItemsToDisplay = ::increaseCollectionsToDisplay,
+            onBookmarkClicked = ::onCollectionBookmarkItem,
+        ),
+        itemState = LearnLearningLibraryListItemUiState(
+            loadingState = LoadingState(
+                onRefresh = ::refreshItems,
+                onSnackbarDismiss = ::onDismissSnackbar
+            ),
+            items = allCollections.flatMap { it.items },
+            onShowMoreClicked = ::increaseItemsToDisplay,
+            onBookmarkClicked = ::onBookmarkItem,
+            isMoreButtonLoading = false
+        )
+    ))
+    val uiState = _uiState.asStateFlow()
+
+    init {
+        loadCollections()
+
+        viewModelScope.launch {
+            searchQueryFlow
+                .drop(1)
+                .debounce(300)
+                .collectLatest { loadItems(cursor = null) }
+        }
+
+        viewModelScope.launch {
+            eventHandler.events.collectLatest {
+                when (it) {
+                    LearnEvent.RefreshLearningLibraryList -> {
+                        if (uiState.value.isEmptyFilter()) {
+                            refreshCollections()
+                        } else {
+                            refreshItems()
+                        }
+                    }
+                    is LearnEvent.UpdateLearningLibraryFilter -> {
+                        if (it.screenType == LearnLearningLibraryFilterScreenType.Browse) {
+                            currentTypeFilter = it.typeFilter
+                            currentSortOption = it.sortOption
+                            _uiState.update { state ->
+                                state.copy(
+                                    typeFilter = currentTypeFilter,
+                                    sortOption = currentSortOption,
+                                    activeFilterCount = computeActiveFilterCount()
+                                )
+                            }
+                            loadItems(cursor = null)
+                        }
+                    }
+                    else -> {}
+                }
+            }
+        }
+    }
+
+    private suspend fun fetchRecommendedItems(forceNetwork: Boolean = false): List<LearningLibraryRecommendation> {
+        val recommendations = repository.getLearningLibraryRecommendedItems(forceNetwork)
+        _uiState.update {
+            it.copy(collectionState = it.collectionState.copy(
+                recommendedItems = recommendations.map { it.toUiState(resources) }
+            ))
+        }
+        return recommendations
+    }
+
+    private fun loadCollections() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(loadingState = it.collectionState.loadingState.copy(isLoading = true))) }
+            val result = fetchCollections()
+            val recommendedItems = fetchRecommendedItems()
+            allCollections = result.toUiState(resources, recommendedItems)
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(collections = allCollections)) }
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(loadingState = it.collectionState.loadingState.copy(isLoading = false))) }
+        } catch {
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(loadingState = it.collectionState.loadingState.copy(isLoading = false, isError = true))) }
+        }
+    }
+
+    private fun loadItems(
+        cursor: String? = itemNextCursor,
+        searchQuery: String? = uiState.value.searchQuery.text,
+        typeFilter: CollectionItemType? = currentTypeFilter.toCollectionItemType(),
+        sortBy: CollectionItemSortOption? = currentSortOption.toCollectionItemSortOption(),
+    ) {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(itemState = it.itemState.copy(loadingState = it.itemState.loadingState.copy(isLoading = true))) }
+            fetchItems(cursor, searchQuery, typeFilter, sortBy = sortBy)
+            _uiState.update { it.copy(itemState = it.itemState.copy(loadingState = it.itemState.loadingState.copy(isLoading = false))) }
+        } catch {
+            _uiState.update { it.copy(itemState = it.itemState.copy(loadingState = it.itemState.loadingState.copy(isLoading = false, isError = true))) }
+        }
+    }
+
+    private fun refreshCollections() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(loadingState = it.collectionState.loadingState.copy(isRefreshing = true))) }
+            val result = fetchCollections(true)
+            val recommendedItems = fetchRecommendedItems(true)
+            allCollections = result.toUiState(resources, recommendedItems)
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(collections = allCollections)) }
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(loadingState = it.collectionState.loadingState.copy(isRefreshing = false, isError = false))) }
+        } catch {
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(loadingState = it.collectionState.loadingState.copy(isRefreshing = false, snackbarMessage = resources.getString(
+                R.string.learnLearningLibraryFailedToLoadMessage
+            )))) }
+        }
+    }
+
+    private suspend fun fetchCollections(forceNetwork: Boolean = false): List<EnrolledLearningLibraryCollection> {
+        return repository.getEnrolledLearningLibraries(forceNetwork)
+    }
+
+    private suspend fun fetchItems(
+        cursor: String? = itemNextCursor,
+        searchQuery: String? = uiState.value.searchQuery.text,
+        filterType: CollectionItemType? = currentTypeFilter.toCollectionItemType(),
+        sortBy: CollectionItemSortOption? = currentSortOption.toCollectionItemSortOption(),
+        forceNetwork: Boolean = false
+    ) {
+        val response = repository.getLearningLibraryItems(
+            afterCursor = cursor,
+            limit = itemPageSize,
+            searchQuery = searchQuery,
+            typeFilter = filterType,
+            sortBy = sortBy,
+            forceNetwork = forceNetwork
+        )
+        val recommendedItemsList = fetchRecommendedItems()
+
+        if (response.pageInfo.hasNextPage && response.pageInfo.nextCursor != null) {
+            itemNextCursor = response.pageInfo.nextCursor
+            _uiState.update { it.copy(itemState = it.itemState.copy(showMoreButton = true)) }
+        } else {
+            itemNextCursor = null
+            _uiState.update { it.copy(itemState = it.itemState.copy(showMoreButton = false)) }
+        }
+
+        _uiState.update {
+            it.copy(
+                itemState = it.itemState.copy(
+                    items = if (cursor == null)
+                        response.items.map { item -> item.toUiState(resources, recommendedItemsList) }
+                    else
+                        it.itemState.items + response.items.map { item -> item.toUiState(resources, recommendedItemsList) }
+                ),
+            )
+        }
+    }
+
+    private fun refreshItems() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(itemState = it.itemState.copy(loadingState = it.itemState.loadingState.copy(isRefreshing = true))) }
+            fetchItems(cursor = null, forceNetwork = true)
+            _uiState.update { it.copy(itemState = it.itemState.copy(loadingState = it.itemState.loadingState.copy(isRefreshing = false, isError = false))) }
+        } catch {
+            _uiState.update { it.copy(itemState = it.itemState.copy(loadingState = it.itemState.loadingState.copy(isRefreshing = false, snackbarMessage = resources.getString(
+                R.string.learnLearningLibraryFailedToLoadMessage
+            )))) }
+        }
+    }
+
+    private fun onCollectionBookmarkItem(itemId: String) {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(
+                collections = it.collectionState.collections.map { collectionState ->
+                    collectionState.copy(
+                        items = collectionState.items.map { collectionItemState ->
+                            if (collectionItemState.id == itemId) {
+                                collectionItemState.copy(bookmarkLoading = true)
+                            } else {
+                                collectionItemState
+                            }
+                        }
+                    )
+                },
+                recommendedItems = it.collectionState.recommendedItems.map { recommendedItemState ->
+                    if (recommendedItemState.id == itemId) {
+                        recommendedItemState.copy(bookmarkLoading = true)
+                    } else {
+                        recommendedItemState
+                    }
+                }
+            ))}
+
+            val newIsBookmarked = repository.toggleLearningLibraryItemIsBookmarked(itemId)
+
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(
+                collections = it.collectionState.collections.map { collectionState ->
+                    collectionState.copy(
+                        items = collectionState.items.map { collectionItemState ->
+                            if (collectionItemState.id == itemId) {
+                                collectionItemState.copy(
+                                    bookmarkLoading = false,
+                                    isBookmarked = newIsBookmarked
+                                )
+                            } else {
+                                collectionItemState
+                            }
+                        }
+                    )
+                },
+                recommendedItems = it.collectionState.recommendedItems.map { recommendedItemState ->
+                    if (recommendedItemState.id == itemId) {
+                        recommendedItemState.copy(
+                            bookmarkLoading = false,
+                            isBookmarked = newIsBookmarked
+                        )
+                    } else {
+                        recommendedItemState
+                    }
+                }
+            ))}
+        } catch {
+            _uiState.update { it.copy(collectionState = it.collectionState.copy(
+                collections = it.collectionState.collections.map { collectionState ->
+                    collectionState.copy(
+                        items = collectionState.items.map { collectionItemState ->
+                            if (collectionItemState.id == itemId) {
+                                collectionItemState.copy(
+                                    bookmarkLoading = false,
+                                )
+                            } else {
+                                collectionItemState
+                            }
+                        }
+                    )
+                },
+                recommendedItems = it.collectionState.recommendedItems.map { recommendedItemState ->
+                    if (recommendedItemState.id == itemId) {
+                        recommendedItemState.copy(
+                            bookmarkLoading = false,
+                        )
+                    } else {
+                        recommendedItemState
+                    }
+                },
+                loadingState = it.collectionState.loadingState.copy(snackbarMessage = resources.getString(R.string.learnLearningLibraryFailedToUpdateBookmarkMessage)))) }
+        }
+    }
+
+    private fun onBookmarkItem(itemId: String) {
+        viewModelScope.tryLaunch {
+            _uiState.update {
+                it.copy(
+                    itemState = it.itemState.copy(
+                        items = it.itemState.items.map { collectionItemState ->
+                            if (collectionItemState.id == itemId) {
+                                collectionItemState.copy(bookmarkLoading = true)
+                            } else {
+                                collectionItemState
+                            }
+                        }
+                    ),
+                    collectionState = it.collectionState.copy(
+                        collections = it.collectionState.collections.map { collectionState ->
+                            collectionState.copy(
+                                items = collectionState.items.map { collectionItemState ->
+                                    if (collectionItemState.id == itemId) {
+                                        collectionItemState.copy(
+                                            bookmarkLoading = true,
+                                        )
+                                    } else {
+                                        collectionItemState
+                                    }
+                                }
+                            )
+                        },
+                        recommendedItems = it.collectionState.recommendedItems.map { recommendedItemState ->
+                            if (recommendedItemState.id == itemId) {
+                                recommendedItemState.copy(bookmarkLoading = true)
+                            } else {
+                                recommendedItemState
+                            }
+                        }
+                    )
+                )
+            }
+
+            val newIsBookmarked = repository.toggleLearningLibraryItemIsBookmarked(itemId)
+
+            _uiState.update {
+                it.copy(
+                    itemState = it.itemState.copy(
+                        items = it.itemState.items.map { collectionItemState ->
+                            if (collectionItemState.id == itemId) {
+                                collectionItemState.copy(
+                                    isBookmarked = newIsBookmarked,
+                                    bookmarkLoading = false
+                                )
+                            } else {
+                                collectionItemState
+                            }
+                        }
+                    ),
+                    collectionState = it.collectionState.copy(
+                        collections = it.collectionState.collections.map { collectionState ->
+                            collectionState.copy(
+                                items = collectionState.items.map { collectionItemState ->
+                                    if (collectionItemState.id == itemId) {
+                                        collectionItemState.copy(
+                                            bookmarkLoading = false,
+                                            isBookmarked = newIsBookmarked
+                                        )
+                                    } else {
+                                        collectionItemState
+                                    }
+                                }
+                            )
+                        },
+                        recommendedItems = it.collectionState.recommendedItems.map { recommendedItemState ->
+                            if (recommendedItemState.id == itemId) {
+                                recommendedItemState.copy(
+                                    bookmarkLoading = false,
+                                    isBookmarked = newIsBookmarked
+                                )
+                            } else {
+                                recommendedItemState
+                            }
+                        }
+                    )
+                )
+            }
+        } catch {
+            _uiState.update {
+                it.copy(
+                    itemState = it.itemState.copy(
+                        items = it.itemState.items.map { collectionItemState ->
+                            if (collectionItemState.id == itemId) {
+                                collectionItemState.copy(bookmarkLoading = false)
+                            } else {
+                                collectionItemState
+                            }
+                        },
+                        loadingState = it.itemState.loadingState.copy(snackbarMessage = resources.getString(R.string.learnLearningLibraryFailedToUpdateBookmarkMessage))
+                    ),
+                    collectionState = it.collectionState.copy(
+                        collections = it.collectionState.collections.map { collectionState ->
+                            collectionState.copy(
+                                items = collectionState.items.map { collectionItemState ->
+                                    if (collectionItemState.id == itemId) {
+                                        collectionItemState.copy(
+                                            bookmarkLoading = false,
+                                        )
+                                    } else {
+                                        collectionItemState
+                                    }
+                                }
+                            )
+                        },
+                        recommendedItems = it.collectionState.recommendedItems.map { recommendedItemState ->
+                            if (recommendedItemState.id == itemId) {
+                                recommendedItemState.copy(bookmarkLoading = false)
+                            } else {
+                                recommendedItemState
+                            }
+                        }
+                    )
+                )
+            }
+        }
+    }
+
+    private fun onDismissSnackbar() {
+        _uiState.update { it.copy(
+            itemState = it.itemState.copy(loadingState = it.itemState.loadingState.copy(snackbarMessage = null)),
+            collectionState = it.collectionState.copy(loadingState = it.collectionState.loadingState.copy(snackbarMessage = null))
+        ) }
+    }
+
+    private fun increaseCollectionsToDisplay() {
+        _uiState.update { it.copy(collectionState = it.collectionState.copy(itemsToDisplay = it.collectionState.itemsToDisplay + collectionPageSize)) }
+    }
+
+    private fun increaseItemsToDisplay() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(itemState = it.itemState.copy(isMoreButtonLoading = true)) }
+            fetchItems(cursor = itemNextCursor)
+            _uiState.update { it.copy(itemState = it.itemState.copy(isMoreButtonLoading = false)) }
+        } catch {
+            _uiState.update { it.copy(itemState = it.itemState.copy(isMoreButtonLoading = false)) }
+        }
+    }
+
+    private fun updateSearchQuery(value: TextFieldValue) {
+        _uiState.update { it.copy(searchQuery = value) }
+        searchQueryFlow.tryEmit(value.text)
+    }
+
+    private fun computeActiveFilterCount(): Int {
+        return if (currentTypeFilter != LearnLearningLibraryTypeFilter.All) 1 else 0
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentScreen.kt
new file mode 100644
index 0000000000..48dfbb4f53
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentScreen.kt
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.common.LearnSearchBar
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.mycontent.completed.LearnMyContentCompletedScreen
+import com.instructure.horizon.features.learn.mycontent.inprogress.LearnMyContentInProgressScreen
+import com.instructure.horizon.features.learn.mycontent.saved.LearnMyContentSavedScreen
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.foundation.HorizonElevation
+import com.instructure.horizon.horizonui.molecules.Badge
+import com.instructure.horizon.horizonui.molecules.BadgeContent
+import com.instructure.horizon.horizonui.molecules.BadgeType
+import com.instructure.horizon.horizonui.molecules.FilterChip
+import com.instructure.horizon.horizonui.molecules.FilterChipSize
+import com.instructure.horizon.horizonui.molecules.IconButton
+import com.instructure.horizon.horizonui.molecules.IconButtonColor
+import com.instructure.horizon.horizonui.molecules.IconButtonSize
+import com.instructure.horizon.horizonui.organisms.scaffolds.CollapsableHeaderScreen
+
+@Composable
+fun LearnMyContentScreen(
+    state: LearnMyContentUiState,
+    navController: NavHostController,
+) {
+    CollapsableHeaderScreen(
+        headerContent = { paddingValues ->
+            Column(
+                Modifier
+                    .padding(paddingValues)
+                    .padding(horizontal = 24.dp)
+            ) {
+                LearnMyContentTabSelector(
+                    selectedTab = state.selectedTab,
+                    onTabSelected = state.onTabSelected,
+                    modifier = Modifier.padding(vertical = 24.dp)
+                )
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+                    modifier = Modifier.padding(bottom = 24.dp)
+                ) {
+                    LearnSearchBar(
+                        state.searchQuery,
+                        state.updateSearchQuery,
+                        placeholder = stringResource(R.string.learnMyContentSearchLabel),
+                        modifier = Modifier.weight(1f),
+                    )
+                    val filterScreenType = when (state.selectedTab) {
+                        LearnMyContentTab.Saved -> LearnLearningLibraryFilterScreenType.MyContentSaved
+                        else -> LearnLearningLibraryFilterScreenType.MyContent
+                    }
+                    IconButton(
+                        iconRes = R.drawable.tune,
+                        size = IconButtonSize.NORMAL,
+                        color = IconButtonColor.White,
+                        elevation = HorizonElevation.level4,
+                        contentDescription = stringResource(R.string.a11y_learnLearningLibraryFilterContentDescription),
+                        onClick = {
+                            navController.navigate(
+                                LearnRoute.LearnLearningLibraryFilterScreen.route(
+                                    screenType = filterScreenType,
+                                    typeFilter = state.typeFilter,
+                                    sortOption = state.sortByOption,
+                                )
+                            )
+                        },
+                        badge = if (state.activeFilterCount > 0) {
+                            {
+                                Badge(
+                                    content = BadgeContent.Text(state.activeFilterCount.toString()),
+                                    type = BadgeType.Primary
+                                )
+                            }
+                        } else null
+                    )
+                }
+            }
+        },
+        bodyContent = { paddingValues ->
+            when (state.selectedTab) {
+                LearnMyContentTab.InProgress -> LearnMyContentInProgressScreen(
+                    searchQuery = state.searchQuery.text,
+                    sortByOption = state.sortByOption,
+                    typeFilter = state.typeFilter,
+                    navController = navController,
+                    contentPadding = paddingValues,
+                )
+                LearnMyContentTab.Completed -> LearnMyContentCompletedScreen(
+                    searchQuery = state.searchQuery.text,
+                    sortByOption = state.sortByOption,
+                    typeFilter = state.typeFilter,
+                    navController = navController,
+                    contentPadding = paddingValues,
+                )
+                LearnMyContentTab.Saved -> LearnMyContentSavedScreen(
+                    searchQuery = state.searchQuery.text,
+                    sortByOption = state.sortByOption,
+                    typeFilter = state.typeFilter,
+                    navController = navController,
+                    contentPadding = paddingValues,
+                )
+            }
+        }
+    )
+}
+
+@Composable
+private fun LearnMyContentTabSelector(
+    selectedTab: LearnMyContentTab,
+    onTabSelected: (LearnMyContentTab) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier,
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+    ) {
+        LearnMyContentTab.entries.forEach { tab ->
+            val tabLabel = when (tab) {
+                LearnMyContentTab.InProgress -> stringResource(R.string.LearnMyContentInProgressLabel)
+                LearnMyContentTab.Completed -> stringResource(R.string.LearnMyContentCompletedLabel)
+                LearnMyContentTab.Saved -> stringResource(R.string.LearnMyContentSavedLabel)
+            }
+            FilterChip(
+                label = tabLabel,
+                selected = selectedTab == tab,
+                onClick = { onTabSelected(tab) },
+                size = FilterChipSize.LARGE
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun LearnMyContentScreenPreview() {
+    LearnMyContentScreen(
+        state = LearnMyContentUiState(),
+        navController = rememberNavController(),
+    )
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentUiState.kt
new file mode 100644
index 0000000000..d5b3ad7d41
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentUiState.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent
+
+import androidx.compose.ui.text.input.TextFieldValue
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+
+data class LearnMyContentUiState(
+    val searchQuery: TextFieldValue = TextFieldValue(),
+    val updateSearchQuery: (TextFieldValue) -> Unit = {},
+    val selectedTab: LearnMyContentTab = LearnMyContentTab.InProgress,
+    val onTabSelected: (LearnMyContentTab) -> Unit = {},
+    val sortByOption: LearnLearningLibrarySortOption = LearnLearningLibrarySortOption.MostRecent,
+    val typeFilter: LearnLearningLibraryTypeFilter = LearnLearningLibraryTypeFilter.All,
+    val activeFilterCount: Int = 0,
+)
+
+enum class LearnMyContentTab {
+    InProgress,
+    Completed,
+    Saved,
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentViewModel.kt
new file mode 100644
index 0000000000..e4dce5953d
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentViewModel.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent
+
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class LearnMyContentViewModel @Inject constructor(
+    private val eventHandler: LearnEventHandler,
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(
+        LearnMyContentUiState(
+            updateSearchQuery = ::updateSearchQuery,
+            onTabSelected = ::onTabSelected,
+        )
+    )
+    val uiState = _uiState.asStateFlow()
+
+    init {
+        viewModelScope.launch {
+            eventHandler.events.collectLatest { event ->
+                when (event) {
+                    is LearnEvent.UpdateLearningLibraryFilter -> {
+                        if (event.screenType == LearnLearningLibraryFilterScreenType.MyContent ||
+                            event.screenType == LearnLearningLibraryFilterScreenType.MyContentSaved
+                        ) {
+                            _uiState.update {
+                                it.copy(
+                                    sortByOption = event.sortOption,
+                                    typeFilter = event.typeFilter,
+                                    activeFilterCount = computeActiveFilterCount(event.typeFilter),
+                                )
+                            }
+                        }
+                    }
+                    else -> {}
+                }
+            }
+        }
+    }
+
+    private fun computeActiveFilterCount(typeFilter: LearnLearningLibraryTypeFilter): Int {
+        return if (typeFilter != LearnLearningLibraryTypeFilter.All) 1 else 0
+    }
+
+    private fun onTabSelected(tab: LearnMyContentTab) {
+        _uiState.update {
+            it.copy(
+                selectedTab = tab,
+                sortByOption = LearnLearningLibrarySortOption.MostRecent,
+                typeFilter = LearnLearningLibraryTypeFilter.All,
+                activeFilterCount = 0,
+            )
+        }
+    }
+
+    private fun updateSearchQuery(value: TextFieldValue) {
+        _uiState.update { it.copy(searchQuery = value) }
+    }
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnContentCardState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnContentCardState.kt
new file mode 100644
index 0000000000..bb8682fdc2
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnContentCardState.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import androidx.annotation.DrawableRes
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+
+data class LearnContentCardState(
+    val imageUrl: String? = null,
+    val name: String = "",
+    val progress: Double? = null,
+    val route: String = "",
+    val buttonState: LearnContentCardButtonState? = null,
+    val cardChips: List<LearnContentCardChipState> = emptyList(),
+    val courseNames: List<String> = emptyList(),
+)
+
+data class LearnContentCardButtonState(
+    val label: String = "",
+    val route: Any = "",
+)
+
+data class LearnContentCardChipState(
+    val label: String = "",
+    @DrawableRes val iconRes: Int? = null,
+    val color: StatusChipColor = StatusChipColor.Grey,
+)
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentCard.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentCard.kt
new file mode 100644
index 0000000000..d1828c79b7
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentCard.kt
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.instructure.horizon.R
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius
+import com.instructure.horizon.horizonui.foundation.HorizonElevation
+import com.instructure.horizon.horizonui.foundation.HorizonSpace
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.foundation.SpaceSize
+import com.instructure.horizon.horizonui.foundation.horizonShadow
+import com.instructure.horizon.horizonui.molecules.Button
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.LoadingImage
+import com.instructure.horizon.horizonui.molecules.ProgressBarSmallInline
+import com.instructure.horizon.horizonui.molecules.StatusChip
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.horizon.horizonui.molecules.StatusChipState
+
+@Composable
+fun LearnMyContentCard(
+    cardState: LearnContentCardState,
+    navController: NavHostController,
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .horizonShadow(HorizonElevation.level4, shape = HorizonCornerRadius.level4)
+            .background(color = HorizonColors.Surface.cardPrimary(), shape = HorizonCornerRadius.level4)
+            .clickable { navController.navigate(cardState.route) }
+    ) {
+        Column(Modifier.fillMaxWidth()) {
+            if (cardState.imageUrl != null) {
+                LoadingImage(
+                    cardState.imageUrl,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clip(HorizonCornerRadius.level4Top),
+                )
+            }
+
+            HorizonSpace(SpaceSize.SPACE_16)
+
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 24.dp),
+            ) {
+                Text(
+                    text = cardState.name,
+                    style = HorizonTypography.labelLargeBold,
+                    color = HorizonColors.Text.title(),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+
+                if (cardState.progress != null) {
+                    HorizonSpace(SpaceSize.SPACE_12)
+                    ProgressBarSmallInline(cardState.progress)
+                }
+
+                HorizonSpace(SpaceSize.SPACE_16)
+
+                FlowRow(
+                    verticalArrangement = Arrangement.Center,
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    cardState.cardChips.forEach { chip ->
+                        StatusChip(
+                            StatusChipState(
+                                label = chip.label,
+                                color = chip.color,
+                                iconRes = chip.iconRes,
+                                fill = true,
+                            )
+                        )
+                    }
+                }
+
+                if (cardState.buttonState != null) {
+                    HorizonSpace(SpaceSize.SPACE_16)
+                    Button(
+                        label = cardState.buttonState.label,
+                        height = ButtonHeight.NORMAL,
+                        width = ButtonWidth.FILL,
+                        color = ButtonColor.WhiteWithOutline,
+                        onClick = { navController.navigate(cardState.buttonState.route) },
+                    )
+                }
+
+                HorizonSpace(SpaceSize.SPACE_24)
+            }
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun LearnMyContentProgramCardPreview() {
+    LearnMyContentCard(
+        cardState = LearnContentCardState(
+            name = "Introduction to Programming",
+            progress = 45.0,
+            route = "",
+            cardChips = listOf(
+                LearnContentCardChipState(label = "Program", color = StatusChipColor.Violet, iconRes = R.drawable.book_5),
+                LearnContentCardChipState(label = "3 courses"),
+                LearnContentCardChipState(label = "2 hrs 30 mins"),
+                LearnContentCardChipState(label = "01/01/25 – 06/30/25", iconRes = R.drawable.calendar_today),
+            ),
+            courseNames = listOf("Course A", "Course B", "Course C"),
+        ),
+        navController = rememberNavController(),
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun LearnMyContentCourseCardPreview() {
+    LearnMyContentCard(
+        cardState = LearnContentCardState(
+            name = "Lorem Ipsum Course Name Here",
+            progress = 65.0,
+            route = "",
+            buttonState = LearnContentCardButtonState("Resume learning"),
+            cardChips = listOf(
+                LearnContentCardChipState(label = "Course", color = StatusChipColor.Institution, iconRes = R.drawable.book_2),
+                LearnContentCardChipState(label = "01/01/25 – 06/30/25", iconRes = R.drawable.calendar_today),
+            ),
+        ),
+        navController = rememberNavController(),
+    )
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentEmptyMessage.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentEmptyMessage.kt
new file mode 100644
index 0000000000..f97b55dbbb
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentEmptyMessage.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.instructure.horizon.R
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+
+@Composable
+fun LearnMyContentEmptyMessage(modifier: Modifier = Modifier) {
+    Text(
+        text = stringResource(R.string.learnMyContentEmptyMessage),
+        style = HorizonTypography.p1,
+        color = HorizonColors.Text.body(),
+        modifier = modifier.padding(horizontal = 24.dp)
+    )
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentExtensions.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentExtensions.kt
new file mode 100644
index 0000000000..c8ce5bfa4f
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentExtensions.kt
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.journey.mycontent.CourseEnrollmentItem
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItem
+import com.instructure.canvasapi2.models.journey.mycontent.ProgramEnrollmentItem
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.pandautils.utils.formatMonthDayYear
+import com.instructure.pandautils.utils.orDefault
+
+suspend fun LearnItem.toCardState(
+    resources: Resources,
+    fetchNextModuleItemRoute: suspend (courseId: Long?) -> Any?
+): LearnContentCardState {
+    return when (this) {
+        is ProgramEnrollmentItem -> toCardState(resources)
+        is CourseEnrollmentItem -> toCardState(resources, fetchNextModuleItemRoute)
+    }
+}
+
+private fun ProgramEnrollmentItem.toCardState(resources: Resources): LearnContentCardState {
+    return LearnContentCardState(
+        imageUrl = null,
+        name = name,
+        progress = completionPercentage,
+        route = LearnRoute.LearnProgramDetailsScreen.route(id),
+        buttonState = null,
+        cardChips = buildList {
+            add(
+                LearnContentCardChipState(
+                    label = resources.getString(R.string.learnMyContentProgramLabel),
+                    color = StatusChipColor.Violet,
+                    iconRes = R.drawable.book_5,
+                )
+            )
+            add(
+                LearnContentCardChipState(
+                    label = resources.getQuantityString(
+                        R.plurals.learnMyContentProgramCourseCount,
+                        courseCount,
+                        courseCount,
+                    ),
+                )
+            )
+            val estimatedDurationMinutes = estimatedDurationMinutes
+            if (estimatedDurationMinutes != null && estimatedDurationMinutes > 0) {
+                val hours = estimatedDurationMinutes / 60
+                val mins = estimatedDurationMinutes % 60
+                val label = when {
+                    hours > 0 && mins > 0 -> resources.getString(R.string.learnMyContentDurationHrsMin, hours, mins)
+                    hours > 0 -> resources.getString(R.string.learnMyContentDurationHrs, hours)
+                    else -> resources.getString(R.string.learnMyContentDurationMin, mins)
+                }
+                add(LearnContentCardChipState(label = label))
+            }
+            if (startDate != null && endDate != null) {
+                add(
+                    LearnContentCardChipState(
+                        label = resources.getString(
+                            R.string.programTag_DateRange,
+                            startDate?.formatMonthDayYear(),
+                            endDate?.formatMonthDayYear(),
+                        ),
+                        iconRes = R.drawable.calendar_today,
+                    )
+                )
+            }
+        },
+    )
+}
+
+private suspend fun CourseEnrollmentItem.toCardState(
+    resources: Resources,
+    fetchNextModuleItemRoute: suspend (courseId: Long?) -> Any?
+): LearnContentCardState {
+    val buttonLabel = when {
+        completionPercentage == null || completionPercentage == 0.0 -> resources.getString(R.string.learnMyContentStartLearning)
+        completionPercentage.orDefault() < 100.0 -> resources.getString(R.string.learnMyContentResumeLearning)
+        else -> null
+    }
+    val buttonRoute = fetchNextModuleItemRoute(this.id.toLongOrNull())
+    val buttonState = if (buttonLabel != null && buttonRoute != null) {
+        LearnContentCardButtonState(buttonLabel, buttonRoute)
+    } else { null }
+
+    return LearnContentCardState(
+        imageUrl = imageUrl,
+        name = name,
+        progress = completionPercentage,
+        route = LearnRoute.LearnCourseDetailsScreen.route(id.toLongOrNull() ?: -1L),
+        buttonState = buttonState,
+        cardChips = buildList {
+            add(
+                LearnContentCardChipState(
+                    label = resources.getString(R.string.learnMyContentCourseLabel),
+                    color = StatusChipColor.Institution,
+                    iconRes = R.drawable.book_2,
+                )
+            )
+            if (startAt != null && endAt != null) {
+                add(
+                    LearnContentCardChipState(
+                        label = resources.getString(
+                            R.string.programTag_DateRange,
+                            startAt?.formatMonthDayYear(),
+                            endAt?.formatMonthDayYear(),
+                        ),
+                        iconRes = R.drawable.calendar_today,
+                    )
+                )
+            }
+        },
+    )
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentRepository.kt
new file mode 100644
index 0000000000..fee8a47dd6
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentRepository.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import com.instructure.canvasapi2.apis.ModuleAPI
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.MyContentManager
+import com.instructure.canvasapi2.models.CanvasContext
+import com.instructure.canvasapi2.models.ModuleObject
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItemsResponse
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemStatus
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemType
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemsResponse
+import javax.inject.Inject
+
+class LearnMyContentRepository @Inject constructor(
+    private val myContentManager: MyContentManager,
+    private val getLearningLibraryManager: GetLearningLibraryManager,
+    private val moduleApi: ModuleAPI.ModuleInterface,
+) {
+    suspend fun getLearnItems(
+        cursor: String? = null,
+        searchQuery: String? = null,
+        sortBy: CollectionItemSortOption? = null,
+        status: List<LearnItemStatus>? = null,
+        itemTypes: List<LearnItemType>? = null,
+        forceNetwork: Boolean = false,
+    ): LearnItemsResponse {
+        return myContentManager.getLearnItems(
+            cursor = cursor,
+            searchTerm = searchQuery,
+            sortBy = sortBy,
+            status = status,
+            itemTypes = itemTypes,
+            forceNetwork = forceNetwork,
+        )
+    }
+
+    suspend fun getBookmarkedLearningLibraryItems(
+        afterCursor: String? = null,
+        limit: Int? = 10,
+        searchQuery: String? = null,
+        sortBy: CollectionItemSortOption? = null,
+        types: List<CollectionItemType>? = null,
+        forceNetwork: Boolean = false,
+    ): LearningLibraryCollectionItemsResponse {
+        return getLearningLibraryManager.getLearningLibraryCollectionItems(
+            cursor = afterCursor,
+            limit = limit,
+            bookmarkedOnly = true,
+            completedOnly = false,
+            searchTerm = searchQuery,
+            types = types,
+            sortBy = sortBy,
+            forceNetwork = forceNetwork,
+        )
+    }
+
+    suspend fun getFirstPageModulesWithItems(courseId: Long, forceNetwork: Boolean): List<ModuleObject> {
+        val params = RestParams(isForceReadFromNetwork = forceNetwork)
+        return moduleApi.getFirstPageModulesWithItems(
+            CanvasContext.Type.COURSE.apiString,
+            courseId,
+            params,
+            includes = listOf("estimated_durations")
+        ).dataOrThrow
+    }
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentUiState.kt
new file mode 100644
index 0000000000..4404215deb
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentUiState.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import com.instructure.horizon.horizonui.platform.LoadingState
+
+data class LearnMyContentUiState<T>(
+    val loadingState: LoadingState = LoadingState(),
+    val contentCards: List<T> = emptyList(),
+    val totalItemCount: Int = 0,
+    val showMoreButton: Boolean = false,
+    val isMoreLoading: Boolean = false,
+    val increaseTotalItemCount: () -> Unit = {},
+)
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentViewModel.kt
new file mode 100644
index 0000000000..93bfd7a188
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentViewModel.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.horizonui.platform.LoadingState
+import com.instructure.horizon.navigation.MainNavigationRoute
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+abstract class LearnMyContentViewModel<T>(
+    protected val repository: LearnMyContentRepository,
+) : ViewModel() {
+
+    private data class Filters(
+        val searchQuery: String = "",
+        val sortBy: LearnLearningLibrarySortOption = LearnLearningLibrarySortOption.MostRecent,
+        val typeFilter: LearnLearningLibraryTypeFilter = LearnLearningLibraryTypeFilter.All,
+    )
+
+    private var nextCursor: String? = null
+    private var currentFilters = Filters()
+    private val filtersFlow = MutableSharedFlow<Filters>(extraBufferCapacity = 1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+
+    protected val _uiState = MutableStateFlow(
+        LearnMyContentUiState<T>(
+            loadingState = LoadingState(
+                onRefresh = ::refresh,
+                onSnackbarDismiss = ::onSnackbarDismiss,
+            ),
+            increaseTotalItemCount = ::loadMore,
+        )
+    )
+    val uiState = _uiState.asStateFlow()
+
+    protected abstract val errorMessage: String
+
+    init {
+        viewModelScope.launch {
+            filtersFlow.collectLatest { filters ->
+                val isSearchChange = currentFilters.searchQuery != filters.searchQuery
+                currentFilters = filters
+                if (isSearchChange) delay(300)
+                load()
+            }
+        }
+    }
+
+    fun onFiltersChanged(searchQuery: String, sortBy: LearnLearningLibrarySortOption, typeFilter: LearnLearningLibraryTypeFilter) {
+        filtersFlow.tryEmit(Filters(searchQuery, sortBy, typeFilter))
+    }
+
+    private fun load() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = true)) }
+            nextCursor = null
+            fetchAndUpdate(cursor = null)
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = false, isError = false)) }
+        } catch {
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = false, isError = true)) }
+        }
+    }
+
+    private fun refresh() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = true)) }
+            nextCursor = null
+            fetchAndUpdate(cursor = null, forceNetwork = true)
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = false, isError = false)) }
+        } catch {
+            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = false, snackbarMessage = errorMessage)) }
+        }
+    }
+
+    private fun loadMore() {
+        viewModelScope.tryLaunch {
+            _uiState.update { it.copy(isMoreLoading = true) }
+            fetchAndUpdate(cursor = nextCursor, append = true)
+            _uiState.update { it.copy(isMoreLoading = false) }
+        } catch {
+            _uiState.update { it.copy(isMoreLoading = false, loadingState = it.loadingState.copy(snackbarMessage = errorMessage)) }
+        }
+    }
+
+    private suspend fun fetchAndUpdate(cursor: String?, forceNetwork: Boolean = false, append: Boolean = false) {
+        val (items, pageInfo) = fetchPage(
+            cursor = cursor,
+            searchQuery = currentFilters.searchQuery,
+            sortBy = currentFilters.sortBy.toCollectionItemSortOption(),
+            typeFilter = currentFilters.typeFilter,
+            forceNetwork = forceNetwork,
+        )
+        nextCursor = if (pageInfo.hasNextPage) pageInfo.nextCursor else null
+        _uiState.update { state ->
+            state.copy(
+                contentCards = if (append) state.contentCards + items else items,
+                totalItemCount = pageInfo.totalCount ?: 0,
+                showMoreButton = nextCursor != null,
+            )
+        }
+    }
+
+    protected abstract suspend fun fetchPage(
+        cursor: String?,
+        searchQuery: String,
+        sortBy: CollectionItemSortOption,
+        typeFilter: LearnLearningLibraryTypeFilter,
+        forceNetwork: Boolean,
+    ): Pair<List<T>, LearningLibraryPageInfo>
+
+    protected suspend fun fetchNextModuleItemRoute(courseId: Long?, forceNetwork: Boolean): Any? {
+        if (courseId == null) return null
+        val modules = repository.getFirstPageModulesWithItems(courseId, forceNetwork = forceNetwork)
+        val nextModuleItem = modules.flatMap { module -> module.items }.firstOrNull()
+        if (nextModuleItem == null) {
+            return null
+        }
+
+        return MainNavigationRoute.ModuleItemSequence(
+            courseId,
+            nextModuleItem.id
+        )
+    }
+
+    private fun onSnackbarDismiss() {
+        _uiState.update { it.copy(loadingState = it.loadingState.copy(snackbarMessage = null)) }
+    }
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedScreen.kt
new file mode 100644
index 0000000000..4858b38b83
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedScreen.kt
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.completed
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardChipState
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentCard
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentEmptyMessage
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentUiState
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.LoadingButton
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LearnMyContentCompletedScreen(
+    searchQuery: String,
+    sortByOption: LearnLearningLibrarySortOption,
+    typeFilter: LearnLearningLibraryTypeFilter,
+    navController: NavHostController,
+    contentPadding: PaddingValues = PaddingValues(),
+    viewModel: LearnMyContentCompletedViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsState()
+    LaunchedEffect(searchQuery, sortByOption, typeFilter) {
+        viewModel.onFiltersChanged(searchQuery, sortByOption, typeFilter)
+    }
+    LearnMyContentCompletedContent(uiState, navController, contentPadding)
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun LearnMyContentCompletedContent(
+    uiState: LearnMyContentUiState<LearnContentCardState>,
+    navController: NavHostController,
+    contentPadding: PaddingValues = PaddingValues(),
+) {
+    LoadingStateWrapper(uiState.loadingState) {
+        LazyColumn(contentPadding = contentPadding) {
+            stickyHeader {
+                Text(
+                    text = pluralStringResource(R.plurals.learnMyContentItemsCount, uiState.totalItemCount, uiState.totalItemCount),
+                    style = HorizonTypography.p2,
+                    color = HorizonColors.Text.dataPoint(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(HorizonColors.Surface.pagePrimary())
+                        .padding(horizontal = 24.dp)
+                        .padding(bottom = 16.dp)
+                        .wrapContentWidth(Alignment.End),
+                )
+            }
+            if (uiState.contentCards.isEmpty()) {
+                item { LearnMyContentEmptyMessage() }
+            }
+            items(uiState.contentCards) { card ->
+                LearnMyContentCard(
+                    cardState = card,
+                    navController = navController,
+                    modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+                )
+            }
+            if (uiState.showMoreButton) {
+                item {
+                    LoadingButton(
+                        label = stringResource(R.string.learnMyContentShowMoreLabel),
+                        loading = uiState.isMoreLoading,
+                        height = ButtonHeight.SMALL,
+                        width = ButtonWidth.FILL,
+                        color = ButtonColor.BlackOutline,
+                        onClick = uiState.increaseTotalItemCount,
+                        contentAlignment = Alignment.Center,
+                        fixedLoadingSize = true,
+                        modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun LearnMyContentCompletedScreenPreview() {
+    LearnMyContentCompletedContent(
+        uiState = LearnMyContentUiState(
+            totalItemCount = 3,
+            contentCards = listOf(
+                LearnContentCardState(
+                    name = "Introduction to Programming",
+                    progress = 100.0,
+                    route = "",
+                    cardChips = listOf(
+                        LearnContentCardChipState(label = "Course", color = StatusChipColor.Institution, iconRes = R.drawable.book_2),
+                    ),
+                ),
+                LearnContentCardState(
+                    name = "Machine Learning Fundamentals",
+                    progress = 100.0,
+                    route = "",
+                    cardChips = listOf(
+                        LearnContentCardChipState(label = "Program", color = StatusChipColor.Violet, iconRes = R.drawable.book_5),
+                        LearnContentCardChipState(label = "3 courses"),
+                    ),
+                ),
+            )
+        ),
+        navController = rememberNavController(),
+    )
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedUiState.kt
new file mode 100644
index 0000000000..bde94122fe
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedUiState.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.completed
+
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentUiState
+
+typealias LearnMyContentCompletedUiState = LearnMyContentUiState<LearnContentCardState>
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedViewModel.kt
new file mode 100644
index 0000000000..0e34569c21
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedViewModel.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.completed
+
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemStatus
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemType
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentRepository
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentViewModel
+import com.instructure.horizon.features.learn.mycontent.common.toCardState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class LearnMyContentCompletedViewModel @Inject constructor(
+    private val resources: Resources,
+    repository: LearnMyContentRepository,
+) : LearnMyContentViewModel<LearnContentCardState>(repository) {
+
+    override val errorMessage: String
+        get() = resources.getString(R.string.learnMyContentProgramErrorMessage)
+
+    override suspend fun fetchPage(
+        cursor: String?,
+        searchQuery: String,
+        sortBy: CollectionItemSortOption,
+        typeFilter: LearnLearningLibraryTypeFilter,
+        forceNetwork: Boolean,
+    ): Pair<List<LearnContentCardState>, LearningLibraryPageInfo> {
+        val response = repository.getLearnItems(
+            cursor = cursor,
+            searchQuery = searchQuery.ifEmpty { null },
+            sortBy = sortBy,
+            status = listOf(LearnItemStatus.COMPLETED),
+            itemTypes = typeFilter.toLearnItemType()?.let { listOf(it) },
+            forceNetwork = forceNetwork,
+        )
+        return response.items.map {
+            it.toCardState(
+                resources,
+                { fetchNextModuleItemRoute(it, forceNetwork) }
+            )
+        } to response.pageInfo
+    }
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressScreen.kt
new file mode 100644
index 0000000000..31d76ab8d2
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressScreen.kt
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.inprogress
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardButtonState
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardChipState
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentCard
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentEmptyMessage
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentUiState
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.LoadingButton
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LearnMyContentInProgressScreen(
+    searchQuery: String,
+    sortByOption: LearnLearningLibrarySortOption,
+    typeFilter: LearnLearningLibraryTypeFilter,
+    navController: NavHostController,
+    contentPadding: PaddingValues = PaddingValues(),
+    viewModel: LearnMyContentInProgressViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsState()
+    LaunchedEffect(searchQuery, sortByOption, typeFilter) {
+        viewModel.onFiltersChanged(searchQuery, sortByOption, typeFilter)
+    }
+    LearnMyContentInProgressContent(uiState, navController, contentPadding)
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun LearnMyContentInProgressContent(
+    uiState: LearnMyContentUiState<LearnContentCardState>,
+    navController: NavHostController,
+    contentPadding: PaddingValues = PaddingValues(),
+) {
+    LoadingStateWrapper(uiState.loadingState) {
+        LazyColumn(contentPadding = contentPadding) {
+            stickyHeader {
+                Text(
+                    text = pluralStringResource(R.plurals.learnMyContentItemsCount, uiState.totalItemCount, uiState.totalItemCount),
+                    style = HorizonTypography.p2,
+                    color = HorizonColors.Text.dataPoint(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(HorizonColors.Surface.pagePrimary())
+                        .padding(horizontal = 24.dp)
+                        .padding(bottom = 16.dp)
+                        .wrapContentWidth(Alignment.End),
+                )
+            }
+            if (uiState.contentCards.isEmpty()) {
+                item { LearnMyContentEmptyMessage() }
+            }
+            items(uiState.contentCards) { card ->
+                LearnMyContentCard(
+                    cardState = card,
+                    navController = navController,
+                    modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+                )
+            }
+            if (uiState.showMoreButton) {
+                item {
+                    LoadingButton(
+                        label = stringResource(R.string.learnMyContentShowMoreLabel),
+                        loading = uiState.isMoreLoading,
+                        height = ButtonHeight.SMALL,
+                        width = ButtonWidth.FILL,
+                        color = ButtonColor.BlackOutline,
+                        onClick = uiState.increaseTotalItemCount,
+                        contentAlignment = Alignment.Center,
+                        fixedLoadingSize = true,
+                        modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun LearnMyContentInProgressScreenPreview() {
+    LearnMyContentInProgressContent(
+        uiState = LearnMyContentUiState(
+            totalItemCount = 4,
+            contentCards = listOf(
+                LearnContentCardState(
+                    name = "Introduction to Programming",
+                    progress = 45.0,
+                    route = "",
+                    buttonState = null,
+                    cardChips = listOf(
+                        LearnContentCardChipState(label = "Program", color = StatusChipColor.Violet, iconRes = R.drawable.book_5),
+                        LearnContentCardChipState(label = "3 courses"),
+                    ),
+                ),
+                LearnContentCardState(
+                    name = "Advanced Data Structures",
+                    progress = 10.0,
+                    route = "",
+                    buttonState = LearnContentCardButtonState("Start learning"),
+                    cardChips = listOf(
+                        LearnContentCardChipState(label = "Course", color = StatusChipColor.Institution, iconRes = R.drawable.book_2),
+                    ),
+                ),
+            )
+        ),
+        navController = rememberNavController(),
+    )
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressUiState.kt
new file mode 100644
index 0000000000..6721a0a571
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressUiState.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.inprogress
+
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentUiState
+
+typealias LearnMyContentInProgressUiState = LearnMyContentUiState<LearnContentCardState>
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressViewModel.kt
new file mode 100644
index 0000000000..23e2842d7b
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressViewModel.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.inprogress
+
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemStatus
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.mycontent.common.LearnContentCardState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentRepository
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentViewModel
+import com.instructure.horizon.features.learn.mycontent.common.toCardState
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class LearnMyContentInProgressViewModel @Inject constructor(
+    private val resources: Resources,
+    repository: LearnMyContentRepository,
+) : LearnMyContentViewModel<LearnContentCardState>(repository) {
+
+    override val errorMessage: String
+        get() = resources.getString(R.string.learnMyContentProgramErrorMessage)
+
+    override suspend fun fetchPage(
+        cursor: String?,
+        searchQuery: String,
+        sortBy: CollectionItemSortOption,
+        typeFilter: LearnLearningLibraryTypeFilter,
+        forceNetwork: Boolean,
+    ): Pair<List<LearnContentCardState>, LearningLibraryPageInfo> {
+        val response = repository.getLearnItems(
+            cursor = cursor,
+            searchQuery = searchQuery.ifEmpty { null },
+            sortBy = sortBy,
+            status = listOf(LearnItemStatus.IN_PROGRESS, LearnItemStatus.NOT_STARTED),
+            itemTypes = typeFilter.toLearnItemType()?.let { listOf(it) },
+            forceNetwork = forceNetwork,
+        )
+        return response.items.map {
+            it.toCardState(
+                resources,
+                { fetchNextModuleItemRoute(it, forceNetwork) }
+            )
+        } to response.pageInfo
+    }
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedRepository.kt
new file mode 100644
index 0000000000..47b3a9ece1
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedRepository.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.saved
+
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryRecommendation
+import javax.inject.Inject
+
+class LearnMyContentSavedRepository @Inject constructor(
+    private val getLearningLibraryManager: GetLearningLibraryManager
+) {
+    suspend fun toggleLearningLibraryItemIsBookmarked(itemId: String): Boolean {
+        return getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked(itemId)
+    }
+
+    suspend fun getLearningLibraryRecommendedItems(forceNetwork: Boolean): List<LearningLibraryRecommendation> {
+        return getLearningLibraryManager.getLearningLibraryRecommendations(forceNetwork)
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedScreen.kt
new file mode 100644
index 0000000000..d7813f5a94
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedScreen.kt
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.saved
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemChipState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryItem
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.LearningLibraryRoute
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentEmptyMessage
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentUiState
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+import com.instructure.horizon.horizonui.molecules.ButtonColor
+import com.instructure.horizon.horizonui.molecules.ButtonHeight
+import com.instructure.horizon.horizonui.molecules.ButtonWidth
+import com.instructure.horizon.horizonui.molecules.LoadingButton
+import com.instructure.horizon.horizonui.molecules.StatusChipColor
+import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LearnMyContentSavedScreen(
+    searchQuery: String,
+    sortByOption: LearnLearningLibrarySortOption,
+    typeFilter: LearnLearningLibraryTypeFilter,
+    navController: NavHostController,
+    contentPadding: PaddingValues = PaddingValues(),
+    viewModel: LearnMyContentSavedViewModel = hiltViewModel(),
+) {
+    val uiState by viewModel.uiState.collectAsState()
+    LaunchedEffect(searchQuery, sortByOption, typeFilter) {
+        viewModel.onFiltersChanged(searchQuery, sortByOption, typeFilter)
+    }
+    LearnMyContentSavedContent(uiState, navController, contentPadding, viewModel::onBookmarkItem)
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+internal fun LearnMyContentSavedContent(
+    uiState: LearnMyContentUiState<LearnLearningLibraryCollectionItemState>,
+    navController: NavHostController,
+    contentPadding: PaddingValues = PaddingValues(),
+    onBookmarkClick: (String) -> Unit = {},
+) {
+    LoadingStateWrapper(uiState.loadingState) {
+        LazyColumn(contentPadding = contentPadding) {
+            stickyHeader {
+                Text(
+                    text = pluralStringResource(R.plurals.learnMyContentItemsCount, uiState.totalItemCount, uiState.totalItemCount),
+                    style = HorizonTypography.p2,
+                    color = HorizonColors.Text.dataPoint(),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .background(HorizonColors.Surface.pagePrimary())
+                        .padding(horizontal = 24.dp)
+                        .padding(bottom = 16.dp)
+                        .wrapContentWidth(Alignment.End),
+                )
+            }
+            if (uiState.contentCards.isEmpty()) {
+                item { LearnMyContentEmptyMessage() }
+            }
+            items(uiState.contentCards, key = { it.id }) { card ->
+                LearnLearningLibraryItem(
+                    state = card,
+                    onClick = {
+                        when (val route = card.route) {
+                            is LearningLibraryRoute.ObjectRoute -> navController.navigate(route.route)
+                            is LearningLibraryRoute.StringRoute -> navController.navigate(route.route)
+                            null -> {}
+                        }
+                    },
+                    onBookmarkClick = { onBookmarkClick(card.id) },
+                    onEnrollClick = { navController.navigate(LearnRoute.LearnLearningLibraryEnrollScreen.route(card.id)) },
+                    modifier = Modifier
+                        .padding(horizontal = 24.dp, vertical = 8.dp)
+                        .animateItem(),
+                )
+            }
+            if (uiState.showMoreButton) {
+                item {
+                    LoadingButton(
+                        label = stringResource(R.string.learnMyContentShowMoreLabel),
+                        loading = uiState.isMoreLoading,
+                        height = ButtonHeight.SMALL,
+                        width = ButtonWidth.FILL,
+                        color = ButtonColor.BlackOutline,
+                        onClick = uiState.increaseTotalItemCount,
+                        contentAlignment = Alignment.Center,
+                        fixedLoadingSize = true,
+                        modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun LearnMyContentSavedScreenPreview() {
+    LearnMyContentSavedContent(
+        uiState = LearnMyContentUiState(
+            totalItemCount = 2,
+            contentCards = listOf(
+                LearnLearningLibraryCollectionItemState(
+                    id = "1",
+                    imageUrl = null,
+                    name = "Introduction to Data Science",
+                    description = "Learn the fundamentals of data science",
+                    isBookmarked = true,
+                    bookmarkLoading = false,
+                    canEnroll = false,
+                    type = CollectionItemType.COURSE,
+                    route = null,
+                    chips = listOf(LearnLearningLibraryCollectionItemChipState(label = "Course", color = StatusChipColor.Institution)),
+                ),
+                LearnLearningLibraryCollectionItemState(
+                    id = "2",
+                    imageUrl = null,
+                    name = "Full Stack Development Program",
+                    description = "Become a full stack developer",
+                    isBookmarked = true,
+                    bookmarkLoading = false,
+                    canEnroll = true,
+                    type = CollectionItemType.PROGRAM,
+                    route = null,
+                    chips = listOf(LearnLearningLibraryCollectionItemChipState(label = "Program", color = StatusChipColor.Violet)),
+                ),
+            )
+        ),
+        navController = rememberNavController(),
+    )
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedUiState.kt
new file mode 100644
index 0000000000..f99f980e18
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedUiState.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.saved
+
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentUiState
+
+typealias LearnMyContentSavedUiState = LearnMyContentUiState<LearnLearningLibraryCollectionItemState>
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedViewModel.kt
new file mode 100644
index 0000000000..18ae6c6188
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedViewModel.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.saved
+
+import android.content.res.Resources
+import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.utils.weave.catch
+import com.instructure.canvasapi2.utils.weave.tryLaunch
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryCollectionItemState
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.toUiState
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentRepository
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.update
+import javax.inject.Inject
+
+@HiltViewModel
+class LearnMyContentSavedViewModel @Inject constructor(
+    private val resources: Resources,
+    myContentRepository: LearnMyContentRepository,
+    private val savedContentRepository: LearnMyContentSavedRepository,
+) : LearnMyContentViewModel<LearnLearningLibraryCollectionItemState>(myContentRepository) {
+
+    override val errorMessage: String
+        get() = resources.getString(R.string.learnMyContentProgramErrorMessage)
+
+    override suspend fun fetchPage(
+        cursor: String?,
+        searchQuery: String,
+        sortBy: CollectionItemSortOption,
+        typeFilter: LearnLearningLibraryTypeFilter,
+        forceNetwork: Boolean,
+    ): Pair<List<LearnLearningLibraryCollectionItemState>, LearningLibraryPageInfo> {
+        val recommendations = savedContentRepository.getLearningLibraryRecommendedItems(forceNetwork)
+        val response = repository.getBookmarkedLearningLibraryItems(
+            afterCursor = cursor,
+            searchQuery = searchQuery.ifEmpty { null },
+            sortBy = sortBy,
+            types = typeFilter.toCollectionItemType()?.let { listOf(it) },
+            forceNetwork = forceNetwork,
+        )
+        return response.items.map { it.toUiState(resources, recommendations) } to response.pageInfo
+    }
+
+    fun onBookmarkItem(itemId: String) {
+        viewModelScope.tryLaunch {
+            _uiState.update { 
+                it.copy(
+                    contentCards = it.contentCards.map { itemState ->
+                        if (itemState.id == itemId) {
+                            itemState.copy(bookmarkLoading = true)
+                        } else {
+                            itemState
+                        }
+                    }
+                )
+            }
+
+            savedContentRepository.toggleLearningLibraryItemIsBookmarked(itemId)
+            _uiState.update {
+                it.copy(
+                    contentCards = it.contentCards.mapNotNull { itemState ->
+                        if (itemState.id == itemId) {
+                            null
+                        } else {
+                            itemState
+                        }
+                    }
+                )
+            }
+        } catch {
+            _uiState.update {
+                it.copy(
+                    contentCards = it.contentCards.map { itemState ->
+                        if (itemState.id == itemId) {
+                            itemState.copy(bookmarkLoading = false,)
+                        } else {
+                            itemState
+                        }
+                    },
+                    loadingState = it.loadingState.copy(snackbarMessage = resources.getString(R.string.learnMyContentSavedFailedToBookmarkErrorMessage))
+                )
+            }
+        }
+    }
+}
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnNavigation.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnNavigation.kt
index 95d7977d34..9f5127dbd6 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnNavigation.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnNavigation.kt
@@ -16,10 +16,8 @@
  */
 package com.instructure.horizon.features.learn.navigation
 
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -31,10 +29,15 @@ import androidx.navigation.navigation
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.horizon.features.home.HomeNavigationRoute
 import com.instructure.horizon.features.learn.LearnScreen
-import com.instructure.horizon.features.learn.LearnTab
 import com.instructure.horizon.features.learn.LearnViewModel
 import com.instructure.horizon.features.learn.course.details.CourseDetailsScreen
 import com.instructure.horizon.features.learn.course.details.CourseDetailsViewModel
+import com.instructure.horizon.features.learn.filter.LearnLearningLibraryFilterScreen
+import com.instructure.horizon.features.learn.filter.LearnLearningLibraryFilterViewModel
+import com.instructure.horizon.features.learn.learninglibrary.details.LearnLearningLibraryDetailsScreen
+import com.instructure.horizon.features.learn.learninglibrary.details.LearnLearningLibraryDetailsViewModel
+import com.instructure.horizon.features.learn.learninglibrary.enroll.LearnLearningLibraryEnrollScreen
+import com.instructure.horizon.features.learn.learninglibrary.enroll.LearnLearningLibraryEnrollViewModel
 import com.instructure.horizon.features.learn.program.details.ProgramDetailsScreen
 import com.instructure.horizon.features.learn.program.details.ProgramDetailsViewModel
 
@@ -47,42 +50,16 @@ fun NavGraphBuilder.learnNavigation(
     ){
         composable(
             LearnRoute.LearnScreen.route,
-            arguments = listOf(
-                navArgument(LearnRoute.LearnScreen.selectedTabAttr) {
-                    type = NavType.StringType
-                    nullable = true
-                }
-            ),
             deepLinks = listOf(
                 navDeepLink {
-                    uriPattern = "${ApiPrefs.fullDomain}/{${LearnRoute.LearnScreen.selectedTabAttr}}"
+                    uriPattern = "${ApiPrefs.fullDomain}/{${LearnRoute.LearnScreen.route}}"
                 }
             )
         ) {
             val viewModel = hiltViewModel<LearnViewModel>()
             val uiState by viewModel.state.collectAsState()
 
-            val selectedTabFromDetailsFlow = remember {
-                navController.currentBackStackEntry?.savedStateHandle?.getStateFlow<String?>(
-                    LearnRoute.LearnScreen.selectedTabFromDetailsKey,
-                    null
-                )
-            }
-            val selectedTabFromDetails = selectedTabFromDetailsFlow?.collectAsState()?.value
-
-            LaunchedEffect(selectedTabFromDetails) {
-                selectedTabFromDetails?.let { tabValue ->
-                    uiState.updateSelectedTab(tabValue)
-                    navController.currentBackStackEntry?.savedStateHandle?.remove<String>(
-                        LearnRoute.LearnScreen.selectedTabFromDetailsKey
-                    )
-                }
-            }
-
-            LearnScreen(
-                state = uiState,
-                navController = navController,
-            )
+            LearnScreen(uiState, navController)
         }
         composable(
             route = LearnRoute.LearnCourseDetailsScreen.route,
@@ -98,12 +75,6 @@ fun NavGraphBuilder.learnNavigation(
                 }
             )
         ) {
-            val previousBackStackEntry = navController.previousBackStackEntry
-            previousBackStackEntry?.savedStateHandle?.set(
-                LearnRoute.LearnScreen.selectedTabFromDetailsKey,
-                LearnTab.COURSES.stringValue
-            )
-
             val viewModel = hiltViewModel<CourseDetailsViewModel>()
             val state by viewModel.state.collectAsState()
             CourseDetailsScreen(state, navController)
@@ -122,15 +93,57 @@ fun NavGraphBuilder.learnNavigation(
                 }
             )
         ) {
-            val previousBackStackEntry = navController.previousBackStackEntry
-            previousBackStackEntry?.savedStateHandle?.set(
-                LearnRoute.LearnScreen.selectedTabFromDetailsKey,
-                LearnTab.PROGRAMS.stringValue
-            )
-
             val viewModel = hiltViewModel<ProgramDetailsViewModel>()
             val state by viewModel.state.collectAsState()
             ProgramDetailsScreen(state, navController)
         }
     }
+    composable(
+        route = LearnRoute.LearnLearningLibraryDetailsScreen.route,
+        arguments = listOf(
+            navArgument(LearnRoute.LearnLearningLibraryDetailsScreen.collectionIdAttr) {
+                type = NavType.StringType
+            }
+        ),
+        deepLinks = listOf(
+            navDeepLink {
+                uriPattern =
+                    "${ApiPrefs.fullDomain}/${LearnRoute.LearnLearningLibraryDetailsScreen.route}"
+            }
+        )
+    ) {
+        val viewModel = hiltViewModel<LearnLearningLibraryDetailsViewModel>()
+        val state by viewModel.uiState.collectAsState()
+        LearnLearningLibraryDetailsScreen(state, navController)
+    }
+    composable(
+        route = LearnRoute.LearnLearningLibraryEnrollScreen.route,
+        arguments = listOf(
+            navArgument(LearnRoute.LearnLearningLibraryEnrollScreen.learningLibraryIdAttr) {
+                type = NavType.StringType
+            }
+        ),
+    ) {
+        val viewModel = hiltViewModel<LearnLearningLibraryEnrollViewModel>()
+        val state by viewModel.state.collectAsState()
+        LearnLearningLibraryEnrollScreen(state, navController)
+    }
+    composable(
+        route = LearnRoute.LearnLearningLibraryFilterScreen.route,
+        arguments = listOf(
+            navArgument(LearnRoute.LearnLearningLibraryFilterScreen.screenTypeAttr) {
+                type = NavType.StringType
+            },
+            navArgument(LearnRoute.LearnLearningLibraryFilterScreen.typeFilterAttr) {
+                type = NavType.StringType
+            },
+            navArgument(LearnRoute.LearnLearningLibraryFilterScreen.sortOptionAttr) {
+                type = NavType.StringType
+            }
+        )
+    ) {
+        val viewModel = hiltViewModel<LearnLearningLibraryFilterViewModel>()
+        val state by viewModel.uiState.collectAsState()
+        LearnLearningLibraryFilterScreen(state, navController)
+    }
 }
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnRoute.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnRoute.kt
index ca8d0a815d..bb9f95c613 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnRoute.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/navigation/LearnRoute.kt
@@ -16,21 +16,15 @@
  */
 package com.instructure.horizon.features.learn.navigation
 
-import com.instructure.horizon.features.learn.LearnTab
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
 
 sealed class LearnRoute {
     data object LearnScreen: LearnRoute() {
-        const val selectedTabAttr = "selectedTab"
-        const val selectedTabFromDetailsKey = "selectedTabFromDetails"
-        private const val baseUrl = "learn_screen"
-        const val route = "$baseUrl/{$selectedTabAttr}"
-        fun route(selectedTab: LearnTab? = null): String {
-            return if (selectedTab == null)
-                "$baseUrl"
-            else
-                "$baseUrl/${selectedTab.stringValue}"
-        }
+        const val route = "learn_screen"
     }
+
     data class LearnCourseDetailsScreen(val courseId: Long): LearnRoute() {
         companion object {
             const val courseIdAttr = "courseId"
@@ -48,4 +42,31 @@ sealed class LearnRoute {
             fun route(programId: String) = "$baseUrl/$programId"
         }
     }
+
+    data object LearnLearningLibraryDetailsScreen: LearnRoute() {
+        const val collectionIdAttr = "collectionId"
+        const val baseUrl = "learning_library"
+        const val route = "${baseUrl}/{$collectionIdAttr}"
+        fun route(collectionId: String) = "${baseUrl}/$collectionId"
+    }
+
+    data object LearnLearningLibraryEnrollScreen: LearnRoute() {
+        const val learningLibraryIdAttr = "learningLibraryId"
+        const val baseUrl = "learning_library/enroll"
+        const val route = "$baseUrl/{$learningLibraryIdAttr}"
+        fun route(learningLibraryId: String) = "$baseUrl/$learningLibraryId"
+    }
+
+    data object LearnLearningLibraryFilterScreen: LearnRoute() {
+        const val screenTypeAttr = "screenType"
+        const val typeFilterAttr = "typeFilter"
+        const val sortOptionAttr = "sortOption"
+        const val baseUrl = "learning_library/filter"
+        const val route = "$baseUrl/{$screenTypeAttr}/{$typeFilterAttr}/{$sortOptionAttr}"
+        fun route(
+            screenType: LearnLearningLibraryFilterScreenType,
+            typeFilter: LearnLearningLibraryTypeFilter,
+            sortOption: LearnLearningLibrarySortOption,
+        ) = "$baseUrl/${screenType.name}/${typeFilter.name}/${sortOption.name}"
+    }
 }
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/details/ProgramDetailsScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/details/ProgramDetailsScreen.kt
index 8f7e38614f..bf3ceaa44c 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/details/ProgramDetailsScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/details/ProgramDetailsScreen.kt
@@ -56,28 +56,34 @@ import com.instructure.horizon.horizonui.molecules.ProgressBarSmallInline
 import com.instructure.horizon.horizonui.molecules.StatusChip
 import com.instructure.horizon.horizonui.molecules.StatusChipColor
 import com.instructure.horizon.horizonui.molecules.StatusChipState
-import com.instructure.horizon.horizonui.organisms.CollapsableHeaderScreen
+import com.instructure.horizon.horizonui.organisms.scaffolds.CollapsableHeaderScreen
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+import com.instructure.horizon.util.plus
 
 @OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun ProgramDetailsScreen(uiState: ProgramDetailsUiState, navController: NavHostController, modifier: Modifier = Modifier) {
     LoadingStateWrapper(loadingState = uiState.loadingState, modifier) {
         CollapsableHeaderScreen(
-            headerContent = {
-                ProgramDetailsHeader(uiState, navController)
+            statusBarColor = HorizonColors.Surface.pagePrimary(),
+            headerContent = { paddingValues ->
+                ProgramDetailsHeader(uiState, navController, Modifier.padding(paddingValues))
             },
-            bodyContent = {
-                ProgramDetailsContent(uiState, navController)
+            bodyContent = { paddingValues ->
+                ProgramDetailsContent(uiState, navController, paddingValues)
             }
         )
     }
 }
 
 @Composable
-private fun ProgramDetailsHeader(uiState: ProgramDetailsUiState, navController: NavHostController) {
+private fun ProgramDetailsHeader(
+    uiState: ProgramDetailsUiState,
+    navController: NavHostController,
+    modifier: Modifier = Modifier
+) {
     Column(
-        Modifier
+        modifier
             .fillMaxWidth()
             .padding(horizontal = 24.dp, vertical = 8.dp)
     ) {
@@ -106,9 +112,13 @@ private fun ProgramDetailsHeader(uiState: ProgramDetailsUiState, navController:
 }
 
 @Composable
-private fun ProgramDetailsContent(uiState: ProgramDetailsUiState, navController: NavHostController) {
+private fun ProgramDetailsContent(
+    uiState: ProgramDetailsUiState,
+    navController: NavHostController,
+    paddingValues: PaddingValues,
+) {
     LazyColumn(
-        contentPadding = PaddingValues(horizontal = 24.dp),
+        contentPadding = PaddingValues(horizontal = 24.dp) + paddingValues,
         verticalArrangement = Arrangement.spacedBy(16.dp),
     ) {
         if (uiState.description.isNotEmpty()) {
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListRepository.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListRepository.kt
deleted file mode 100644
index 8253eb3088..0000000000
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListRepository.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.program.list
-
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithModuleItemDurations
-import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.Program
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.coroutineScope
-import javax.inject.Inject
-
-class LearnProgramListRepository @Inject constructor(
-    private val getProgramsManager: GetProgramsManager,
-    private val getCoursesManager: HorizonGetCoursesManager
-) {
-    suspend fun getPrograms(forceRefresh: Boolean): List<Program> {
-        return getProgramsManager.getPrograms(forceRefresh)
-    }
-
-    suspend fun getCoursesById(courseIds: List<Long>, forceNetwork: Boolean = false): List<CourseWithModuleItemDurations> = coroutineScope {
-        courseIds.map { id ->
-            async { getCoursesManager.getProgramCourses(id, forceNetwork).dataOrThrow }
-        }.awaitAll()
-    }
-}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListScreen.kt
deleted file mode 100644
index af973e3d30..0000000000
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListScreen.kt
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.program.list
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavHostController
-import com.instructure.horizon.R
-import com.instructure.horizon.features.learn.common.LearnSearchBar
-import com.instructure.horizon.features.learn.navigation.LearnRoute
-import com.instructure.horizon.horizonui.foundation.HorizonColors
-import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius
-import com.instructure.horizon.horizonui.foundation.HorizonElevation
-import com.instructure.horizon.horizonui.foundation.HorizonSpace
-import com.instructure.horizon.horizonui.foundation.HorizonTypography
-import com.instructure.horizon.horizonui.foundation.SpaceSize
-import com.instructure.horizon.horizonui.foundation.horizonBorderShadow
-import com.instructure.horizon.horizonui.foundation.horizonShadow
-import com.instructure.horizon.horizonui.molecules.Button
-import com.instructure.horizon.horizonui.molecules.ButtonColor
-import com.instructure.horizon.horizonui.molecules.ButtonHeight
-import com.instructure.horizon.horizonui.molecules.ButtonWidth
-import com.instructure.horizon.horizonui.molecules.DropdownChip
-import com.instructure.horizon.horizonui.molecules.DropdownItem
-import com.instructure.horizon.horizonui.molecules.ProgressBarSmallInline
-import com.instructure.horizon.horizonui.molecules.StatusChip
-import com.instructure.horizon.horizonui.molecules.StatusChipColor
-import com.instructure.horizon.horizonui.molecules.StatusChipState
-import com.instructure.horizon.horizonui.organisms.CollapsableHeaderScreen
-import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
-import com.instructure.pandautils.compose.modifiers.conditional
-
-@Composable
-fun LearnProgramListScreen(
-    state: LearnProgramListUiState,
-    navController: NavHostController
-) {
-    CollapsableHeaderScreen(
-        headerContent = {
-            Searchbar(state)
-        },
-        bodyContent = {
-            LearnProgramListContent(state, navController)
-        }
-    )
-}
-
-@Composable
-private fun Searchbar(state: LearnProgramListUiState) {
-    LearnSearchBar(
-        value = state.searchQuery,
-        onValueChange = { state.updateSearchQuery(it) },
-        placeholder = stringResource(R.string.learnProgramListSearchBarPlaceholder),
-        modifier = Modifier.padding(24.dp)
-    )
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-private fun LearnProgramListContent(
-    state: LearnProgramListUiState,
-    navController: NavHostController
-) {
-    LoadingStateWrapper(state.loadingState) {
-        val scrollState = rememberLazyListState()
-        LazyColumn(
-            state = scrollState,
-            verticalArrangement = Arrangement.spacedBy(16.dp),
-            contentPadding = PaddingValues(bottom = 24.dp),
-            modifier = Modifier.testTag("CollapsableBody")
-        ) {
-            stickyHeader {
-                LearnProgramListFilter(state, scrollState)
-            }
-
-            if (state.filteredPrograms.isEmpty()) {
-                item {
-                    EmptyMessage()
-                }
-            }
-
-            items(state.filteredPrograms.take(state.visibleItemCount)) {
-                LearnProgramCard(it, Modifier.padding(horizontal = 24.dp)) {
-                    navController.navigate(LearnRoute.LearnProgramDetailsScreen.route(it.programId))
-                }
-            }
-
-            if (state.filteredPrograms.size > state.visibleItemCount) {
-                item {
-                    Button(
-                        label = stringResource(R.string.learnProgramListShowMoreLabel),
-                        width = ButtonWidth.FILL,
-                        height = ButtonHeight.SMALL,
-                        color = ButtonColor.BlackOutline,
-                        onClick = { state.increaseVisibleItemCount() },
-                        modifier = Modifier.padding(horizontal = 24.dp)
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun LearnProgramCard(
-    program: LearnProgramState,
-    modifier: Modifier = Modifier,
-    onClick: (() -> Unit) = {}
-) {
-    Box(modifier = modifier
-        .horizonShadow(HorizonElevation.level4, shape = HorizonCornerRadius.level4)
-        .background(color = HorizonColors.Surface.cardPrimary(), shape = HorizonCornerRadius.level4)
-        .clickable(onClick = { onClick() })
-    ) {
-        Column(
-            Modifier
-                .fillMaxWidth()
-                .padding(24.dp)
-        ) {
-            Text(
-                text = program.programName,
-                style = HorizonTypography.labelLargeBold,
-                color = HorizonColors.Text.title(),
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-            )
-
-            HorizonSpace(SpaceSize.SPACE_12)
-
-            ProgressBarSmallInline(
-                program.programProgress,
-            )
-
-            HorizonSpace(SpaceSize.SPACE_12)
-
-            FlowRow(
-                verticalArrangement = Arrangement.Center,
-                horizontalArrangement = Arrangement.spacedBy(8.dp)
-            ) {
-                program.programChips.forEach {
-                    StatusChip(
-                        StatusChipState(
-                            label = it.label,
-                            color = StatusChipColor.Grey,
-                            fill = true,
-                        )
-                    )
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun LearnProgramListFilter(state: LearnProgramListUiState, scrollState: LazyListState) {
-    Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
-        modifier = Modifier
-            .fillMaxWidth()
-            .conditional(scrollState.canScrollBackward) {
-                horizonBorderShadow(HorizonColors.LineAndBorder.lineStroke(), bottom = 1.dp)
-            }
-            .background(HorizonColors.Surface.pagePrimary())
-            .padding(horizontal = 24.dp, vertical = 16.dp)
-    ) {
-        DropdownChip(
-            items = LearnProgramFilterOption.entries.map {
-                DropdownItem(it, stringResource(it.labelRes))
-            },
-            selectedItem = DropdownItem(
-                state.selectedFilterValue,
-                stringResource(state.selectedFilterValue.labelRes))
-            ,
-            onItemSelected = { state.updateFilterValue(it?.value ?: LearnProgramFilterOption.All) },
-            dropdownWidth = 180.dp,
-            verticalPadding = 6.dp,
-            placeholder = ""
-        )
-
-        Text(
-            text = state.filteredPrograms.take(state.visibleItemCount).size.toString()
-        )
-    }
-}
-
-@Composable
-private fun EmptyMessage() {
-    Text(
-        text = stringResource(R.string.learnProgramListEmptyMessage),
-        style = HorizonTypography.p1,
-        color = HorizonColors.Text.body(),
-        modifier = Modifier.padding(horizontal = 24.dp)
-    )
-}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListUiState.kt
deleted file mode 100644
index 3e63811f10..0000000000
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListUiState.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.program.list
-
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import androidx.compose.ui.text.input.TextFieldValue
-import com.instructure.horizon.R
-import com.instructure.horizon.horizonui.platform.LoadingState
-
-data class LearnProgramListUiState(
-    val loadingState: LoadingState = LoadingState(),
-    val filteredPrograms: List<LearnProgramState> = emptyList(),
-    val searchQuery: TextFieldValue = TextFieldValue(""),
-    val updateSearchQuery: (TextFieldValue) -> Unit = {},
-    val selectedFilterValue: LearnProgramFilterOption = LearnProgramFilterOption.All,
-    val updateFilterValue: (LearnProgramFilterOption) -> Unit = {},
-    val visibleItemCount: Int = 10,
-    val increaseVisibleItemCount: () -> Unit = {},
-)
-
-data class LearnProgramState(
-    val programName: String = "",
-    val programId: String = "",
-    val programProgress: Double = 0.0,
-    val programChips: List<LearnProgramChipState> = emptyList(),
-)
-
-data class LearnProgramChipState(
-    val label: String = "",
-    @DrawableRes val iconRes: Int? = null,
-)
-
-enum class LearnProgramFilterOption(@StringRes val labelRes: Int) {
-    All(R.string.learnProgramListFilterAll),
-    NotStarted(R.string.learnProgramListFilterNotStarted),
-    InProgress(R.string.learnProgramListFilterInProgress),
-    Completed(R.string.learnProgramListFilterCompleted);
-
-    companion object {
-        internal fun Double.getProgressOption(): LearnProgramFilterOption {
-            return when (this) {
-                0.0 -> NotStarted
-                in 0.0..<100.0 -> InProgress
-                else -> Completed
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListViewModel.kt
deleted file mode 100644
index 897a0269c9..0000000000
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/learn/program/list/LearnProgramListViewModel.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.program.list
-
-import android.content.Context
-import android.content.res.Resources
-import androidx.compose.ui.text.input.TextFieldValue
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.instructure.canvasapi2.utils.weave.catch
-import com.instructure.canvasapi2.utils.weave.tryLaunch
-import com.instructure.horizon.R
-import com.instructure.horizon.features.learn.program.list.LearnProgramFilterOption.Companion.getProgressOption
-import com.instructure.horizon.horizonui.platform.LoadingState
-import com.instructure.pandautils.utils.formatMonthDayYear
-import com.instructure.pandautils.utils.sum
-import com.instructure.pandautils.utils.toFormattedString
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import javax.inject.Inject
-import kotlin.time.Duration
-
-@HiltViewModel
-class LearnProgramListViewModel @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val resources: Resources,
-    private val repository: LearnProgramListRepository
-): ViewModel() {
-
-    private val pageCount = 10
-    private var allPrograms: List<LearnProgramState> = emptyList()
-
-    private val _uiState = MutableStateFlow(LearnProgramListUiState(
-        loadingState = LoadingState(
-            onRefresh = ::refreshData,
-            onSnackbarDismiss = ::onSnackbarDismissed
-        ),
-        increaseVisibleItemCount = ::increaseVisibleItemCount,
-        updateSearchQuery = ::updateSearchQuery,
-        updateFilterValue = ::updateFilter
-    ))
-    val uiState = _uiState.asStateFlow()
-
-    init {
-        loadData()
-    }
-
-    private fun loadData() {
-        viewModelScope.tryLaunch {
-            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = true)) }
-            fetchData()
-            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = false)) }
-        }  catch {
-            _uiState.update { it.copy(loadingState = it.loadingState.copy(isLoading = false, isError = true)) }
-        }
-    }
-
-    private fun refreshData() {
-        viewModelScope.tryLaunch {
-            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = true)) }
-            fetchData(true)
-            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = false)) }
-        }  catch {
-            _uiState.update { it.copy(loadingState = it.loadingState.copy(isRefreshing = false, snackbarMessage = context.getString(
-                R.string.learnProgramListFailedToLoadMessage
-            ))) }
-        }
-    }
-
-    private suspend fun fetchData(forceRefresh: Boolean = false) {
-        val programs = repository.getPrograms(forceRefresh)
-        val programStates = programs.map { program ->
-            val requiredCourseIds = program.sortedRequirements.filter { it.required }.map { it.courseId }.toSet()
-
-            val programDuration = repository.getCoursesById(
-                program.sortedRequirements.map { it.courseId },
-                forceRefresh
-            )
-                .filter { requiredCourseIds.contains(it.courseId) }
-                .flatMap { it.moduleItemsDuration }
-                .map { Duration.parse(it) }
-                .sum()
-
-            LearnProgramState(
-                programName = program.name,
-                programId = program.id,
-                programProgress = program.sortedRequirements.firstOrNull()?.progress ?: 0.0,
-                programChips = buildList {
-                    add(
-                        LearnProgramChipState(
-                            label = resources.getQuantityString(
-                                R.plurals.learnProgramListCourseCount,
-                                program.sortedRequirements.size,
-                                program.sortedRequirements.size
-                            ),
-                            iconRes = null
-                        )
-                    )
-
-                    if (programDuration.isPositive()) {
-                        add(
-                            LearnProgramChipState(
-                                label = programDuration.toFormattedString(resources),
-                                iconRes = null
-                            )
-                        )
-                    }
-
-                    if (program.startDate != null && program.endDate != null) {
-                        add(
-                            LearnProgramChipState(
-                                label = context.getString(
-                                    R.string.programTag_DateRange,
-                                    program.startDate?.formatMonthDayYear(),
-                                    program.endDate?.formatMonthDayYear()
-                                ),
-                                iconRes = R.drawable.calendar_today
-                            )
-                        )
-                    }
-                }
-            )
-        }
-        allPrograms = programStates
-
-        _uiState.value = _uiState.value.copy(
-            filteredPrograms = programStates.applyFilters()
-        )
-    }
-
-    private fun onSnackbarDismissed() {
-        _uiState.update { it.copy(loadingState = it.loadingState.copy(snackbarMessage = null)) }
-
-    }
-
-    private fun List<LearnProgramState>.applyFilters(): List<LearnProgramState> {
-        return this.filter {
-            (it.programProgress.getProgressOption() == _uiState.value.selectedFilterValue
-                    || _uiState.value.selectedFilterValue == LearnProgramFilterOption.All)
-                    && it.programName.contains(_uiState.value.searchQuery.text.trim(), ignoreCase = true)
-
-        }
-    }
-
-    private fun increaseVisibleItemCount() {
-        _uiState.update {
-            it.copy(visibleItemCount = it.visibleItemCount + pageCount)
-        }
-    }
-
-    private fun updateFilter(filterOption: LearnProgramFilterOption) {
-        _uiState.update {
-            it.copy(selectedFilterValue = filterOption)
-        }
-        _uiState.update {
-            it.copy(filteredPrograms = allPrograms.applyFilters())
-        }
-    }
-
-    private fun updateSearchQuery(query: TextFieldValue) {
-        _uiState.update {
-            it.copy(searchQuery = query)
-        }
-        _uiState.update {
-            it.copy(filteredPrograms = allPrograms.applyFilters())
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceScreen.kt
index fef9193cf4..d9d039b1bf 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceScreen.kt
@@ -29,10 +29,13 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PageSize
@@ -40,7 +43,6 @@ import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Surface
@@ -53,7 +55,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
@@ -122,25 +123,21 @@ import com.instructure.horizon.horizonui.molecules.PillCase
 import com.instructure.horizon.horizonui.molecules.PillType
 import com.instructure.horizon.horizonui.molecules.Spinner
 import com.instructure.horizon.horizonui.molecules.SpinnerSize
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
 import com.instructure.pandautils.compose.modifiers.conditional
 import com.instructure.pandautils.utils.Const
-import com.instructure.pandautils.utils.ThemePrefs
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.getActivityOrNull
 import com.instructure.pandautils.utils.orDefault
 import kotlin.math.abs
 
 @Composable
 fun ModuleItemSequenceScreen(navController: NavHostController, uiState: ModuleItemSequenceUiState) {
-    val activity = LocalContext.current.getActivityOrNull()
-    if (activity != null) ViewStyler.setStatusBarColor(activity, ThemePrefs.brandColor, true)
     if (uiState.progressScreenState.visible) ProgressScreen(uiState.progressScreenState, uiState.loadingState)
-    val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
 
-    Scaffold(
-        containerColor = HorizonColors.Surface.institution(),
+    EdgeToEdgeScaffold(
+        statusBarColor = HorizonColors.Surface.institution(),
+        statusBarAlpha = 1f,
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         bottomBar = {
             ModuleItemSequenceBottomBar(
@@ -177,9 +174,13 @@ fun ModuleItemSequenceScreen(navController: NavHostController, uiState: ModuleIt
                     onDismiss = { uiState.updateShowAiAssist(false) },
                 )
             }
-            ModuleItemSequenceContent(uiState = uiState, navController = navController, onBackPressed = {
-                navController.popBackStack()
-            })
+            ModuleItemSequenceContent(
+                uiState = uiState,
+                navController = navController,
+                onBackPressed = {
+                    navController.popBackStack()
+                }
+            )
             val markAsDoneState = uiState.currentItem?.markAsDoneUiState
             if (markAsDoneState != null && !uiState.currentItem.isLoading) {
                 MarkAsDoneButton(markAsDoneState)
@@ -269,6 +270,7 @@ private fun ModuleItemSequenceContent(
             ModuleHeaderContainer(
                 uiState = uiState,
                 modifier = Modifier
+                    .background(HorizonColors.Surface.institution())
                     .padding(start = 24.dp, end = 24.dp, top = 16.dp, bottom = 24.dp)
                     .wrapContentHeight(),
                 onBackPressed = onBackPressed
@@ -357,12 +359,14 @@ private fun ModuleHeaderContainer(
                     textAlign = TextAlign.Center
                 )
             }
-            IconButton(
-                iconRes = R.drawable.list_alt,
-                contentDescription = stringResource(R.string.myProgress),
-                color = IconButtonColor.Institution,
-                onClick = uiState.onProgressClick
-            )
+            if (uiState.showMyProgressButton) {
+                IconButton(
+                    iconRes = R.drawable.list_alt,
+                    contentDescription = stringResource(R.string.myProgress),
+                    color = IconButtonColor.Institution,
+                    onClick = uiState.onProgressClick
+                )
+            }
         }
         if (!uiState.currentItem?.detailTags.isNullOrEmpty()) {
             HorizonSpace(SpaceSize.SPACE_24)
@@ -402,7 +406,7 @@ private fun ModuleItemPager(pagerState: PagerState, modifier: Modifier = Modifie
         state = pagerState,
         beyondViewportPageCount = 0,
         pageSize = PageSize.Fill,
-        modifier = modifier,
+        modifier = modifier.background(HorizonColors.Surface.institution()),
         userScrollEnabled = false
     ) { page ->
         Column(
@@ -566,10 +570,14 @@ private fun ModuleItemSequenceBottomBar(
     onNotebookClick: () -> Unit = {},
     hasUnreadComments: Boolean = false
 ) {
-    Surface(shadowElevation = HorizonElevation.level4, color = HorizonColors.Surface.pagePrimary()) {
+    Surface(
+        shadowElevation = HorizonElevation.level4,
+        color = HorizonColors.Surface.pagePrimary(),
+    ) {
         Box(
             modifier = modifier
                 .fillMaxWidth()
+                .windowInsetsPadding(WindowInsets.navigationBars)
                 .padding(horizontal = 24.dp, vertical = 16.dp)
         ) {
             if (showPreviousButton) IconButton(
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceUiState.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceUiState.kt
index 88692f74cd..9b47d4b4d5 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceUiState.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceUiState.kt
@@ -43,7 +43,8 @@ data class ModuleItemSequenceUiState(
     val hasUnreadComments: Boolean = false,
     val updateAiAssistContext: (AiAssistContextSource, String) -> Unit = { _, _ -> },
     val shouldRefreshPreviousScreen: Boolean = false,
-    val scrollToNoteId: String? = null
+    val scrollToNoteId: String? = null,
+    val showMyProgressButton: Boolean = true,
 )
 
 data class ModuleItemUiState(
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceViewModel.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceViewModel.kt
index d02c436964..12a6b833b0 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceViewModel.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/ModuleItemSequenceViewModel.kt
@@ -67,6 +67,7 @@ class ModuleItemSequenceViewModel @Inject constructor(
     private val moduleItemAssetType = savedStateHandle.toRoute<MainNavigationRoute.ModuleItemSequence>().moduleItemAssetType
     private val moduleItemAssetId = savedStateHandle.toRoute<MainNavigationRoute.ModuleItemSequence>().moduleItemAssetId
     private val scrollToNoteId = savedStateHandle.toRoute<MainNavigationRoute.ModuleItemSequence>().scrollToNoteId
+    private val showMyProgressButton = savedStateHandle.toRoute<MainNavigationRoute.ModuleItemSequence>().showMyProgressButton
 
     private var courseProgressChanged = false
 
@@ -75,6 +76,7 @@ class ModuleItemSequenceViewModel @Inject constructor(
             ModuleItemSequenceUiState(
                 courseId = courseId,
                 scrollToNoteId = scrollToNoteId,
+                showMyProgressButton = showMyProgressButton,
                 loadingState = LoadingState(onRefresh = ::refresh),
                 onPreviousClick = ::previousClicked,
                 onNextClick = ::nextClicked,
@@ -582,7 +584,7 @@ class ModuleItemSequenceViewModel @Inject constructor(
         courseProgressChanged = true
         viewModelScope.launch {
             dashboardEventHandler.postEvent(DashboardEvent.ProgressRefresh)
-            learnEventHandler.postEvent(LearnEvent.RefreshRequested)
+            learnEventHandler.postEvent(LearnEvent.RefreshCourseProgress)
         }
     }
 }
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/progress/ProgressScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/progress/ProgressScreen.kt
index ec222fd1c8..8b91f6cb8d 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/progress/ProgressScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/moduleitemsequence/progress/ProgressScreen.kt
@@ -78,6 +78,7 @@ import kotlinx.coroutines.delay
 fun ProgressScreen(uiState: ProgressScreenUiState, loadingState: LoadingState, modifier: Modifier = Modifier) {
     val bottomSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
     ModalBottomSheet(
+        containerColor = HorizonColors.Surface.pagePrimary(),
         sheetState = bottomSheetState,
         onDismissRequest = uiState.onCloseClick,
         dragHandle = null,
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/NotebookScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/NotebookScreen.kt
index 1afb4efcba..5cfd56b366 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/NotebookScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/NotebookScreen.kt
@@ -22,6 +22,8 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -33,7 +35,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -41,6 +42,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.clearAndSetSemantics
@@ -49,7 +51,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.navigation.NavHostController
 import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
 import com.instructure.canvasapi2.utils.ContextKeeper
@@ -78,12 +79,11 @@ import com.instructure.horizon.horizonui.molecules.IconButtonColor
 import com.instructure.horizon.horizonui.molecules.IconButtonSize
 import com.instructure.horizon.horizonui.molecules.LoadingIconButton
 import com.instructure.horizon.horizonui.molecules.Spinner
-import com.instructure.horizon.horizonui.organisms.CollapsableHeaderScreen
+import com.instructure.horizon.horizonui.organisms.scaffolds.CollapsableHeaderScreen
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
 import com.instructure.horizon.navigation.MainNavigationRoute
+import com.instructure.horizon.util.plus
 import com.instructure.pandautils.compose.modifiers.conditional
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.getActivityOrNull
 import com.instructure.pandautils.utils.localisedFormat
 
 @Composable
@@ -105,14 +105,6 @@ fun NotebookScreen(
     navController: NavHostController,
     state: NotebookUiState
 ) {
-    val activity = LocalContext.current.getActivityOrNull()
-    LaunchedEffect(Unit) {
-        if (activity != null) ViewStyler.setStatusBarColor(
-            activity,
-            ContextCompat.getColor(activity, R.color.surface_pagePrimary)
-        )
-    }
-
     val scrollState = rememberLazyListState()
 
     NoteDeleteConfirmationDialog(
@@ -124,25 +116,45 @@ fun NotebookScreen(
     )
 
     CollapsableHeaderScreen(
-        modifier = Modifier.background(HorizonColors.Surface.pagePrimary()),
-        headerContent = {
+        statusBarColor = HorizonColors.Surface.pagePrimary(),
+        navigationBarColor = HorizonColors.Surface.cardPrimary(),
+        modifier = Modifier
+            .background(HorizonColors.Surface.pagePrimary()),
+        headerContent = { contentPadding ->
             if (state.showTopBar) {
                 if (state.showCourseFilter) {
                     NotebookAppBar(
                         navigateBack = { navController.popBackStack() },
-                        centeredTitle = true
+                        centeredTitle = true,
+                        modifier = Modifier.padding(contentPadding)
                     )
                 } else {
                     NotebookAppBar(
                         onClose = { navController.popBackStack() },
-                        centeredTitle = false
+                        centeredTitle = false,
+                        modifier = Modifier.padding(contentPadding)
                     )
                 }
 
             }
         },
-        bodyContent = {
-            LoadingStateWrapper(state.loadingState) {
+        bodyContent = { contentPadding ->
+            val layoutDirection = LocalLayoutDirection.current
+            val topPadding = PaddingValues(
+                start = contentPadding.calculateStartPadding(layoutDirection),
+                top = contentPadding.calculateTopPadding(),
+                end = contentPadding.calculateEndPadding(layoutDirection)
+            )
+            val bottomPadding = PaddingValues(
+                start = contentPadding.calculateStartPadding(layoutDirection),
+                end = contentPadding.calculateEndPadding(layoutDirection),
+                bottom = contentPadding.calculateBottomPadding()
+            )
+
+            LoadingStateWrapper(
+                state.loadingState,
+                modifier = Modifier.padding(topPadding)
+            ) {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
                     modifier = Modifier
@@ -176,7 +188,7 @@ fun NotebookScreen(
                             end = 16.dp,
                             top = 2.dp,
                             bottom = 16.dp
-                        )
+                        ) + bottomPadding
                     ) {
                         if (state.notes.isEmpty()) {
                             item {
@@ -192,9 +204,13 @@ fun NotebookScreen(
                                     val courseName = if (state.showCourseFilter) {
                                         state.courses.firstOrNull { it.courseId == note.courseId }?.courseName
                                     } else null
-                                    NoteContent(note, courseName, state.deleteLoadingNote, onDeleteClick = {
-                                        state.updateShowDeleteConfirmation(note)
-                                    }) {
+                                    NoteContent(
+                                        note,
+                                        courseName,
+                                        state.deleteLoadingNote,
+                                        onDeleteClick = {
+                                            state.updateShowDeleteConfirmation(note)
+                                        }) {
                                         if (state.navigateToEdit) {
                                             navController.navigate(
                                                 NotebookRoute.EditNotebook(
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/addedit/AddEditNoteScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/addedit/AddEditNoteScreen.kt
index e75460c77a..12fb49ddd1 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/addedit/AddEditNoteScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/addedit/AddEditNoteScreen.kt
@@ -29,7 +29,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
@@ -51,8 +50,8 @@ import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.NoteHighlightedData
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.NoteHighlightedDataRange
 import com.instructure.canvasapi2.managers.graphql.horizon.redwood.NoteHighlightedDataTextPosition
@@ -77,8 +76,7 @@ import com.instructure.horizon.horizonui.organisms.ModalDialogState
 import com.instructure.horizon.horizonui.organisms.inputs.common.InputLabelRequired
 import com.instructure.horizon.horizonui.organisms.inputs.textarea.TextArea
 import com.instructure.horizon.horizonui.organisms.inputs.textarea.TextAreaState
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.getActivityOrNull
+import com.instructure.horizon.horizonui.organisms.scaffolds.EdgeToEdgeScaffold
 import kotlinx.coroutines.delay
 
 @Composable
@@ -87,11 +85,6 @@ fun AddEditNoteScreen(
     state: AddEditNoteUiState,
     onShowSnackbar: (String?, () -> Unit) -> Unit
 ) {
-    val activity = LocalContext.current.getActivityOrNull()
-    LaunchedEffect(Unit) {
-        if (activity != null) ViewStyler.setStatusBarColor(activity, ContextCompat.getColor(activity, R.color.surface_pageSecondary))
-    }
-
     LaunchedEffect(state.snackbarMessage) {
         onShowSnackbar(state.snackbarMessage, state.onSnackbarDismiss)
     }
@@ -104,7 +97,9 @@ fun AddEditNoteScreen(
         }
     }
 
-    Scaffold(
+    EdgeToEdgeScaffold(
+        statusBarColor = HorizonColors.Surface.cardPrimary(),
+        navigationBarColor = HorizonColors.Surface.cardPrimary(),
         containerColor = HorizonColors.Surface.pageSecondary(),
         topBar = { AddEditNoteAppBar(state, navigateBack = { navController.popBackStack() }) },
     ) { padding ->
@@ -320,7 +315,7 @@ private fun AddEditNoteScreenPreview() {
     )
 
     AddEditNoteScreen(
-        navController = NavHostController(LocalContext.current),
+        navController = rememberNavController(),
         state = state,
         onShowSnackbar = { _, _ -> }
     )
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/composable/NotebookAppBar.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/composable/NotebookAppBar.kt
index 3243e82ea9..b4c17fa48c 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/composable/NotebookAppBar.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/composable/NotebookAppBar.kt
@@ -17,6 +17,7 @@
 package com.instructure.horizon.features.notebook.common.composable
 
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -42,6 +43,7 @@ import com.instructure.horizon.horizonui.foundation.HorizonTypography
 import com.instructure.horizon.horizonui.molecules.IconButton
 import com.instructure.horizon.horizonui.molecules.IconButtonColor
 import com.instructure.horizon.horizonui.molecules.IconButtonSize
+import com.instructure.horizon.util.zeroScreenInsets
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -111,6 +113,7 @@ fun NotebookAppBar(
             titleContentColor = HorizonColors.Text.title(),
             navigationIconContentColor = HorizonColors.Icon.default()
         ),
+        windowInsets = WindowInsets.zeroScreenInsets,
         modifier = modifier
     )
 }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/webview/ComposeNotesHighlightingCanvasWebView.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/webview/ComposeNotesHighlightingCanvasWebView.kt
index 7064322764..e1542fc4ed 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/webview/ComposeNotesHighlightingCanvasWebView.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/notebook/common/webview/ComposeNotesHighlightingCanvasWebView.kt
@@ -38,9 +38,10 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.os.bundleOf
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.instructure.pandautils.compose.composables.ComposeCanvasWebViewStateViewModel
 import com.instructure.horizon.R
 import com.instructure.horizon.features.notebook.common.model.Note
 import com.instructure.horizon.features.notebook.common.model.NotebookType
@@ -81,7 +82,8 @@ fun ComposeNotesHighlightingCanvasWebView(
     var scrollValue by rememberSaveable { mutableIntStateOf(0) }
     var previousScrollMaxValue by rememberSaveable { mutableIntStateOf(0) }
     var scrollMaxValue by rememberSaveable { mutableIntStateOf(0) }
-    val webViewState = rememberSaveable { bundleOf() }
+    val stateViewModel: ComposeCanvasWebViewStateViewModel = viewModel()
+    val webViewState = stateViewModel.webViewState
     val selectionLocation: MutableStateFlow<SelectionLocation> by remember { mutableStateOf(MutableStateFlow(SelectionLocation(0f, 0f, 0f, 0f))) }
     val lifecycleOwner = LocalLifecycleOwner.current
     val composeScope = rememberCoroutineScope()
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/notification/NotificationScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/notification/NotificationScreen.kt
index 8f87d30975..37092d16a0 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/notification/NotificationScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/notification/NotificationScreen.kt
@@ -33,7 +33,6 @@ import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -44,7 +43,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import androidx.navigation.NavDeepLinkRequest
 import androidx.navigation.NavHostController
@@ -66,8 +64,6 @@ import com.instructure.horizon.horizonui.molecules.StatusChipState
 import com.instructure.horizon.horizonui.organisms.scaffolds.HorizonScaffold
 import com.instructure.horizon.horizonui.platform.LoadingState
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
-import com.instructure.pandautils.utils.ViewStyler
-import com.instructure.pandautils.utils.getActivityOrNull
 import com.instructure.pandautils.utils.isPreviousDay
 import com.instructure.pandautils.utils.isSameDay
 import com.instructure.pandautils.utils.isSameWeek
@@ -81,12 +77,8 @@ import java.util.Locale
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun NotificationScreen(state: NotificationUiState, navController: NavHostController) {
-    val activity = LocalContext.current.getActivityOrNull()
     val snackbarHostState = remember { SnackbarHostState() }
     val scope = rememberCoroutineScope()
-    LaunchedEffect(Unit) {
-        if (activity != null) ViewStyler.setStatusBarColor(activity, ContextCompat.getColor(activity, R.color.surface_pagePrimary))
-    }
 
     HorizonScaffold(
         title = stringResource(R.string.notificationsTitle),
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/features/skillspace/SkillspaceScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/features/skillspace/SkillspaceScreen.kt
index 8bd034e0f9..4682ee15de 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/features/skillspace/SkillspaceScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/features/skillspace/SkillspaceScreen.kt
@@ -21,7 +21,9 @@ import android.view.ViewGroup
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -32,6 +34,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import com.instructure.horizon.horizonui.platform.LoadingStateWrapper
+import com.instructure.horizon.util.topHorizontalWindowInsets
 import com.instructure.pandautils.compose.composables.ComposeCanvasWebView
 import com.instructure.pandautils.compose.composables.ComposeEmbeddedWebViewCallbacks
 import com.instructure.pandautils.utils.ThemePrefs
@@ -52,7 +55,11 @@ fun SkillspaceScreen(state: SkillspaceUiState) {
         webView?.handleOnActivityResult(request, result.resultCode, result.data)
     }
 
-    Box(modifier = Modifier.fillMaxSize()) {
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .windowInsetsPadding(WindowInsets.topHorizontalWindowInsets)
+    ) {
         LoadingStateWrapper(state.loadingState) {
             state.webviewUrl?.let {
                 ComposeCanvasWebView(
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/foundation/HorizonColors.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/foundation/HorizonColors.kt
index d2b66e9294..c8dedc6e42 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/foundation/HorizonColors.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/foundation/HorizonColors.kt
@@ -162,6 +162,7 @@ object HorizonColors {
     }
 
     object PrimitivesCopper {
+        val copper12 = Color(0xFFFFE5D3)
         @Composable
         fun copper30() = colorResource(R.color.primitives_copper30)
         @Composable
@@ -178,6 +179,7 @@ object HorizonColors {
         fun copper70() = colorResource(R.color.primitives_copper70)
         @Composable
         fun copper90() = colorResource(R.color.primitives_copper90)
+        val copper90 = Color(0xFF77360B)
         @Composable
         fun copper110() = colorResource(R.color.primitives_copper110)
     }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/ActionBottomSheet.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/ActionBottomSheet.kt
index 4696604e0a..e10e9ab042 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/ActionBottomSheet.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/ActionBottomSheet.kt
@@ -26,6 +26,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
@@ -66,13 +69,15 @@ fun ActionBottomSheet(
 ) {
     val localCoroutineScope = rememberCoroutineScope()
     ModalBottomSheet(
+        containerColor = HorizonColors.Surface.pagePrimary(),
         onDismissRequest = onDismiss,
         sheetState = sheetState,
-        modifier = modifier,
-        dragHandle = null
+        modifier = modifier.statusBarsPadding(),
+        dragHandle = null,
     ) {
         Column(
             modifier = Modifier
+                .verticalScroll(rememberScrollState())
                 .background(color = HorizonColors.Surface.pagePrimary(), shape = HorizonCornerRadius.level5)
                 .padding(start = 24.dp, top = 24.dp, end = 24.dp, bottom = 36.dp)
         ) {
@@ -100,7 +105,10 @@ fun ActionBottomSheet(
                 )
             }
             HorizonSpace(SpaceSize.SPACE_24)
-            Column(modifier = Modifier.background(color = HorizonColors.Surface.cardPrimary(), shape = HorizonCornerRadius.level3)) {
+            Column(
+                modifier = Modifier
+                    .background(color = HorizonColors.Surface.cardPrimary(), shape = HorizonCornerRadius.level3)
+            ) {
                 actions.forEachIndexed { index, bottomSheetActionState ->
                     val clipModifier = when (index) {
                         0 -> Modifier.clip(shape = HorizonCornerRadius.level3Top)
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/DropdownChip.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/DropdownChip.kt
index 7441d22c16..08bcaf4017 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/DropdownChip.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/DropdownChip.kt
@@ -79,6 +79,7 @@ fun <T> DropdownChip(
     dropdownWidth: Dp? = null,
     placeholder: String,
     showIconCollapsed: Boolean = false,
+    showSelectedIcon: Boolean = false,
     enabled: Boolean = true,
     borderColor: Color = HorizonColors.LineAndBorder.lineStroke(),
     contentColor: Color = HorizonColors.Text.body(),
@@ -176,7 +177,7 @@ fun <T> DropdownChip(
                     }
                 },
                 item = { item ->
-                    DropdownChipItem(item, selectedItem)
+                    DropdownChipItem(item, selectedItem, showSelectedIcon)
                 }
             )
         }
@@ -186,7 +187,8 @@ fun <T> DropdownChip(
 @Composable
 private fun <T> DropdownChipItem(
     item: DropdownItem<out T>,
-    selectedItem: DropdownItem<out T>?
+    selectedItem: DropdownItem<out T>?,
+    showSelectedIcon: Boolean,
 ) {
     val isSelected = selectedItem?.value == item.value
     val context = LocalContext.current
@@ -226,8 +228,20 @@ private fun <T> DropdownChipItem(
             } else {
                 HorizonColors.Text.body()
             },
-            modifier = Modifier.padding(start = 4.dp)
+            modifier = Modifier
+                .weight(1f)
+                .padding(start = 4.dp)
         )
+        if (isSelected && showSelectedIcon) {
+            Icon(
+                painter = painterResource(R.drawable.check),
+                contentDescription = null,
+                modifier = Modifier
+                    .size(24.dp)
+                    .padding(1.dp),
+                tint = HorizonColors.Icon.default()
+            )
+        }
     }
 }
 
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/FilterChip.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/FilterChip.kt
new file mode 100644
index 0000000000..f341823661
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/FilterChip.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.horizonui.molecules
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.selected
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.horizon.R
+import com.instructure.horizon.horizonui.foundation.HorizonBorder
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.horizonui.foundation.HorizonCornerRadius
+import com.instructure.horizon.horizonui.foundation.HorizonTypography
+
+enum class FilterChipSize(val fontStyle: TextStyle, val verticalPadding: Dp) {
+    LARGE(HorizonTypography.p2, 6.dp),
+    MEDIUM(HorizonTypography.p2, 2.dp),
+    SMALL(HorizonTypography.p3, 1.dp)
+}
+
+@Composable
+fun FilterChip(
+    label: String,
+    selected: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    size: FilterChipSize = FilterChipSize.MEDIUM
+) {
+    val backgroundColor = if (selected) HorizonColors.Surface.inversePrimary() else HorizonColors.Surface.cardPrimary()
+    val textColor = if (selected) HorizonColors.Text.surfaceColored() else HorizonColors.Text.title()
+    val horizontalPadding = if (selected) 8.dp else 12.dp
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(2.dp),
+        modifier = modifier
+            .semantics { this.selected = selected }
+            .background(color = backgroundColor, shape = HorizonCornerRadius.level1)
+            .border(HorizonBorder.level1(HorizonColors.Surface.inversePrimary()), shape = HorizonCornerRadius.level1)
+            .clickable(onClick = onClick)
+            .padding(horizontal = horizontalPadding, vertical = size.verticalPadding)
+    ) {
+        if (selected) {
+            Icon(
+                painter = painterResource(R.drawable.check),
+                contentDescription = null,
+                tint = textColor,
+                modifier = Modifier.size(16.dp)
+            )
+        }
+        Text(
+            text = label,
+            style = size.fontStyle,
+            color = textColor
+        )
+    }
+}
+
+@Composable
+@Preview(showBackground = true)
+private fun FilterChipSelectedPreview() {
+    ContextKeeper.appContext = LocalContext.current
+    FilterChip(label = "Most recent", selected = true, onClick = {})
+}
+
+@Composable
+@Preview(showBackground = true)
+private fun FilterChipUnselectedPreview() {
+    ContextKeeper.appContext = LocalContext.current
+    FilterChip(label = "Least recent", selected = false, onClick = {})
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/IconButton.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/IconButton.kt
index 5c96c6dbe4..60c08cae5a 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/IconButton.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/IconButton.kt
@@ -16,12 +16,10 @@
 package com.instructure.horizon.horizonui.molecules
 
 import androidx.annotation.DrawableRes
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
@@ -97,11 +95,17 @@ sealed class IconButtonColor(
     )
 
     data object WhiteGreyOutline : IconButtonColor(
-        HorizonColors.Surface.pagePrimary(),
+        HorizonColors.Surface.cardPrimary(),
         HorizonColors.Icon.default(),
         HorizonColors.LineAndBorder.lineStroke()
     )
 
+    data object DarkOutline : IconButtonColor(
+        Color.Transparent,
+        HorizonColors.Icon.default(),
+        HorizonColors.Surface.inversePrimary()
+    )
+
     data object WhiteOutline : IconButtonColor(
         Color.Transparent,
         HorizonColors.Icon.surfaceColored(),
@@ -137,7 +141,15 @@ fun IconButton(
     enabled: Boolean = true,
     contentDescription: String? = null,
     onClick: () -> Unit = {},
-    badge: @Composable (() -> Unit)? = null
+    badge: @Composable (() -> Unit)? = null,
+    buttonContent: @Composable (() -> Unit) = {
+        Icon(
+            painterResource(id = iconRes),
+            contentDescription = contentDescription,
+            modifier = Modifier.size(24.dp),
+            tint = color.iconColor
+        )
+    }
 ) {
     val buttonModifier = Modifier
         .conditional(!enabled) {
@@ -163,12 +175,7 @@ fun IconButton(
                 .border(HorizonBorder.level1(color.borderColor), shape = CircleShape)
                 .size(size.size)
         ) {
-            Icon(
-                painterResource(id = iconRes),
-                contentDescription = contentDescription,
-                modifier = Modifier.size(24.dp),
-                tint = color.iconColor
-            )
+            buttonContent()
         }
         badge?.let {
             Box(modifier = Modifier.offset(x = size.badgeOffset, y = (-size.badgeOffset))) {
@@ -189,39 +196,30 @@ fun LoadingIconButton(
     enabled: Boolean = true,
     contentDescription: String? = null,
     onClick: () -> Unit = {},
-    contentAlignment: Alignment = Alignment.Center,
     badge: @Composable (() -> Unit)? = null
 ) {
-    Box(
-        contentAlignment = contentAlignment,
-        modifier = modifier
-            .animateContentSize()
+    IconButton(
+        iconRes = iconRes,
+        modifier = modifier,
+        size = size,
+        color = color,
+        elevation = elevation,
+        enabled = enabled,
+        contentDescription = contentDescription,
+        onClick = onClick,
+        badge = badge
     ) {
         if (loading) {
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier
-                    .background(color = color.backgroundColor, shape = HorizonCornerRadius.level6)
-            ) {
-                Spinner(
-                    size = SpinnerSize.EXTRA_SMALL,
-                    color = color.iconColor,
-                    modifier = Modifier
-                        .align(Alignment.Center)
-                        .padding(8.dp),
-                )
-            }
+            Spinner(
+                size = SpinnerSize.EXTRA_SMALL,
+                color = color.iconColor
+            )
         } else {
-            IconButton(
-                iconRes = iconRes,
-                modifier = modifier,
-                size = size,
-                color = color,
-                elevation = elevation,
-                enabled = enabled,
+            Icon(
+                painterResource(id = iconRes),
                 contentDescription = contentDescription,
-                onClick = onClick,
-                badge = badge
+                modifier = Modifier.size(24.dp),
+                tint = color.iconColor
             )
         }
     }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/LoadingImage.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/LoadingImage.kt
new file mode 100644
index 0000000000..bffde23c20
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/LoadingImage.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.horizonui.molecules
+
+import android.graphics.drawable.Drawable
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
+import com.bumptech.glide.integration.compose.GlideImage
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
+import com.instructure.horizon.horizonui.animation.shimmerEffect
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+
+@OptIn(ExperimentalGlideComposeApi::class)
+@Composable
+fun LoadingImage(
+    imageUrl: String?,
+    modifier: Modifier = Modifier,
+    placeholder: (@Composable () -> Unit)? = { ImagePlaceholder() }
+) {
+    var isImageLoading by rememberSaveable { mutableStateOf(true) }
+    if (!imageUrl.isNullOrEmpty()) {
+        GlideImage(
+            imageUrl,
+            contentDescription = null,
+            contentScale = ContentScale.FillBounds,
+            requestBuilderTransform = {
+                it.addListener(object : RequestListener<Drawable> {
+                    override fun onLoadFailed(
+                        e: GlideException?,
+                        model: Any?,
+                        target: com.bumptech.glide.request.target.Target<Drawable>,
+                        isFirstResource: Boolean
+                    ): Boolean {
+                        isImageLoading = false
+                        return false
+                    }
+
+                    override fun onResourceReady(
+                        resource: Drawable,
+                        model: Any,
+                        target: Target<Drawable>?,
+                        dataSource: DataSource,
+                        isFirstResource: Boolean
+                    ): Boolean {
+                        isImageLoading = false
+                        return false
+                    }
+
+                })
+            },
+            modifier = modifier
+                .aspectRatio(1.69f)
+                .shimmerEffect(isImageLoading)
+        )
+    } else {
+        Box(
+            contentAlignment = Alignment.Center,
+            modifier = modifier
+                .aspectRatio(1.69f)
+                .background(HorizonColors.Surface.institution().copy(alpha = 0.1f))
+        ) {
+            placeholder?.invoke()
+        }
+    }
+}
+
+@Composable
+private fun ImagePlaceholder() {
+    Box(
+        Modifier
+            .fillMaxSize()
+            .background(HorizonColors.Surface.pagePrimary())
+    )
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/StatusChip.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/StatusChip.kt
index a7445de04b..d22443770a 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/StatusChip.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/molecules/StatusChip.kt
@@ -81,6 +81,16 @@ sealed class StatusChipColor(val contentColor: Color, val fillColor: Color = Col
         contentColor = HorizonColors.PrimitivesViolet.violet90,
         fillColor = HorizonColors.PrimitivesViolet.violet12
     )
+
+    data object Institution: StatusChipColor(
+        contentColor = HorizonColors.Surface.institution(),
+        fillColor = HorizonColors.Surface.institution().copy(alpha = 0.1f)
+    )
+
+    data object Orange: StatusChipColor(
+        contentColor = HorizonColors.PrimitivesCopper.copper90,
+        fillColor = HorizonColors.PrimitivesCopper.copper12
+    )
 }
 
 @Composable
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/CollapsableHeaderScreen.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/CollapsableScaffold.kt
similarity index 57%
rename from libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/CollapsableHeaderScreen.kt
rename to libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/CollapsableScaffold.kt
index e15bc2e050..1fe4008bd3 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/CollapsableHeaderScreen.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/CollapsableScaffold.kt
@@ -14,19 +14,18 @@
  *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.instructure.horizon.horizonui.organisms
+package com.instructure.horizon.horizonui.organisms.scaffolds
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.calculateEndPadding
-import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -45,26 +44,64 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.IntOffset
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.max
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.util.HorizonEdgeToEdgeSystemBars
+import com.instructure.horizon.util.minus
+import com.instructure.horizon.util.plus
+import com.instructure.horizon.util.zeroScreenInsets
 
 @Composable
 fun CollapsableHeaderScreen(
-    headerContent: @Composable () -> Unit,
-    bodyContent: @Composable () -> Unit,
-    modifier: Modifier = Modifier
+    headerContent: @Composable (contentPadding: PaddingValues) -> Unit,
+    bodyContent: @Composable (contentPadding: PaddingValues) -> Unit,
+    modifier: Modifier = Modifier,
+    statusBarColor: Color? = null,
+    navigationBarColor: Color? = null,
+    statusBarAlpha: Float = 0.8f,
+    navigationBarAlpha: Float = 0.8f
 ) {
+    if (statusBarColor != null) {
+        HorizonEdgeToEdgeSystemBars(
+            statusBarColor = statusBarColor,
+            navigationBarColor = navigationBarColor,
+            statusBarAlpha = statusBarAlpha,
+            navigationBarAlpha = navigationBarAlpha
+        ) { statusBarWindowInsets, navigationBarWindowInsets ->
+            CollapsableHeaderScreenContent(
+                headerContent = headerContent,
+                bodyContent = bodyContent,
+                statusBarWindowInsets = statusBarWindowInsets,
+                navigationBarWindowInsets = navigationBarWindowInsets,
+                modifier = modifier
+            )
+        }
+    } else {
+        CollapsableHeaderScreenContent(
+            headerContent = headerContent,
+            bodyContent = bodyContent,
+            modifier = modifier
+        )
+    }
+}
 
+@Composable
+private fun CollapsableHeaderScreenContent(
+    headerContent: @Composable (contentPadding: PaddingValues) -> Unit,
+    bodyContent: @Composable (contentPadding: PaddingValues) -> Unit,
+    modifier: Modifier = Modifier,
+    statusBarWindowInsets: WindowInsets = WindowInsets.zeroScreenInsets,
+    navigationBarWindowInsets: WindowInsets = WindowInsets.zeroScreenInsets
+) {
     val scrollConnectionSaver = Saver<MutableState<CollapsingAppBarNestedScrollConnection>, Pair<Int, Int>>(
         save = { it.value.appBarMaxHeight to it.value.appBarOffset },
         restore = { (mutableStateOf(CollapsingAppBarNestedScrollConnection(it.first).apply { appBarOffset = it.second })) }
     )
     val density = LocalDensity.current
-    var moduleHeaderHeight by rememberSaveable { mutableIntStateOf(0) }
-    var nestedScrollConnection by rememberSaveable(saver = scrollConnectionSaver) { mutableStateOf(CollapsingAppBarNestedScrollConnection(moduleHeaderHeight)) }
+    var headerHeight by rememberSaveable { mutableIntStateOf(0) }
+    var nestedScrollConnection by rememberSaveable(saver = scrollConnectionSaver) { mutableStateOf(CollapsingAppBarNestedScrollConnection(headerHeight)) }
 
     Box(
         modifier = modifier
@@ -75,25 +112,28 @@ fun CollapsableHeaderScreen(
             modifier = Modifier
                 .offset { IntOffset(0, nestedScrollConnection.appBarOffset) }
                 .onGloballyPositioned { coordinates ->
-                    if (coordinates.size.height != moduleHeaderHeight) {
-                        moduleHeaderHeight = coordinates.size.height
+                    if (coordinates.size.height != headerHeight) {
+                        headerHeight = coordinates.size.height
                         val temp = nestedScrollConnection.appBarOffset
                         nestedScrollConnection =
-                            CollapsingAppBarNestedScrollConnection(moduleHeaderHeight).apply {
+                            CollapsingAppBarNestedScrollConnection(headerHeight).apply {
                                 appBarOffset = temp
                             }
                     }
                 }
         ) {
-            headerContent()
+            headerContent(statusBarWindowInsets.asPaddingValues())
         }
-        val moduleHeaderHeight = max(0.dp, with(density) { moduleHeaderHeight.toDp() } + with(density) { nestedScrollConnection.appBarOffset.toDp() })
+        val headerHeight = max(
+            with(density) { statusBarWindowInsets.getTop(density).toDp() },
+            with(density) { headerHeight.toDp() } + with(density) { nestedScrollConnection.appBarOffset.toDp() }
+        )
 
         Box(
             modifier = Modifier
-                .padding(top = moduleHeaderHeight)
+                .padding(top = headerHeight)
         ) {
-            bodyContent()
+            bodyContent(navigationBarWindowInsets.asPaddingValues())
         }
     }
 }
@@ -101,17 +141,69 @@ fun CollapsableHeaderScreen(
 @Composable
 fun CollapsableScaffold(
     modifier: Modifier = Modifier,
-    topBar: @Composable () -> Unit = {},
+    topBar: @Composable (contentPadding: PaddingValues) -> Unit = {},
     bottomBar: @Composable () -> Unit = {},
     snackbarHost: @Composable () -> Unit = {},
     floatingActionButton: @Composable () -> Unit = {},
     floatingActionButtonPosition: FabPosition = FabPosition.End,
     containerColor: Color = MaterialTheme.colorScheme.background,
     contentColor: Color = contentColorFor(containerColor),
-    contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
-    content: @Composable () -> Unit,
+    statusBarColor: Color? = HorizonColors.Surface.pagePrimary(),
+    navigationBarColor: Color? = null,
+    statusBarAlpha: Float = 0.8f,
+    navigationBarAlpha: Float = 0.8f,
+    content: @Composable (paddingValues: PaddingValues) -> Unit,
 ) {
+    if (statusBarColor != null) {
+        HorizonEdgeToEdgeSystemBars(
+            statusBarColor = statusBarColor,
+            navigationBarColor = navigationBarColor,
+            statusBarAlpha = statusBarAlpha,
+            navigationBarAlpha = navigationBarAlpha
+        ) { statusBarWindowInsets, navigationBarWindowInsets ->
+            CollapsableScaffoldContent(
+                modifier = modifier,
+                topBar = topBar,
+                bottomBar = bottomBar,
+                snackbarHost = snackbarHost,
+                floatingActionButton = floatingActionButton,
+                floatingActionButtonPosition = floatingActionButtonPosition,
+                containerColor = containerColor,
+                contentColor = contentColor,
+                statusBarWindowInsets = statusBarWindowInsets,
+                navigationBarWindowInsets = navigationBarWindowInsets,
+                content = content
+            )
+        }
+    } else {
+        CollapsableScaffoldContent(
+            modifier = modifier,
+            topBar = topBar,
+            bottomBar = bottomBar,
+            snackbarHost = snackbarHost,
+            floatingActionButton = floatingActionButton,
+            floatingActionButtonPosition = floatingActionButtonPosition,
+            containerColor = containerColor,
+            contentColor = contentColor,
+            content = content
+        )
+    }
+}
 
+@Composable
+private fun CollapsableScaffoldContent(
+    modifier: Modifier = Modifier,
+    topBar: @Composable (contentPadding: PaddingValues) -> Unit = {},
+    bottomBar: @Composable () -> Unit = {},
+    snackbarHost: @Composable () -> Unit = {},
+    floatingActionButton: @Composable () -> Unit = {},
+    floatingActionButtonPosition: FabPosition = FabPosition.End,
+    containerColor: Color = MaterialTheme.colorScheme.background,
+    contentColor: Color = contentColorFor(containerColor),
+    statusBarWindowInsets: WindowInsets = WindowInsets.zeroScreenInsets,
+    navigationBarWindowInsets: WindowInsets = WindowInsets.zeroScreenInsets,
+    content: @Composable (paddingValues: PaddingValues) -> Unit,
+) {
     val scrollConnectionSaver =
         Saver<MutableState<CollapsingBarsNestedScrollConnection>, Pair<Pair<Int, Int>, Pair<Int, Int>>>(
             save = {
@@ -135,46 +227,55 @@ fun CollapsableScaffold(
     }
 
     val collapsedTopBarPadding = max(
-        0.dp,
+        with(density) { statusBarWindowInsets.getTop(density).toDp() },
         with(density) { topBarHeight.toDp() } + with(density) { nestedScrollConnection.topBarOffset.toDp() })
 
     val collapsedBottomBarPadding = max(
-        0.dp,
+        with(density) { navigationBarWindowInsets.getBottom(density).toDp() },
         with(density) { bottomBarHeight.toDp() } - with(density) { nestedScrollConnection.bottomBarOffset.toDp() })
 
     Scaffold(
         modifier = modifier
             .nestedScroll(nestedScrollConnection)
             .clipToBounds(),
+        contentWindowInsets = WindowInsets.ime,
         topBar = {
             Box(
-                Modifier.offset { IntOffset(0, nestedScrollConnection.topBarOffset) }
+                Modifier
+                    .offset { IntOffset(0, nestedScrollConnection.topBarOffset) }
                     .onGloballyPositioned { coordinates ->
                         if (coordinates.size.height != topBarHeight) {
                             topBarHeight = coordinates.size.height
                             val tempTop = nestedScrollConnection.topBarOffset
                             val tempBottom = nestedScrollConnection.bottomBarOffset
                             nestedScrollConnection =
-                                CollapsingBarsNestedScrollConnection(topBarHeight, bottomBarHeight).apply {
+                                CollapsingBarsNestedScrollConnection(
+                                    topBarHeight,
+                                    bottomBarHeight
+                                ).apply {
                                     topBarOffset = tempTop
                                     bottomBarOffset = tempBottom
                                 }
                         }
                     }
             ) {
-                topBar()
+                topBar(statusBarWindowInsets.asPaddingValues())
             }
         },
         bottomBar = {
             Box(
-                Modifier.offset { IntOffset(0, nestedScrollConnection.bottomBarOffset) }
+                Modifier
+                    .offset { IntOffset(0, nestedScrollConnection.bottomBarOffset) }
                     .onGloballyPositioned { coordinates ->
                         if (coordinates.size.height != bottomBarHeight) {
                             bottomBarHeight = coordinates.size.height
                             val tempTop = nestedScrollConnection.topBarOffset
                             val tempBottom = nestedScrollConnection.bottomBarOffset
                             nestedScrollConnection =
-                                CollapsingBarsNestedScrollConnection(topBarHeight, bottomBarHeight).apply {
+                                CollapsingBarsNestedScrollConnection(
+                                    topBarHeight,
+                                    bottomBarHeight
+                                ).apply {
                                     topBarOffset = tempTop
                                     bottomBarOffset = tempBottom
                                 }
@@ -189,20 +290,18 @@ fun CollapsableScaffold(
         floatingActionButtonPosition = floatingActionButtonPosition,
         containerColor = containerColor,
         contentColor = contentColor,
-        contentWindowInsets = contentWindowInsets,
         content = { paddingValues ->
-            val layoutDirection = LocalLayoutDirection.current
+            val density = LocalDensity.current
+            val innerPadding = paddingValues - PaddingValues(
+                top = with(density) { nestedScrollConnection.topBarMaxHeight.toDp() },
+                bottom = with(density) { nestedScrollConnection.bottomBarMaxHeight.toDp() }
+            )
+            val padding = innerPadding + PaddingValues(top = collapsedTopBarPadding, bottom = collapsedBottomBarPadding)
             Box(
-                modifier = Modifier.padding(
-                    PaddingValues(
-                        start = paddingValues.calculateStartPadding(layoutDirection),
-                        end = paddingValues.calculateEndPadding(layoutDirection),
-                        top = collapsedTopBarPadding,
-                        bottom = collapsedBottomBarPadding
-                    )
-                ).testTag("collapsableContent")
+                modifier = Modifier
+                    .testTag("collapsableContent")
             ) {
-                content()
+                content(padding)
             }
         }
     )
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/EdgeToEdgeScaffold.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/EdgeToEdgeScaffold.kt
new file mode 100644
index 0000000000..2372eafc34
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/EdgeToEdgeScaffold.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2025 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.horizon.horizonui.organisms.scaffolds
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.add
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.union
+import androidx.compose.material3.FabPosition
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+import com.instructure.horizon.util.HorizonEdgeToEdgeSystemBars
+
+@Composable
+fun EdgeToEdgeScaffold(
+    modifier: Modifier = Modifier,
+    topBar: @Composable () -> Unit = {},
+    bottomBar: @Composable () -> Unit = {},
+    snackbarHost: @Composable () -> Unit = {},
+    floatingActionButton: @Composable () -> Unit = {},
+    floatingActionButtonPosition: FabPosition = FabPosition.End,
+    containerColor: Color = HorizonColors.Surface.pagePrimary(),
+    contentColor: Color = contentColorFor(containerColor),
+    statusBarColor: Color? = HorizonColors.Surface.pagePrimary(),
+    navigationBarColor: Color? = null,
+    statusBarAlpha: Float = 0.8f,
+    navigationBarAlpha: Float = 0.8f,
+    content: @Composable (PaddingValues) -> Unit
+) {
+    HorizonEdgeToEdgeSystemBars(
+        statusBarColor = statusBarColor,
+        navigationBarColor = navigationBarColor,
+        statusBarAlpha = statusBarAlpha,
+        navigationBarAlpha = navigationBarAlpha
+    ) { statusBarWindowInsets, navigationBarWindowInsets ->
+        Scaffold(
+            modifier = modifier,
+            topBar = topBar,
+            bottomBar = bottomBar,
+            snackbarHost = snackbarHost,
+            floatingActionButton = floatingActionButton,
+            floatingActionButtonPosition = floatingActionButtonPosition,
+            containerColor = containerColor,
+            contentColor = contentColor,
+            contentWindowInsets = statusBarWindowInsets.add(navigationBarWindowInsets).union(WindowInsets.ime),
+            content = content
+        )
+    }
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/HorizonScaffold.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/HorizonScaffold.kt
index 814f47b373..9e8f705649 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/HorizonScaffold.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/scaffolds/HorizonScaffold.kt
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -39,9 +38,10 @@ fun HorizonScaffold(
     snackbarHost: @Composable () -> Unit = {},
     content: @Composable (Modifier) -> Unit,
 ) {
-    Scaffold(
+    EdgeToEdgeScaffold(
         topBar = { HorizonTopAppBar(title, onBackPressed) },
         snackbarHost = snackbarHost,
+        containerColor = HorizonColors.Surface.pagePrimary(),
         contentColor = HorizonColors.Surface.pagePrimary()
     ) { innerPadding ->
         Box(
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/tabrow/TabRow.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/tabrow/TabRow.kt
index c5a6a5cda0..015c63447e 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/tabrow/TabRow.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/organisms/tabrow/TabRow.kt
@@ -70,9 +70,9 @@ fun <T> TabRow(
 ) {
     val localDensity = LocalDensity.current
     val scrollState = rememberScrollState()
-    var containerWidth by rememberSaveable { mutableIntStateOf(0) }
-    var tabRowWidth by rememberSaveable { mutableIntStateOf(0) }
-    var sizes by rememberSaveable { mutableStateOf(tabs.map { 0 }) }
+    var containerWidth by rememberSaveable(tabs) { mutableIntStateOf(0) }
+    var tabRowWidth by rememberSaveable(tabs) { mutableIntStateOf(0) }
+    var sizes by rememberSaveable(tabs) { mutableStateOf(tabs.map { 0 }) }
     val spacingPx = with(localDensity) { spacing.toPx().toInt() }
     val alignmentOffset = when (tabAlignment) {
         Alignment.Start -> 0
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/platform/LoadingStateWrapper.kt b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/platform/LoadingStateWrapper.kt
index 5796539765..67cf7bf70e 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/horizonui/platform/LoadingStateWrapper.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/horizonui/platform/LoadingStateWrapper.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
@@ -44,6 +45,7 @@ import com.instructure.horizon.R
 import com.instructure.horizon.horizonui.foundation.HorizonColors
 import com.instructure.horizon.horizonui.foundation.HorizonTypography
 import com.instructure.horizon.horizonui.molecules.Spinner
+import com.instructure.horizon.util.zeroScreenInsets
 
 data class LoadingState(
     val isLoading: Boolean = false,
@@ -64,6 +66,7 @@ fun LoadingStateWrapper(
     containerColor: Color = HorizonColors.Surface.pagePrimary(),
     snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
     spinnerColor: Color = HorizonColors.Surface.institution(),
+    contentWindowInsets: WindowInsets = WindowInsets.zeroScreenInsets,
     content: @Composable BoxScope.() -> Unit,
 ) {
     val state = rememberPullToRefreshState()
@@ -77,7 +80,12 @@ fun LoadingStateWrapper(
         }
     }
 
-    Scaffold(containerColor = containerColor, snackbarHost = { SnackbarHost(snackbarHostState) }, modifier = modifier) { paddingValues ->
+    Scaffold(
+        contentWindowInsets = contentWindowInsets,
+        containerColor = containerColor,
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        modifier = modifier
+    ) { paddingValues ->
         if (loadingState.isPullToRefreshEnabled) {
             PullToRefreshBox(
                 isRefreshing = loadingState.isRefreshing,
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigation.kt b/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigation.kt
index c34de6572f..7c7e1c90e5 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigation.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigation.kt
@@ -15,8 +15,11 @@
  */
 package com.instructure.horizon.navigation
 
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
@@ -57,6 +60,7 @@ import com.instructure.horizon.navigation.MainNavigationRoute.Companion.ASSIGNME
 import com.instructure.horizon.navigation.MainNavigationRoute.Companion.COURSE_ID
 import com.instructure.horizon.navigation.MainNavigationRoute.Companion.PAGE_ID
 import com.instructure.horizon.navigation.MainNavigationRoute.Companion.QUIZ_ID
+import com.instructure.horizon.util.zeroScreenInsets
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 
@@ -73,7 +77,8 @@ sealed class MainNavigationRoute(val route: String) {
         val moduleItemId: Long? = null,
         val moduleItemAssetType: String? = null,
         val moduleItemAssetId: String? = null,
-        val scrollToNoteId: String? = null
+        val scrollToNoteId: String? = null,
+        val showMyProgressButton: Boolean = true
     ) :
         MainNavigationRoute("module_item_sequence")
 
@@ -97,11 +102,16 @@ fun HorizonNavigation(navController: NavHostController, modifier: Modifier = Mod
     val bottomBarVisible = isBottomBarVisible(navController)
 
     Scaffold(
+        contentWindowInsets = WindowInsets.zeroScreenInsets,
         containerColor = HorizonColors.Surface.pagePrimary(),
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
         bottomBar = { BottomNavigationBar(navController) }
     ) { innerPadding ->
-        val animatedBottomPadding = if (bottomBarVisible) innerPadding.calculateBottomPadding() else 0.dp
+        // Keep the bottomBar behind the keyboard
+        val animatedBottomPadding = if (bottomBarVisible && WindowInsets.ime.asPaddingValues().calculateBottomPadding() == 0.dp)
+            innerPadding.calculateBottomPadding()
+        else
+            0.dp
 
         NavHost(
             enterTransition = { enterTransition() },
@@ -177,7 +187,9 @@ fun HorizonNavigation(navController: NavHostController, modifier: Modifier = Mod
                             moduleItemAssetId = assignmentId?.toString()
                         )
                     ) {
-                        popUpTo(MainNavigationRoute.AssignmentDetailsDeepLink.route) { inclusive = true }
+                        popUpTo(MainNavigationRoute.AssignmentDetailsDeepLink.route) {
+                            inclusive = true
+                        }
                     }
                 }
             }
@@ -214,7 +226,9 @@ fun HorizonNavigation(navController: NavHostController, modifier: Modifier = Mod
                             moduleItemAssetId = quizId?.toString()
                         )
                     ) {
-                        popUpTo(MainNavigationRoute.QuizDetailsDeepLink.route) { inclusive = true }
+                        popUpTo(MainNavigationRoute.QuizDetailsDeepLink.route) {
+                            inclusive = true
+                        }
                     }
                 }
             }
@@ -249,7 +263,9 @@ fun HorizonNavigation(navController: NavHostController, modifier: Modifier = Mod
                             moduleItemAssetId = pageId
                         )
                     ) {
-                        popUpTo(MainNavigationRoute.PageDetailsDeepLink.route) { inclusive = true }
+                        popUpTo(MainNavigationRoute.PageDetailsDeepLink.route) {
+                            inclusive = true
+                        }
                     }
                 }
             }
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigationTransitionRules.kt b/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigationTransitionRules.kt
index d60e49b55b..abc9cea2c6 100644
--- a/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigationTransitionRules.kt
+++ b/libs/horizon/src/main/java/com/instructure/horizon/navigation/HorizonNavigationTransitionRules.kt
@@ -107,6 +107,11 @@ val animationRules = listOf(
         to = LearnRoute.LearnCourseDetailsScreen.route,
         style = NavigationTransitionAnimation.SLIDE
     ),
+    NavigationTransitionAnimationRule(
+        from = LearnRoute.LearnScreen.route,
+        to = LearnRoute.LearnLearningLibraryDetailsScreen.route,
+        style = NavigationTransitionAnimation.SLIDE
+    ),
 )
 
 private val Any.serializableRoute: String
diff --git a/libs/horizon/src/main/java/com/instructure/horizon/util/HorizonEdgeToEdgeHelper.kt b/libs/horizon/src/main/java/com/instructure/horizon/util/HorizonEdgeToEdgeHelper.kt
new file mode 100644
index 0000000000..66564bcb87
--- /dev/null
+++ b/libs/horizon/src/main/java/com/instructure/horizon/util/HorizonEdgeToEdgeHelper.kt
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2025 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.util
+
+import android.app.Activity
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.layout.windowInsetsEndWidth
+import androidx.compose.foundation.layout.windowInsetsStartWidth
+import androidx.compose.foundation.layout.windowInsetsTopHeight
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.luminance
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.unit.coerceAtLeast
+import androidx.compose.ui.unit.dp
+import androidx.core.view.WindowCompat
+import com.instructure.horizon.horizonui.foundation.HorizonColors
+
+@Composable
+fun HorizonEdgeToEdgeSystemBars(
+    statusBarColor: Color? = HorizonColors.Surface.pagePrimary(),
+    navigationBarColor: Color? = null,
+    modifier: Modifier = Modifier,
+    statusBarAlpha: Float = 0.8f,
+    navigationBarAlpha: Float = 0.8f,
+    content: @Composable (statusBarWindowInsets: WindowInsets, navigationBarWindowInsets: WindowInsets) -> Unit
+) {
+    val statusBarWindowsInsets = if (statusBarColor != null) {
+        WindowInsets.statusBars.union(
+            WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
+        )
+    } else {
+        WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
+    }
+
+    val navigationBarWindowsInsets = if (navigationBarColor != null) {
+        WindowInsets.navigationBars
+    } else {
+        WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal)
+    }
+    val view = LocalView.current
+
+    SideEffect {
+        val window = (view.context as? Activity)?.window ?: return@SideEffect
+        val insetsController = WindowCompat.getInsetsController(window, view)
+
+        statusBarColor?.let { color ->
+            val isLight = color.luminance() > 0.5f
+            insetsController.isAppearanceLightStatusBars = isLight
+        }
+
+        navigationBarColor?.let { color ->
+            val isLight = color.luminance() > 0.5f
+            insetsController.isAppearanceLightNavigationBars = isLight
+        }
+    }
+
+    Box {
+        content(statusBarWindowsInsets, navigationBarWindowsInsets)
+        statusBarColor?.let {
+            Box(
+                modifier = modifier
+                    .align(Alignment.TopCenter)
+                    .fillMaxWidth()
+                    .windowInsetsTopHeight(WindowInsets.statusBars)
+                    .padding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal).asPaddingValues())
+                    .background(statusBarColor.copy(alpha = statusBarAlpha))
+            )
+        }
+
+        navigationBarColor?.let {
+            Box(
+                modifier = modifier
+                    .align(Alignment.BottomCenter)
+                    .fillMaxWidth()
+                    .windowInsetsBottomHeight(WindowInsets.navigationBars)
+                    .padding(WindowInsets.navigationBars.only(WindowInsetsSides.Horizontal).asPaddingValues())
+                    .background(navigationBarColor.copy(alpha = navigationBarAlpha))
+            )
+        }
+
+        Box(
+            modifier = modifier
+                .align(Alignment.CenterStart)
+                .fillMaxHeight()
+                .windowInsetsStartWidth(WindowInsets.navigationBars)
+                .background(navigationBarColor?.copy(alpha = navigationBarAlpha) ?: Color.Transparent)
+        )
+
+        Box(
+            modifier = modifier
+                .align(Alignment.CenterEnd)
+                .fillMaxHeight()
+                .windowInsetsEndWidth(WindowInsets.navigationBars)
+                .background(navigationBarColor?.copy(alpha = navigationBarAlpha) ?: Color.Transparent)
+        )
+    }
+}
+
+private val WindowInsetsSides.Companion.BottomHorizontalSides: WindowInsetsSides
+    get() = WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom
+
+private val WindowInsetsSides.Companion.TopHorizontalSides: WindowInsetsSides
+    get() = WindowInsetsSides.Horizontal + WindowInsetsSides.Top
+
+val WindowInsets.Companion.zeroScreenInsets: WindowInsets
+    get() = WindowInsets(0, 0, 0, 0)
+
+val WindowInsets.Companion.topHorizontalWindowInsets: WindowInsets
+    @Composable
+    get() = WindowInsets.safeDrawing.only(WindowInsetsSides.TopHorizontalSides)
+
+val WindowInsets.Companion.bottomHorizontalWindowInsets: WindowInsets
+    @Composable
+    get() = WindowInsets.safeDrawing.only(WindowInsetsSides.BottomHorizontalSides)
+
+val WindowInsets.Companion.horizontalSafeDrawing: WindowInsets
+    @Composable
+    get() = WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
+
+val WindowInsets.Companion.verticalSafeDrawing: WindowInsets
+    @Composable
+    get() = WindowInsets.safeDrawing.only(WindowInsetsSides.Vertical)
+
+val WindowInsets.Companion.topSafeDrawing: WindowInsets
+    @Composable
+    get() = WindowInsets.safeDrawing.only(WindowInsetsSides.Top)
+
+val WindowInsets.Companion.bottomSafeDrawing: WindowInsets
+    @Composable
+    get() = WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom)
+
+val WindowInsets.Companion.fullScreenInsets: WindowInsets
+    @Composable
+    get() = WindowInsets.safeDrawing
+
+@Composable
+operator fun PaddingValues.plus(other: PaddingValues): PaddingValues {
+    val layoutDirection = LocalLayoutDirection.current
+    return PaddingValues(
+        start = this.calculateStartPadding(layoutDirection) + other.calculateStartPadding(layoutDirection),
+        top = this.calculateTopPadding() + other.calculateTopPadding(),
+        end = this.calculateEndPadding(layoutDirection) + other.calculateEndPadding(layoutDirection),
+        bottom = this.calculateBottomPadding() + other.calculateBottomPadding()
+    )
+}
+
+@Composable
+operator fun PaddingValues.minus(other: PaddingValues): PaddingValues {
+    val layoutDirection = LocalLayoutDirection.current
+    return PaddingValues(
+        start = (this.calculateStartPadding(layoutDirection) - other.calculateStartPadding(layoutDirection)).coerceAtLeast(0.dp),
+        top = (this.calculateTopPadding() - other.calculateTopPadding()).coerceAtLeast(0.dp),
+        end = (this.calculateEndPadding(layoutDirection) - other.calculateEndPadding(layoutDirection)).coerceAtLeast(0.dp),
+        bottom = (this.calculateBottomPadding() - other.calculateBottomPadding()).coerceAtLeast(0.dp)
+    )
+}
\ No newline at end of file
diff --git a/libs/horizon/src/main/res/drawable/bookmark_fill.xml b/libs/horizon/src/main/res/drawable/bookmark_fill.xml
new file mode 100644
index 0000000000..372d699f15
--- /dev/null
+++ b/libs/horizon/src/main/res/drawable/bookmark_fill.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12 17.4615L8.03075 19.1652C7.42825 19.4229 6.85583 19.3736 6.3135 19.0173C5.77117 18.6609 5.5 18.1597 5.5 17.5135V5.30775C5.5 4.80258 5.675 4.375 6.025 4.025C6.375 3.675 6.80258 3.5 7.30775 3.5H16.6923C17.1974 3.5 17.625 3.675 17.975 4.025C18.325 4.375 18.5 4.80258 18.5 5.30775V17.5135C18.5 18.1597 18.2288 18.6609 17.6865 19.0173C17.1442 19.3736 16.5718 19.4229 15.9693 19.1652L12 17.4615Z"
+      android:fillColor="#273540"/>
+</vector>
diff --git a/libs/horizon/src/main/res/drawable/fast_check.xml b/libs/horizon/src/main/res/drawable/fast_check.xml
new file mode 100644
index 0000000000..21f20b7902
--- /dev/null
+++ b/libs/horizon/src/main/res/drawable/fast_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="10dp"
+    android:viewportWidth="12"
+    android:viewportHeight="10">
+  <path
+      android:pathData="M1.05452 9.91667C0.75984 9.91667 0.510417 9.81458 0.30625 9.61042C0.102083 9.40625 0 9.15683 0 8.86215V1.05452C0 0.75984 0.102083 0.510417 0.30625 0.30625C0.510417 0.102083 0.75984 0 1.05452 0H10.0288C10.3235 0 10.5729 0.102083 10.7771 0.30625C10.9813 0.510417 11.0833 0.75984 11.0833 1.05452V8.86215C11.0833 9.15683 10.9813 9.40625 10.7771 9.61042C10.5729 9.81458 10.3235 9.91667 10.0288 9.91667H1.05452ZM1.05452 9.04167H10.0288C10.0737 9.04167 10.1149 9.02295 10.1522 8.98552C10.1896 8.94819 10.2083 8.90706 10.2083 8.86215V1.05452C10.2083 1.0096 10.1896 0.968479 10.1522 0.931145C10.1149 0.893715 10.0737 0.875 10.0288 0.875H1.05452C1.0096 0.875 0.968479 0.893715 0.931146 0.931145C0.893715 0.968479 0.875 1.0096 0.875 1.05452V8.86215C0.875 8.90706 0.893715 8.94819 0.931146 8.98552C0.968479 9.02295 1.0096 9.04167 1.05452 9.04167ZM3.79167 7.72917C3.91582 7.72917 4.01975 7.68726 4.10346 7.60346C4.18726 7.51975 4.22917 7.41582 4.22917 7.29167C4.22917 7.16751 4.18726 7.06358 4.10346 6.97987C4.01975 6.89607 3.91582 6.85417 3.79167 6.85417H2.04167C1.91751 6.85417 1.81358 6.89607 1.72988 6.97987C1.64607 7.06358 1.60417 7.16751 1.60417 7.29167C1.60417 7.41582 1.64607 7.51975 1.72988 7.60346C1.81358 7.68726 1.91751 7.72917 2.04167 7.72917H3.79167ZM7.02917 5.26794L6.50533 4.7441C6.41851 4.65738 6.31604 4.61456 6.19792 4.61563C6.07979 4.61679 5.97732 4.66258 5.8905 4.753C5.80981 4.83982 5.76888 4.94229 5.76771 5.06042C5.76664 5.17854 5.80947 5.28101 5.89619 5.36783L6.66006 6.13171C6.76555 6.23719 6.88858 6.28994 7.02917 6.28994C7.16975 6.28994 7.29279 6.23719 7.39827 6.13171L9.40173 4.12825C9.48845 4.04143 9.53279 3.93988 9.53473 3.8236C9.53658 3.70733 9.49224 3.60393 9.40173 3.51342C9.31122 3.423 9.20729 3.37779 9.08994 3.37779C8.97249 3.37779 8.86851 3.423 8.778 3.51342L7.02917 5.26794ZM3.79167 5.39583C3.91582 5.39583 4.01975 5.35393 4.10346 5.27013C4.18726 5.18642 4.22917 5.08249 4.22917 4.95833C4.22917 4.83418 4.18726 4.73025 4.10346 4.64654C4.01975 4.56274 3.91582 4.52083 3.79167 4.52083H2.04167C1.91751 4.52083 1.81358 4.56274 1.72988 4.64654C1.64607 4.73025 1.60417 4.83418 1.60417 4.95833C1.60417 5.08249 1.64607 5.18642 1.72988 5.27013C1.81358 5.35393 1.91751 5.39583 2.04167 5.39583H3.79167ZM3.79167 3.0625C3.91582 3.0625 4.01975 3.0206 4.10346 2.93679C4.18726 2.85308 4.22917 2.74915 4.22917 2.625C4.22917 2.50085 4.18726 2.39692 4.10346 2.31321C4.01975 2.2294 3.91582 2.1875 3.79167 2.1875H2.04167C1.91751 2.1875 1.81358 2.2294 1.72988 2.31321C1.64607 2.39692 1.60417 2.50085 1.60417 2.625C1.60417 2.74915 1.64607 2.85308 1.72988 2.93679C1.81358 3.0206 1.91751 3.0625 2.04167 3.0625H3.79167Z"
+      android:fillColor="#273540"/>
+</vector>
diff --git a/libs/horizon/src/main/res/drawable/tune.xml b/libs/horizon/src/main/res/drawable/tune.xml
new file mode 100644
index 0000000000..06b6a7227a
--- /dev/null
+++ b/libs/horizon/src/main/res/drawable/tune.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.9998 20.75C11.7871 20.75 11.609 20.6781 11.4655 20.5343C11.3218 20.3906 11.25 20.2125 11.25 20V16C11.25 15.7875 11.3219 15.6094 11.4658 15.4658C11.6096 15.3219 11.7878 15.25 12.0003 15.25C12.2129 15.25 12.391 15.3219 12.5345 15.4658C12.6782 15.6094 12.75 15.7875 12.75 16V17.25H20C20.2125 17.25 20.3906 17.3219 20.5343 17.4657C20.6781 17.6096 20.75 17.7878 20.75 18.0002C20.75 18.2129 20.6781 18.391 20.5343 18.5345C20.3906 18.6782 20.2125 18.75 20 18.75H12.75V20C12.75 20.2125 12.6781 20.3906 12.5343 20.5343C12.3904 20.6781 12.2122 20.75 11.9998 20.75ZM4 18.75C3.7875 18.75 3.60942 18.6781 3.46575 18.5343C3.32192 18.3904 3.25 18.2122 3.25 17.9998C3.25 17.7871 3.32192 17.609 3.46575 17.4655C3.60942 17.3218 3.7875 17.25 4 17.25H8C8.2125 17.25 8.39058 17.3219 8.53425 17.4657C8.67808 17.6096 8.75 17.7878 8.75 18.0002C8.75 18.2129 8.67808 18.391 8.53425 18.5345C8.39058 18.6782 8.2125 18.75 8 18.75H4ZM7.99975 14.75C7.78708 14.75 7.609 14.6781 7.4655 14.5343C7.32183 14.3906 7.25 14.2125 7.25 14V12.75H4C3.7875 12.75 3.60942 12.6781 3.46575 12.5343C3.32192 12.3904 3.25 12.2122 3.25 11.9998C3.25 11.7871 3.32192 11.609 3.46575 11.4655C3.60942 11.3218 3.7875 11.25 4 11.25H7.25V10C7.25 9.7875 7.32192 9.60942 7.46575 9.46575C7.60958 9.32192 7.78775 9.25 8.00025 9.25C8.21292 9.25 8.391 9.32192 8.5345 9.46575C8.67817 9.60942 8.75 9.7875 8.75 10V14C8.75 14.2125 8.67808 14.3906 8.53425 14.5343C8.39042 14.6781 8.21225 14.75 7.99975 14.75ZM12 12.75C11.7875 12.75 11.6094 12.6781 11.4658 12.5343C11.3219 12.3904 11.25 12.2122 11.25 11.9998C11.25 11.7871 11.3219 11.609 11.4658 11.4655C11.6094 11.3218 11.7875 11.25 12 11.25H20C20.2125 11.25 20.3906 11.3219 20.5343 11.4658C20.6781 11.6096 20.75 11.7878 20.75 12.0003C20.75 12.2129 20.6781 12.391 20.5343 12.5345C20.3906 12.6782 20.2125 12.75 20 12.75H12ZM15.9998 8.75C15.7871 8.75 15.609 8.67808 15.4655 8.53425C15.3218 8.39058 15.25 8.2125 15.25 8V4C15.25 3.7875 15.3219 3.60942 15.4658 3.46575C15.6096 3.32192 15.7878 3.25 16.0002 3.25C16.2129 3.25 16.391 3.32192 16.5345 3.46575C16.6782 3.60942 16.75 3.7875 16.75 4V5.25H20C20.2125 5.25 20.3906 5.32192 20.5343 5.46575C20.6781 5.60958 20.75 5.78775 20.75 6.00025C20.75 6.21292 20.6781 6.391 20.5343 6.5345C20.3906 6.67817 20.2125 6.75 20 6.75H16.75V8C16.75 8.2125 16.6781 8.39058 16.5343 8.53425C16.3904 8.67808 16.2122 8.75 15.9998 8.75ZM4 6.75C3.7875 6.75 3.60942 6.67808 3.46575 6.53425C3.32192 6.39042 3.25 6.21225 3.25 5.99975C3.25 5.78708 3.32192 5.609 3.46575 5.4655C3.60942 5.32183 3.7875 5.25 4 5.25H12C12.2125 5.25 12.3906 5.32192 12.5343 5.46575C12.6781 5.60958 12.75 5.78775 12.75 6.00025C12.75 6.21292 12.6781 6.391 12.5343 6.5345C12.3906 6.67817 12.2125 6.75 12 6.75H4Z"
+      android:fillColor="#273540"/>
+</vector>
diff --git a/libs/horizon/src/main/res/values-ar/strings.xml b/libs/horizon/src/main/res/values-ar/strings.xml
index 6623397433..1065aed01a 100644
--- a/libs/horizon/src/main/res/values-ar/strings.xml
+++ b/libs/horizon/src/main/res/values-ar/strings.xml
@@ -553,10 +553,40 @@
     <string name="a11y_nextModuleItem">عنصر الوحدة النمطية التالية</string>
     <string name="a11y_nextModule">الوحدة النمطية التالية</string>
     <string name="a11y_notebookHighlightMarkedAs">تم تمييز %1$s كـ %2$s، اضغط مرتين لتحرير الملاحظة</string>
+    <string name="learnCoursesTabLabel">المساقات</string>
+    <string name="learnProgramsTabLabel">البرامج</string>
     <string name="reportAProblemDescriptionMessage">تقديم بطاقة لطلب استجابة شخصية من فريق الدعم لدينا.</string>
     <string name="igniteAIEnterAPromptLabel">أدخل مطالبة</string>
     <string name="a11y_igniteAiLoadingContentDescription">جارٍ تحميل الاستجابة</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">قلب البطاقة</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">تعذر تحميل المساقات</string>
+    <string name="learnCourseListFilterAll">جميع المساقات</string>
+    <string name="learnCourseListFilterNotStarted">لم يتم البدء</string>
+    <string name="learnCourseListFilterInProgress">قيد التقدم</string>
+    <string name="learnCourseListFilterCompleted">تم الإكمال</string>
+    <string name="learnCourseListStartLearningLabel">البدء في التعلم</string>
+    <string name="learnCourseListResumeLearningLabel">استئناف التعلم</string>
+    <string name="learnCourseListViewCourseLabel"> عرض المساق</string>
+    <string name="learnCourseListShowMoreLabel">إظهار المزيد</string>
+    <string name="learnCourseListSearchBarPlaceholder">البحث في المساقات</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">جزء من %1$s</string>
+    <string name="learnCourseListEmptyMessage">لم يتم العثور على نتائج. جرب تعديل مصطلحات البحث الخاصة بك.</string>
+    <string name="learnProgramListFilterAll">كل البرامج</string>
+    <string name="learnProgramListFilterNotStarted">لم يتم البدء</string>
+    <string name="learnProgramListFilterInProgress">قيد التقدم</string>
+    <string name="learnProgramListFilterCompleted">تم الإكمال</string>
+    <string name="learnProgramListShowMoreLabel">إظهار المزيد</string>
+    <string name="learnProgramListEmptyMessage">لم يتم العثور على نتائج. جرب تعديل مصطلحات البحث الخاصة بك.</string>
+    <string name="learnProgramListSearchBarPlaceholder">البحث عن البرامج</string>
+    <string name="learnProgramListFailedToLoadMessage">فشل تحميل البرامج</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="zero">%1$d من المساقات</item>
+        <item quantity="one">%1$d المساق</item>
+        <item quantity="two">%1$d من المساقات</item>
+        <item quantity="few">%1$d من المساقات</item>
+        <item quantity="many">%1$d من المساقات</item>
+        <item quantity="other">%1$d من المساقات</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">خطأ: %1$s</string>
     <string name="a11y_required">مطلوب</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+da+DK+instk12/strings.xml b/libs/horizon/src/main/res/values-b+da+DK+instk12/strings.xml
index 2a3321c293..9388dc12a3 100644
--- a/libs/horizon/src/main/res/values-b+da+DK+instk12/strings.xml
+++ b/libs/horizon/src/main/res/values-b+da+DK+instk12/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Næste forløbelement</string>
     <string name="a11y_nextModule">Næste forløb</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, markeret som %2$s, dobbelttryk for at redigere noten</string>
+    <string name="learnCoursesTabLabel">Fag</string>
+    <string name="learnProgramsTabLabel">Programmer</string>
     <string name="reportAProblemDescriptionMessage">Indsend besked for et personligt svar fra vores supportteam</string>
     <string name="igniteAIEnterAPromptLabel">Indtast en prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Indlæser svar</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Vend kortet</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Kunne ikke indlæse fag</string>
+    <string name="learnCourseListFilterAll">Alle fag</string>
+    <string name="learnCourseListFilterNotStarted">Ikke startet</string>
+    <string name="learnCourseListFilterInProgress">I gang</string>
+    <string name="learnCourseListFilterCompleted">Fuldført</string>
+    <string name="learnCourseListStartLearningLabel">Begynd at lære</string>
+    <string name="learnCourseListResumeLearningLabel">Genoptag læring</string>
+    <string name="learnCourseListViewCourseLabel">Vis fag</string>
+    <string name="learnCourseListShowMoreLabel">Vis mere</string>
+    <string name="learnCourseListSearchBarPlaceholder">Søg fag</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">En del af %1$s</string>
+    <string name="learnCourseListEmptyMessage">Ingen resultater fundet. Prøv at justere dine søgeord.</string>
+    <string name="learnProgramListFilterAll">Alle programmer</string>
+    <string name="learnProgramListFilterNotStarted">Ikke startet</string>
+    <string name="learnProgramListFilterInProgress">I gang</string>
+    <string name="learnProgramListFilterCompleted">Fuldført</string>
+    <string name="learnProgramListShowMoreLabel">Vis mere</string>
+    <string name="learnProgramListEmptyMessage">Ingen resultater fundet. Prøv at justere dine søgeord.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Søg i programmer</string>
+    <string name="learnProgramListFailedToLoadMessage">Kunne ikke indlæse programmer</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d fag</item>
+        <item quantity="other">%1$d fag</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Fejl: %1$s</string>
     <string name="a11y_required">Påkrævet</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+en+AU+unimelb/strings.xml b/libs/horizon/src/main/res/values-b+en+AU+unimelb/strings.xml
index 4228118824..2f6d4e7d29 100644
--- a/libs/horizon/src/main/res/values-b+en+AU+unimelb/strings.xml
+++ b/libs/horizon/src/main/res/values-b+en+AU+unimelb/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Next module item</string>
     <string name="a11y_nextModule">Next module</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marked as %2$s, double tap to edit note</string>
+    <string name="learnCoursesTabLabel">Subjects</string>
+    <string name="learnProgramsTabLabel">Programs</string>
     <string name="reportAProblemDescriptionMessage">File a ticket for a personal response from our support team.</string>
     <string name="igniteAIEnterAPromptLabel">Enter a prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Loading response</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Flip the card</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Failed to load subjects</string>
+    <string name="learnCourseListFilterAll">All subjects</string>
+    <string name="learnCourseListFilterNotStarted">Not started</string>
+    <string name="learnCourseListFilterInProgress">In progress</string>
+    <string name="learnCourseListFilterCompleted">Completed</string>
+    <string name="learnCourseListStartLearningLabel">Start learning</string>
+    <string name="learnCourseListResumeLearningLabel">Resume learning</string>
+    <string name="learnCourseListViewCourseLabel">View subject</string>
+    <string name="learnCourseListShowMoreLabel">Show more</string>
+    <string name="learnCourseListSearchBarPlaceholder">Search subjects</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Part of %1$s</string>
+    <string name="learnCourseListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListFilterAll">All programs</string>
+    <string name="learnProgramListFilterNotStarted">Not started</string>
+    <string name="learnProgramListFilterInProgress">In progress</string>
+    <string name="learnProgramListFilterCompleted">Completed</string>
+    <string name="learnProgramListShowMoreLabel">Show more</string>
+    <string name="learnProgramListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Search programs</string>
+    <string name="learnProgramListFailedToLoadMessage">Failed to load programs</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d subject</item>
+        <item quantity="other">%1$d subjects</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Required</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+en+GB+instukhe/strings.xml b/libs/horizon/src/main/res/values-b+en+GB+instukhe/strings.xml
index 5c9fd31abb..3d874fe76d 100644
--- a/libs/horizon/src/main/res/values-b+en+GB+instukhe/strings.xml
+++ b/libs/horizon/src/main/res/values-b+en+GB+instukhe/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Next unit item</string>
     <string name="a11y_nextModule">Next unit</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marked as %2$s, double tap to edit note</string>
+    <string name="learnCoursesTabLabel">Modules</string>
+    <string name="learnProgramsTabLabel">Programmes</string>
     <string name="reportAProblemDescriptionMessage">File a ticket for a personal response from our support team.</string>
     <string name="igniteAIEnterAPromptLabel">Enter a prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Loading response</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Flip the card</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Failed to load modules</string>
+    <string name="learnCourseListFilterAll">All modules</string>
+    <string name="learnCourseListFilterNotStarted">Not started</string>
+    <string name="learnCourseListFilterInProgress">In progress</string>
+    <string name="learnCourseListFilterCompleted">Completed</string>
+    <string name="learnCourseListStartLearningLabel">Start learning</string>
+    <string name="learnCourseListResumeLearningLabel">Resume learning</string>
+    <string name="learnCourseListViewCourseLabel">View module</string>
+    <string name="learnCourseListShowMoreLabel">Show more</string>
+    <string name="learnCourseListSearchBarPlaceholder">Search modules</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Part of %1$s</string>
+    <string name="learnCourseListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListFilterAll">All programs</string>
+    <string name="learnProgramListFilterNotStarted">Not started</string>
+    <string name="learnProgramListFilterInProgress">In progress</string>
+    <string name="learnProgramListFilterCompleted">Completed</string>
+    <string name="learnProgramListShowMoreLabel">Show more</string>
+    <string name="learnProgramListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Search programs</string>
+    <string name="learnProgramListFailedToLoadMessage">Failed to load programs</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d module</item>
+        <item quantity="other">%1$d modules</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Required</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+nb+NO+instk12/strings.xml b/libs/horizon/src/main/res/values-b+nb+NO+instk12/strings.xml
index 4b88ddda81..28f8dc23f1 100644
--- a/libs/horizon/src/main/res/values-b+nb+NO+instk12/strings.xml
+++ b/libs/horizon/src/main/res/values-b+nb+NO+instk12/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Neste modulelement</string>
     <string name="a11y_nextModule">Neste modul</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, merket som %2$s, dobbelttrykk for å redigere notatet</string>
+    <string name="learnCoursesTabLabel">Fag</string>
+    <string name="learnProgramsTabLabel">Programmer</string>
     <string name="reportAProblemDescriptionMessage">Send inn en personlig melding for personlig respons fra vårt support-team.</string>
     <string name="igniteAIEnterAPromptLabel">Skriv inn et spørsmål</string>
     <string name="a11y_igniteAiLoadingContentDescription">Laster inn svar</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Snu kortet</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Kunne ikke laste inn fag</string>
+    <string name="learnCourseListFilterAll">Alle åpne fag</string>
+    <string name="learnCourseListFilterNotStarted">Ikke startet</string>
+    <string name="learnCourseListFilterInProgress">Pågår</string>
+    <string name="learnCourseListFilterCompleted">Fullført</string>
+    <string name="learnCourseListStartLearningLabel">Begynn å lære</string>
+    <string name="learnCourseListResumeLearningLabel">Fortsett læring</string>
+    <string name="learnCourseListViewCourseLabel">Vis fag</string>
+    <string name="learnCourseListShowMoreLabel">Vis mer</string>
+    <string name="learnCourseListSearchBarPlaceholder">Søk etter fag</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Del av %1$s</string>
+    <string name="learnCourseListEmptyMessage">Fant ingen resultater. Prøv å endre søkeordene dine.</string>
+    <string name="learnProgramListFilterAll">Alle programmer</string>
+    <string name="learnProgramListFilterNotStarted">Ikke startet</string>
+    <string name="learnProgramListFilterInProgress">Pågår</string>
+    <string name="learnProgramListFilterCompleted">Fullført</string>
+    <string name="learnProgramListShowMoreLabel">Vis mer</string>
+    <string name="learnProgramListEmptyMessage">Fant ingen resultater. Prøv å endre søkeordene dine.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Søk etter programmer</string>
+    <string name="learnProgramListFailedToLoadMessage">Kunne ikke laste inn programmer</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d fag</item>
+        <item quantity="other">%1$d fag</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Feil: %1$s</string>
     <string name="a11y_required">Obligatorisk</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+sv+SE+instk12/strings.xml b/libs/horizon/src/main/res/values-b+sv+SE+instk12/strings.xml
index 927b72e2bf..b166667fdc 100644
--- a/libs/horizon/src/main/res/values-b+sv+SE+instk12/strings.xml
+++ b/libs/horizon/src/main/res/values-b+sv+SE+instk12/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Nästa modulobjekt</string>
     <string name="a11y_nextModule">Nästa modul</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, markerad som %2$s, dubbeltryck för att redigera anteckning</string>
+    <string name="learnCoursesTabLabel">Kurser</string>
+    <string name="learnProgramsTabLabel">Program</string>
     <string name="reportAProblemDescriptionMessage">Registrera ett ärende för ett personligt svar från vårt supportteam.</string>
     <string name="igniteAIEnterAPromptLabel">Ange en prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Läser in svar</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Vänd på kortet</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Det gick inte att läsa in kurser</string>
+    <string name="learnCourseListFilterAll">Alla kurser</string>
+    <string name="learnCourseListFilterNotStarted">Ej startade</string>
+    <string name="learnCourseListFilterInProgress">Pågår</string>
+    <string name="learnCourseListFilterCompleted">Slutförd</string>
+    <string name="learnCourseListStartLearningLabel">Börja inlärningen</string>
+    <string name="learnCourseListResumeLearningLabel">Återuppta lärande</string>
+    <string name="learnCourseListViewCourseLabel">Visa kursen</string>
+    <string name="learnCourseListShowMoreLabel">Visa mer</string>
+    <string name="learnCourseListSearchBarPlaceholder">Sök efter kurser</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Del av %1$s</string>
+    <string name="learnCourseListEmptyMessage">Inga resultat hittades. Prova att ändra söktermerna.</string>
+    <string name="learnProgramListFilterAll">Alla program</string>
+    <string name="learnProgramListFilterNotStarted">Ej startade</string>
+    <string name="learnProgramListFilterInProgress">Pågår</string>
+    <string name="learnProgramListFilterCompleted">Slutförd</string>
+    <string name="learnProgramListShowMoreLabel">Visa mer</string>
+    <string name="learnProgramListEmptyMessage">Inga resultat hittades. Prova att ändra söktermerna.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Sök efter program</string>
+    <string name="learnProgramListFailedToLoadMessage">Det gick inte att läsa in programmen</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d kurs</item>
+        <item quantity="other">%1$d kurser</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Fel: %1$s</string>
     <string name="a11y_required">Obligatorisk</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+zh+HK/strings.xml b/libs/horizon/src/main/res/values-b+zh+HK/strings.xml
index e73ae84ddc..2b191ab437 100644
--- a/libs/horizon/src/main/res/values-b+zh+HK/strings.xml
+++ b/libs/horizon/src/main/res/values-b+zh+HK/strings.xml
@@ -503,10 +503,35 @@
     <string name="a11y_nextModuleItem">下一個單元項目</string>
     <string name="a11y_nextModule">下一個單元</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s 標記為 %2$s，點選兩下以編輯筆記</string>
+    <string name="learnCoursesTabLabel">課程</string>
+    <string name="learnProgramsTabLabel">項目</string>
     <string name="reportAProblemDescriptionMessage">提交票證，以獲取支援團隊親自回覆。</string>
     <string name="igniteAIEnterAPromptLabel">輸入提示</string>
     <string name="a11y_igniteAiLoadingContentDescription">載入回應</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">翻轉卡片</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">無法載入課程</string>
+    <string name="learnCourseListFilterAll">所有課程</string>
+    <string name="learnCourseListFilterNotStarted">未開始</string>
+    <string name="learnCourseListFilterInProgress">進行中</string>
+    <string name="learnCourseListFilterCompleted">已完成</string>
+    <string name="learnCourseListStartLearningLabel">開始學習</string>
+    <string name="learnCourseListResumeLearningLabel">繼續學習</string>
+    <string name="learnCourseListViewCourseLabel">檢視課程</string>
+    <string name="learnCourseListShowMoreLabel">顯示更多</string>
+    <string name="learnCourseListSearchBarPlaceholder">搜尋課程</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">部份 %1$s</string>
+    <string name="learnCourseListEmptyMessage">找不到結果。請嘗試調整您的搜尋詞彙。</string>
+    <string name="learnProgramListFilterAll">所有程式</string>
+    <string name="learnProgramListFilterNotStarted">未開始</string>
+    <string name="learnProgramListFilterInProgress">進行中</string>
+    <string name="learnProgramListFilterCompleted">已完成</string>
+    <string name="learnProgramListShowMoreLabel">顯示更多</string>
+    <string name="learnProgramListEmptyMessage">找不到結果。請嘗試調整您的搜尋詞彙。</string>
+    <string name="learnProgramListSearchBarPlaceholder">搜尋程式</string>
+    <string name="learnProgramListFailedToLoadMessage">無法載入程式</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="other">%1$d 個課程</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">錯誤：%1$s</string>
     <string name="a11y_required">必填</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+zh+Hans/strings.xml b/libs/horizon/src/main/res/values-b+zh+Hans/strings.xml
index 9eaa9a7a1f..0c947df97a 100644
--- a/libs/horizon/src/main/res/values-b+zh+Hans/strings.xml
+++ b/libs/horizon/src/main/res/values-b+zh+Hans/strings.xml
@@ -503,10 +503,35 @@
     <string name="a11y_nextModuleItem">下一个模块项目</string>
     <string name="a11y_nextModule">下一个模块</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s，标记为%2$s，双击以编辑笔记</string>
+    <string name="learnCoursesTabLabel">课程</string>
+    <string name="learnProgramsTabLabel">项目</string>
     <string name="reportAProblemDescriptionMessage">向我们的支持团队提问。</string>
     <string name="igniteAIEnterAPromptLabel">输入提示</string>
     <string name="a11y_igniteAiLoadingContentDescription">加载回应</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">翻转卡片</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">加载课程失败</string>
+    <string name="learnCourseListFilterAll">所有课程</string>
+    <string name="learnCourseListFilterNotStarted">未开始</string>
+    <string name="learnCourseListFilterInProgress">进行中</string>
+    <string name="learnCourseListFilterCompleted">已完成</string>
+    <string name="learnCourseListStartLearningLabel">开始学习</string>
+    <string name="learnCourseListResumeLearningLabel">恢复学习</string>
+    <string name="learnCourseListViewCourseLabel">查看课程</string>
+    <string name="learnCourseListShowMoreLabel">显示更多</string>
+    <string name="learnCourseListSearchBarPlaceholder">搜索课程</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">%1$s 的一部分</string>
+    <string name="learnCourseListEmptyMessage">未找到结果。尝试调整搜索词。</string>
+    <string name="learnProgramListFilterAll">所有计划</string>
+    <string name="learnProgramListFilterNotStarted">未开始</string>
+    <string name="learnProgramListFilterInProgress">进行中</string>
+    <string name="learnProgramListFilterCompleted">已完成</string>
+    <string name="learnProgramListShowMoreLabel">显示更多</string>
+    <string name="learnProgramListEmptyMessage">未找到结果。尝试调整搜索词</string>
+    <string name="learnProgramListSearchBarPlaceholder">搜索计划</string>
+    <string name="learnProgramListFailedToLoadMessage">加载计划失败</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="other">%1$d 门课程</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">错误：%1$s</string>
     <string name="a11y_required">必填</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-b+zh+Hant/strings.xml b/libs/horizon/src/main/res/values-b+zh+Hant/strings.xml
index e73ae84ddc..2b191ab437 100644
--- a/libs/horizon/src/main/res/values-b+zh+Hant/strings.xml
+++ b/libs/horizon/src/main/res/values-b+zh+Hant/strings.xml
@@ -503,10 +503,35 @@
     <string name="a11y_nextModuleItem">下一個單元項目</string>
     <string name="a11y_nextModule">下一個單元</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s 標記為 %2$s，點選兩下以編輯筆記</string>
+    <string name="learnCoursesTabLabel">課程</string>
+    <string name="learnProgramsTabLabel">項目</string>
     <string name="reportAProblemDescriptionMessage">提交票證，以獲取支援團隊親自回覆。</string>
     <string name="igniteAIEnterAPromptLabel">輸入提示</string>
     <string name="a11y_igniteAiLoadingContentDescription">載入回應</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">翻轉卡片</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">無法載入課程</string>
+    <string name="learnCourseListFilterAll">所有課程</string>
+    <string name="learnCourseListFilterNotStarted">未開始</string>
+    <string name="learnCourseListFilterInProgress">進行中</string>
+    <string name="learnCourseListFilterCompleted">已完成</string>
+    <string name="learnCourseListStartLearningLabel">開始學習</string>
+    <string name="learnCourseListResumeLearningLabel">繼續學習</string>
+    <string name="learnCourseListViewCourseLabel">檢視課程</string>
+    <string name="learnCourseListShowMoreLabel">顯示更多</string>
+    <string name="learnCourseListSearchBarPlaceholder">搜尋課程</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">部份 %1$s</string>
+    <string name="learnCourseListEmptyMessage">找不到結果。請嘗試調整您的搜尋詞彙。</string>
+    <string name="learnProgramListFilterAll">所有程式</string>
+    <string name="learnProgramListFilterNotStarted">未開始</string>
+    <string name="learnProgramListFilterInProgress">進行中</string>
+    <string name="learnProgramListFilterCompleted">已完成</string>
+    <string name="learnProgramListShowMoreLabel">顯示更多</string>
+    <string name="learnProgramListEmptyMessage">找不到結果。請嘗試調整您的搜尋詞彙。</string>
+    <string name="learnProgramListSearchBarPlaceholder">搜尋程式</string>
+    <string name="learnProgramListFailedToLoadMessage">無法載入程式</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="other">%1$d 個課程</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">錯誤：%1$s</string>
     <string name="a11y_required">必填</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-ca/strings.xml b/libs/horizon/src/main/res/values-ca/strings.xml
index a2c97a8075..f7e7c1be36 100644
--- a/libs/horizon/src/main/res/values-ca/strings.xml
+++ b/libs/horizon/src/main/res/values-ca/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Element del mòdul següent</string>
     <string name="a11y_nextModule">Mòdul següent</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, s’ha marcat com a %2$s, toqueu-hi dues vegades per editar la nota</string>
+    <string name="learnCoursesTabLabel">Assignatures</string>
+    <string name="learnProgramsTabLabel">Programes</string>
     <string name="reportAProblemDescriptionMessage">Presenteu una sol·licitud de resposta personal del nostre equip de suport tècnic.</string>
     <string name="igniteAIEnterAPromptLabel">Introduïu una sol·licitud</string>
     <string name="a11y_igniteAiLoadingContentDescription">S’està carregant la resposta</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Feu voltar la targeta</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">No s\'han pogut carregar les assignatures</string>
+    <string name="learnCourseListFilterAll">Totes les assignatures</string>
+    <string name="learnCourseListFilterNotStarted">No s’ha iniciat</string>
+    <string name="learnCourseListFilterInProgress">En curs</string>
+    <string name="learnCourseListFilterCompleted">S’ha completat</string>
+    <string name="learnCourseListStartLearningLabel">Comenceu a aprendre</string>
+    <string name="learnCourseListResumeLearningLabel">Repreneu l’aprenentatge</string>
+    <string name="learnCourseListViewCourseLabel">Visualitzeu l\'assignatura</string>
+    <string name="learnCourseListShowMoreLabel">Mostreu-ne més</string>
+    <string name="learnCourseListSearchBarPlaceholder">Cerqueu assignatures</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Part de %1$s</string>
+    <string name="learnCourseListEmptyMessage">No s\'ha trobat cap resultat. Proveu d’ajustar els termes de cerca.</string>
+    <string name="learnProgramListFilterAll">Tots els programes</string>
+    <string name="learnProgramListFilterNotStarted">No s’ha iniciat</string>
+    <string name="learnProgramListFilterInProgress">En curs</string>
+    <string name="learnProgramListFilterCompleted">S’ha completat</string>
+    <string name="learnProgramListShowMoreLabel">Mostreu-ne més</string>
+    <string name="learnProgramListEmptyMessage">No s\'ha trobat cap resultat. Proveu d’ajustar els termes de cerca.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Cerqueu programes</string>
+    <string name="learnProgramListFailedToLoadMessage">No s\'han pogut carregar els programes</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d assignatura</item>
+        <item quantity="other">%1$d assignatures</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Obligatori</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-cy/strings.xml b/libs/horizon/src/main/res/values-cy/strings.xml
index f7b0635b5b..bd9862ce01 100644
--- a/libs/horizon/src/main/res/values-cy/strings.xml
+++ b/libs/horizon/src/main/res/values-cy/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Eitem modiwl nesaf</string>
     <string name="a11y_nextModule">Modiwl nesaf</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, wedi’i farcio fel %2$s, tapiwch ddwywaith i olygu’r nodyn</string>
+    <string name="learnCoursesTabLabel">Cyrsiau</string>
+    <string name="learnProgramsTabLabel">Rhaglenni</string>
     <string name="reportAProblemDescriptionMessage">Gallwch ffeilio tocyn i gael ymateb personol gan ein tîm cymorth.</string>
     <string name="igniteAIEnterAPromptLabel">Rhowch awgrym</string>
     <string name="a11y_igniteAiLoadingContentDescription">Wrthi’n llwytho ymateb</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Troi’r cerdyn drosodd</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Wedi methu llwytho cyrsiau</string>
+    <string name="learnCourseListFilterAll">Pob cwrs</string>
+    <string name="learnCourseListFilterNotStarted">Heb ddechrau</string>
+    <string name="learnCourseListFilterInProgress">Ar y gweill</string>
+    <string name="learnCourseListFilterCompleted">Wedi cwblhau</string>
+    <string name="learnCourseListStartLearningLabel">Dechrau dysgu</string>
+    <string name="learnCourseListResumeLearningLabel">Ailddechrau dysgu</string>
+    <string name="learnCourseListViewCourseLabel">Gweld cwrs</string>
+    <string name="learnCourseListShowMoreLabel">Dangos mwy</string>
+    <string name="learnCourseListSearchBarPlaceholder">Chwilio am gyrsiau</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Rhan o %1$s</string>
+    <string name="learnCourseListEmptyMessage">Heb ddod o hyd i ganlyniadau. Rhowch gynnig ar newid eich termau chwilio.</string>
+    <string name="learnProgramListFilterAll">Pob rhaglen</string>
+    <string name="learnProgramListFilterNotStarted">Heb ddechrau</string>
+    <string name="learnProgramListFilterInProgress">Ar y gweill</string>
+    <string name="learnProgramListFilterCompleted">Wedi cwblhau</string>
+    <string name="learnProgramListShowMoreLabel">Dangos mwy</string>
+    <string name="learnProgramListEmptyMessage">Heb ddod o hyd i ganlyniadau. Rhowch gynnig ar newid eich termau chwilio.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Chwilio am raglenni</string>
+    <string name="learnProgramListFailedToLoadMessage">Wedi methu llwytho rhaglenni</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d cwrs</item>
+        <item quantity="other">%1$d o gyrsiau</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Gwall: %1$s</string>
     <string name="a11y_required">Gofynnol</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-da/strings.xml b/libs/horizon/src/main/res/values-da/strings.xml
index cd2d5d5a94..6e82e1f30d 100644
--- a/libs/horizon/src/main/res/values-da/strings.xml
+++ b/libs/horizon/src/main/res/values-da/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Næste modulelement</string>
     <string name="a11y_nextModule">Næste modul</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, markeret som %2$s, dobbelttryk for at redigere noten</string>
+    <string name="learnCoursesTabLabel">Fag</string>
+    <string name="learnProgramsTabLabel">Programmer</string>
     <string name="reportAProblemDescriptionMessage">Indsend besked for et personligt svar fra vores supportteam</string>
     <string name="igniteAIEnterAPromptLabel">Indtast en prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Indlæser svar</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Vend kortet</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Kunne ikke indlæse fag</string>
+    <string name="learnCourseListFilterAll">Alle fag</string>
+    <string name="learnCourseListFilterNotStarted">Ikke startet</string>
+    <string name="learnCourseListFilterInProgress">I gang</string>
+    <string name="learnCourseListFilterCompleted">Fuldført</string>
+    <string name="learnCourseListStartLearningLabel">Begynd at lære</string>
+    <string name="learnCourseListResumeLearningLabel">Genoptag læring</string>
+    <string name="learnCourseListViewCourseLabel">Vis fag</string>
+    <string name="learnCourseListShowMoreLabel">Vis mere</string>
+    <string name="learnCourseListSearchBarPlaceholder">Søg fag</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">En del af %1$s</string>
+    <string name="learnCourseListEmptyMessage">Ingen resultater fundet. Prøv at justere dine søgeord.</string>
+    <string name="learnProgramListFilterAll">Alle programmer</string>
+    <string name="learnProgramListFilterNotStarted">Ikke startet</string>
+    <string name="learnProgramListFilterInProgress">I gang</string>
+    <string name="learnProgramListFilterCompleted">Fuldført</string>
+    <string name="learnProgramListShowMoreLabel">Vis mere</string>
+    <string name="learnProgramListEmptyMessage">Ingen resultater fundet. Prøv at justere dine søgeord.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Søg i programmer</string>
+    <string name="learnProgramListFailedToLoadMessage">Kunne ikke indlæse programmer</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d fag</item>
+        <item quantity="other">%1$d fag</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Fejl: %1$s</string>
     <string name="a11y_required">Påkrævet</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-de/strings.xml b/libs/horizon/src/main/res/values-de/strings.xml
index a016c551bb..e98e246395 100644
--- a/libs/horizon/src/main/res/values-de/strings.xml
+++ b/libs/horizon/src/main/res/values-de/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Nächstes Modul-Element</string>
     <string name="a11y_nextModule">Nächstes Modul</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, markiert als %2$s, Doppeltippen zum Bearbeiten der Notiz</string>
+    <string name="learnCoursesTabLabel">Kurse</string>
+    <string name="learnProgramsTabLabel">Programme</string>
     <string name="reportAProblemDescriptionMessage">Eine Anfrage an unser Supportteam senden</string>
     <string name="igniteAIEnterAPromptLabel">Aufforderung eingeben</string>
     <string name="a11y_igniteAiLoadingContentDescription">Antwort wird geladen</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Karte umdrehen</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Kurse konnten nicht geladen werden</string>
+    <string name="learnCourseListFilterAll">Alle Kurse</string>
+    <string name="learnCourseListFilterNotStarted">Nicht gestartet</string>
+    <string name="learnCourseListFilterInProgress">In Bearbeitung</string>
+    <string name="learnCourseListFilterCompleted">Fertiggestellt</string>
+    <string name="learnCourseListStartLearningLabel">Mit dem Lernen beginnen</string>
+    <string name="learnCourseListResumeLearningLabel">Lernen fortsetzen</string>
+    <string name="learnCourseListViewCourseLabel">Kurs anzeigen</string>
+    <string name="learnCourseListShowMoreLabel">Mehr anzeigen</string>
+    <string name="learnCourseListSearchBarPlaceholder">Kurse suchen</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Teil von %1$s</string>
+    <string name="learnCourseListEmptyMessage">Keine Ergebnisse gefunden. Versuchen Sie, Ihre Suchbegriffe anzupassen.</string>
+    <string name="learnProgramListFilterAll">Alle Programme</string>
+    <string name="learnProgramListFilterNotStarted">Nicht gestartet</string>
+    <string name="learnProgramListFilterInProgress">In Bearbeitung</string>
+    <string name="learnProgramListFilterCompleted">Fertiggestellt</string>
+    <string name="learnProgramListShowMoreLabel">Mehr anzeigen</string>
+    <string name="learnProgramListEmptyMessage">Keine Ergebnisse gefunden. Versuchen Sie, Ihre Suchbegriffe anzupassen.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Programme suchen</string>
+    <string name="learnProgramListFailedToLoadMessage">Programme konnten nicht geladen werden</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d Kurs</item>
+        <item quantity="other">%1$d Kurse</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Fehler: %1$s</string>
     <string name="a11y_required">Erforderlich</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-en-rAU/strings.xml b/libs/horizon/src/main/res/values-en-rAU/strings.xml
index e51c9bfdd1..8fab9e3e58 100644
--- a/libs/horizon/src/main/res/values-en-rAU/strings.xml
+++ b/libs/horizon/src/main/res/values-en-rAU/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Next module item</string>
     <string name="a11y_nextModule">Next module</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marked as %2$s, double tap to edit note</string>
+    <string name="learnCoursesTabLabel">Courses</string>
+    <string name="learnProgramsTabLabel">Programs</string>
     <string name="reportAProblemDescriptionMessage">File a ticket for a personal response from our support team.</string>
     <string name="igniteAIEnterAPromptLabel">Enter a prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Loading response</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Flip the card</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Failed to load courses</string>
+    <string name="learnCourseListFilterAll">All courses</string>
+    <string name="learnCourseListFilterNotStarted">Not started</string>
+    <string name="learnCourseListFilterInProgress">In progress</string>
+    <string name="learnCourseListFilterCompleted">Completed</string>
+    <string name="learnCourseListStartLearningLabel">Start learning</string>
+    <string name="learnCourseListResumeLearningLabel">Resume learning</string>
+    <string name="learnCourseListViewCourseLabel">View course</string>
+    <string name="learnCourseListShowMoreLabel">Show more</string>
+    <string name="learnCourseListSearchBarPlaceholder">Search courses</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Part of %1$s</string>
+    <string name="learnCourseListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListFilterAll">All programs</string>
+    <string name="learnProgramListFilterNotStarted">Not started</string>
+    <string name="learnProgramListFilterInProgress">In progress</string>
+    <string name="learnProgramListFilterCompleted">Completed</string>
+    <string name="learnProgramListShowMoreLabel">Show more</string>
+    <string name="learnProgramListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Search programs</string>
+    <string name="learnProgramListFailedToLoadMessage">Failed to load programs</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d course</item>
+        <item quantity="other">%1$d courses</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Required</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-en-rCY/strings.xml b/libs/horizon/src/main/res/values-en-rCY/strings.xml
index 5c9fd31abb..3d874fe76d 100644
--- a/libs/horizon/src/main/res/values-en-rCY/strings.xml
+++ b/libs/horizon/src/main/res/values-en-rCY/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Next unit item</string>
     <string name="a11y_nextModule">Next unit</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marked as %2$s, double tap to edit note</string>
+    <string name="learnCoursesTabLabel">Modules</string>
+    <string name="learnProgramsTabLabel">Programmes</string>
     <string name="reportAProblemDescriptionMessage">File a ticket for a personal response from our support team.</string>
     <string name="igniteAIEnterAPromptLabel">Enter a prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Loading response</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Flip the card</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Failed to load modules</string>
+    <string name="learnCourseListFilterAll">All modules</string>
+    <string name="learnCourseListFilterNotStarted">Not started</string>
+    <string name="learnCourseListFilterInProgress">In progress</string>
+    <string name="learnCourseListFilterCompleted">Completed</string>
+    <string name="learnCourseListStartLearningLabel">Start learning</string>
+    <string name="learnCourseListResumeLearningLabel">Resume learning</string>
+    <string name="learnCourseListViewCourseLabel">View module</string>
+    <string name="learnCourseListShowMoreLabel">Show more</string>
+    <string name="learnCourseListSearchBarPlaceholder">Search modules</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Part of %1$s</string>
+    <string name="learnCourseListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListFilterAll">All programs</string>
+    <string name="learnProgramListFilterNotStarted">Not started</string>
+    <string name="learnProgramListFilterInProgress">In progress</string>
+    <string name="learnProgramListFilterCompleted">Completed</string>
+    <string name="learnProgramListShowMoreLabel">Show more</string>
+    <string name="learnProgramListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Search programs</string>
+    <string name="learnProgramListFailedToLoadMessage">Failed to load programs</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d module</item>
+        <item quantity="other">%1$d modules</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Required</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-en-rGB/strings.xml b/libs/horizon/src/main/res/values-en-rGB/strings.xml
index 3f67eab35c..442dde6197 100644
--- a/libs/horizon/src/main/res/values-en-rGB/strings.xml
+++ b/libs/horizon/src/main/res/values-en-rGB/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Next module item</string>
     <string name="a11y_nextModule">Next module</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marked as %2$s, double tap to edit note</string>
+    <string name="learnCoursesTabLabel">Courses</string>
+    <string name="learnProgramsTabLabel">Programmes</string>
     <string name="reportAProblemDescriptionMessage">File a ticket for a personal response from our support team.</string>
     <string name="igniteAIEnterAPromptLabel">Enter a prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Loading response</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Flip the card</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Failed to load courses</string>
+    <string name="learnCourseListFilterAll">All courses</string>
+    <string name="learnCourseListFilterNotStarted">Not started</string>
+    <string name="learnCourseListFilterInProgress">In progress</string>
+    <string name="learnCourseListFilterCompleted">Completed</string>
+    <string name="learnCourseListStartLearningLabel">Start learning</string>
+    <string name="learnCourseListResumeLearningLabel">Resume learning</string>
+    <string name="learnCourseListViewCourseLabel">View course</string>
+    <string name="learnCourseListShowMoreLabel">Show more</string>
+    <string name="learnCourseListSearchBarPlaceholder">Search courses</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Part of %1$s</string>
+    <string name="learnCourseListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListFilterAll">All programs</string>
+    <string name="learnProgramListFilterNotStarted">Not started</string>
+    <string name="learnProgramListFilterInProgress">In progress</string>
+    <string name="learnProgramListFilterCompleted">Completed</string>
+    <string name="learnProgramListShowMoreLabel">Show more</string>
+    <string name="learnProgramListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Search programs</string>
+    <string name="learnProgramListFailedToLoadMessage">Failed to load programs</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d course</item>
+        <item quantity="other">%1$d courses</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Required</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-en/strings.xml b/libs/horizon/src/main/res/values-en/strings.xml
index 6802b60496..a5eca76fbf 100644
--- a/libs/horizon/src/main/res/values-en/strings.xml
+++ b/libs/horizon/src/main/res/values-en/strings.xml
@@ -512,10 +512,36 @@
     <string name="a11y_nextModuleItem">Next module item</string>
     <string name="a11y_nextModule">Next module</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marked as %2$s, double tap to edit note</string>
+    <string name="learnCoursesTabLabel">Courses</string>
+    <string name="learnProgramsTabLabel">Programs</string>
     <string name="reportAProblemDescriptionMessage">File a ticket for a personal response from our support team.</string>
     <string name="igniteAIEnterAPromptLabel">Enter a prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Loading response</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Flip the card</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Failed to load courses</string>
+    <string name="learnCourseListFilterAll">All courses</string>
+    <string name="learnCourseListFilterNotStarted">Not started</string>
+    <string name="learnCourseListFilterInProgress">In progress</string>
+    <string name="learnCourseListFilterCompleted">Completed</string>
+    <string name="learnCourseListStartLearningLabel">Start learning</string>
+    <string name="learnCourseListResumeLearningLabel">Resume learning</string>
+    <string name="learnCourseListViewCourseLabel">View course</string>
+    <string name="learnCourseListShowMoreLabel">Show more</string>
+    <string name="learnCourseListSearchBarPlaceholder">Search courses</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Part of %1$s</string>
+    <string name="learnCourseListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListFilterAll">All programs</string>
+    <string name="learnProgramListFilterNotStarted">Not started</string>
+    <string name="learnProgramListFilterInProgress">In progress</string>
+    <string name="learnProgramListFilterCompleted">Completed</string>
+    <string name="learnProgramListShowMoreLabel">Show more</string>
+    <string name="learnProgramListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Search programs</string>
+    <string name="learnProgramListFailedToLoadMessage">Failed to load programs</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d course</item>
+        <item quantity="other">%1$d courses</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Required</string>
 </resources>
\ No newline at end of file
diff --git a/libs/horizon/src/main/res/values-es-rES/strings.xml b/libs/horizon/src/main/res/values-es-rES/strings.xml
index 193e884f20..01a6174dd3 100644
--- a/libs/horizon/src/main/res/values-es-rES/strings.xml
+++ b/libs/horizon/src/main/res/values-es-rES/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Ítem del contenido siguiente</string>
     <string name="a11y_nextModule">Contenido siguiente</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marcado como %2$s, toca dos veces para editar la anotación</string>
+    <string name="learnCoursesTabLabel">Asignaturas</string>
+    <string name="learnProgramsTabLabel">Programas</string>
     <string name="reportAProblemDescriptionMessage">Crea un ticket para obtener una respuesta personal de nuestro equipo de asistencia técnica.</string>
     <string name="igniteAIEnterAPromptLabel">Introducir un mensaje</string>
     <string name="a11y_igniteAiLoadingContentDescription">Carga de la respuesta</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Dar la vuelta a la tarjeta</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">No se han podido cargar las asignaturas</string>
+    <string name="learnCourseListFilterAll">Todas las asignaturas</string>
+    <string name="learnCourseListFilterNotStarted">Sin empezar</string>
+    <string name="learnCourseListFilterInProgress">En curso</string>
+    <string name="learnCourseListFilterCompleted">Completada</string>
+    <string name="learnCourseListStartLearningLabel">Comenzar a aprender</string>
+    <string name="learnCourseListResumeLearningLabel">Reanudar el aprendizaje</string>
+    <string name="learnCourseListViewCourseLabel">Ver asignatura</string>
+    <string name="learnCourseListShowMoreLabel">Mostrar más</string>
+    <string name="learnCourseListSearchBarPlaceholder">Buscar asignaturas</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Parte de %1$s</string>
+    <string name="learnCourseListEmptyMessage">No se han encontrado resultados. Intenta ajustar tus términos de búsqueda.</string>
+    <string name="learnProgramListFilterAll">Todos los programas</string>
+    <string name="learnProgramListFilterNotStarted">Sin empezar</string>
+    <string name="learnProgramListFilterInProgress">En curso</string>
+    <string name="learnProgramListFilterCompleted">Completado</string>
+    <string name="learnProgramListShowMoreLabel">Mostrar más</string>
+    <string name="learnProgramListEmptyMessage">No se han encontrado resultados. Intenta ajustar tus términos de búsqueda.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Buscar programas</string>
+    <string name="learnProgramListFailedToLoadMessage">No se han podido cargar los programas</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d asignatura</item>
+        <item quantity="other">%1$d asignaturas</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Obligatorio</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-es/strings.xml b/libs/horizon/src/main/res/values-es/strings.xml
index c83f9b47e3..4f7142a044 100644
--- a/libs/horizon/src/main/res/values-es/strings.xml
+++ b/libs/horizon/src/main/res/values-es/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Ítem del módulo siguiente</string>
     <string name="a11y_nextModule">Módulo siguiente</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marcado como %2$s, toque dos veces para editar la nota</string>
+    <string name="learnCoursesTabLabel">Cursos</string>
+    <string name="learnProgramsTabLabel">Programas</string>
     <string name="reportAProblemDescriptionMessage">Presentar un ticket para obtener una respuesta personal de nuestro equipo de asistencia técnica.</string>
     <string name="igniteAIEnterAPromptLabel">Ingresar un mensaje</string>
     <string name="a11y_igniteAiLoadingContentDescription">Cargando respuesta</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Voltear la tarjeta</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">No se pudieron cargar los cursos</string>
+    <string name="learnCourseListFilterAll">Todos los cursos</string>
+    <string name="learnCourseListFilterNotStarted">No iniciado</string>
+    <string name="learnCourseListFilterInProgress">En progreso</string>
+    <string name="learnCourseListFilterCompleted">Completado</string>
+    <string name="learnCourseListStartLearningLabel">Comenzar a aprender</string>
+    <string name="learnCourseListResumeLearningLabel">Reanudar aprendizaje</string>
+    <string name="learnCourseListViewCourseLabel">Ver curso</string>
+    <string name="learnCourseListShowMoreLabel">Mostrar más</string>
+    <string name="learnCourseListSearchBarPlaceholder">Buscar cursos</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Parte de %1$s</string>
+    <string name="learnCourseListEmptyMessage">No se encontraron resultados. Ajuste los términos de búsqueda.</string>
+    <string name="learnProgramListFilterAll">Todos los programas</string>
+    <string name="learnProgramListFilterNotStarted">No iniciado</string>
+    <string name="learnProgramListFilterInProgress">En progreso</string>
+    <string name="learnProgramListFilterCompleted">Completado</string>
+    <string name="learnProgramListShowMoreLabel">Mostrar más</string>
+    <string name="learnProgramListEmptyMessage">No se encontraron resultados. Ajuste los términos de búsqueda.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Buscar programas</string>
+    <string name="learnProgramListFailedToLoadMessage">No se pudieron cargar los programas</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d curso</item>
+        <item quantity="other">%1$d cursos</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Obligatorio</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-fi/strings.xml b/libs/horizon/src/main/res/values-fi/strings.xml
index e293dcf6a2..a06fe125e8 100644
--- a/libs/horizon/src/main/res/values-fi/strings.xml
+++ b/libs/horizon/src/main/res/values-fi/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Seuraava moduulikohde</string>
     <string name="a11y_nextModule">Seuraava moduuli</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, merkitty %2$s, muokkaa huomautusta kaksoisnapsauttamalla</string>
+    <string name="learnCoursesTabLabel">Kurssit</string>
+    <string name="learnProgramsTabLabel">Ohjelmat</string>
     <string name="reportAProblemDescriptionMessage">Lähetä palvelupyyntö ja pyydä henkilökohtainen vastaus tukitiimiltämme.</string>
     <string name="igniteAIEnterAPromptLabel">Syötä kehote</string>
     <string name="a11y_igniteAiLoadingContentDescription">Vastausta ladataan</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Käännä kortti</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Kurssien lataus epäonnistui</string>
+    <string name="learnCourseListFilterAll">Kaikki kurssit</string>
+    <string name="learnCourseListFilterNotStarted">Ei aloitettu</string>
+    <string name="learnCourseListFilterInProgress">Käynnissä</string>
+    <string name="learnCourseListFilterCompleted">Suoritettu</string>
+    <string name="learnCourseListStartLearningLabel">Aloita oppiminen</string>
+    <string name="learnCourseListResumeLearningLabel">Palaa opiskeluun</string>
+    <string name="learnCourseListViewCourseLabel">Tarkastele kurssia</string>
+    <string name="learnCourseListShowMoreLabel">Näytä lisää</string>
+    <string name="learnCourseListSearchBarPlaceholder">Hae kursseja</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Osa kohteesta %1$s</string>
+    <string name="learnCourseListEmptyMessage">Tuloksia ei löytynyt. Kokeile muokata hakusanojasi.</string>
+    <string name="learnProgramListFilterAll">Kaikki ohjelmat</string>
+    <string name="learnProgramListFilterNotStarted">Ei aloitettu</string>
+    <string name="learnProgramListFilterInProgress">Käynnissä</string>
+    <string name="learnProgramListFilterCompleted">Suoritettu</string>
+    <string name="learnProgramListShowMoreLabel">Näytä lisää</string>
+    <string name="learnProgramListEmptyMessage">Tuloksia ei löytynyt. Kokeile muokata hakusanojasi.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Hae ohjelmia</string>
+    <string name="learnProgramListFailedToLoadMessage">Ohjelmien lataus epäonnistui</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d kurssi</item>
+        <item quantity="other">%1$d kurssia</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Virhe: %1$s</string>
     <string name="a11y_required">Pakollinen</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-fr-rCA/strings.xml b/libs/horizon/src/main/res/values-fr-rCA/strings.xml
index e303998c84..5846eca283 100644
--- a/libs/horizon/src/main/res/values-fr-rCA/strings.xml
+++ b/libs/horizon/src/main/res/values-fr-rCA/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Point suivant du module</string>
     <string name="a11y_nextModule">Module suivant</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marqué comme %2$s, taper à 2 reprises pour éditer la note</string>
+    <string name="learnCoursesTabLabel">Cours</string>
+    <string name="learnProgramsTabLabel">Programmes</string>
     <string name="reportAProblemDescriptionMessage">Déposer un ticket pour obtenir une réponse personnelle de notre équipe de soutien.</string>
     <string name="igniteAIEnterAPromptLabel">Saisir une invite</string>
     <string name="a11y_igniteAiLoadingContentDescription">Chargement de la réponse</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Retourner la carte</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Échec du chargement des cours</string>
+    <string name="learnCourseListFilterAll">Tous les cours</string>
+    <string name="learnCourseListFilterNotStarted">Non démarré</string>
+    <string name="learnCourseListFilterInProgress">En cours</string>
+    <string name="learnCourseListFilterCompleted">Terminé</string>
+    <string name="learnCourseListStartLearningLabel">Commencer à apprendre</string>
+    <string name="learnCourseListResumeLearningLabel">Continuer l’apprentissage</string>
+    <string name="learnCourseListViewCourseLabel">Voir le cours</string>
+    <string name="learnCourseListShowMoreLabel">En montrer plus</string>
+    <string name="learnCourseListSearchBarPlaceholder">Rechercher des cours</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Partie de %1$s</string>
+    <string name="learnCourseListEmptyMessage">Aucun résultat trouvé Essayez d’adapter vos termes de recherche.</string>
+    <string name="learnProgramListFilterAll">Tous les programmes</string>
+    <string name="learnProgramListFilterNotStarted">Non démarré</string>
+    <string name="learnProgramListFilterInProgress">En cours</string>
+    <string name="learnProgramListFilterCompleted">Terminé</string>
+    <string name="learnProgramListShowMoreLabel">En montrer plus</string>
+    <string name="learnProgramListEmptyMessage">Aucun résultat trouvé Essayez d\'adapter vos termes de recherche.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Rechercher programmes</string>
+    <string name="learnProgramListFailedToLoadMessage">Échec du chargement des programmes</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d cours</item>
+        <item quantity="other">%1$d cours</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Erreur : %1$s</string>
     <string name="a11y_required">Requis</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-fr/strings.xml b/libs/horizon/src/main/res/values-fr/strings.xml
index 5ab6652589..1ef25094cb 100644
--- a/libs/horizon/src/main/res/values-fr/strings.xml
+++ b/libs/horizon/src/main/res/values-fr/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Élément de module suivant</string>
     <string name="a11y_nextModule">Module suivant</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marqué comme %2$s, appuyer deux fois pour modifier la note</string>
+    <string name="learnCoursesTabLabel">Cours</string>
+    <string name="learnProgramsTabLabel">Programmes</string>
     <string name="reportAProblemDescriptionMessage">Déposez un ticket pour obtenir une réponse personnelle de notre équipe de support.</string>
     <string name="igniteAIEnterAPromptLabel">Saisir une requête</string>
     <string name="a11y_igniteAiLoadingContentDescription">Chargement de la réponse</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Retourner la carte</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Impossible de charger les cours</string>
+    <string name="learnCourseListFilterAll">Tous les cours</string>
+    <string name="learnCourseListFilterNotStarted">Non commencé</string>
+    <string name="learnCourseListFilterInProgress">En cours</string>
+    <string name="learnCourseListFilterCompleted">Terminé</string>
+    <string name="learnCourseListStartLearningLabel">Commencer à apprendre</string>
+    <string name="learnCourseListResumeLearningLabel">Reprendre l’apprentissage</string>
+    <string name="learnCourseListViewCourseLabel">Afficher le cours</string>
+    <string name="learnCourseListShowMoreLabel">Afficher plus</string>
+    <string name="learnCourseListSearchBarPlaceholder">Rechercher des cours</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Une partie de %1$s</string>
+    <string name="learnCourseListEmptyMessage">Aucun résultat trouvé. Essayez d’affiner les termes de votre recherche.</string>
+    <string name="learnProgramListFilterAll">Tous les programmes</string>
+    <string name="learnProgramListFilterNotStarted">Non commencé</string>
+    <string name="learnProgramListFilterInProgress">En cours</string>
+    <string name="learnProgramListFilterCompleted">Terminé</string>
+    <string name="learnProgramListShowMoreLabel">Afficher plus</string>
+    <string name="learnProgramListEmptyMessage">Aucun résultat trouvé. Essayez d’affiner les termes de votre recherche.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Rechercher des programmes</string>
+    <string name="learnProgramListFailedToLoadMessage">Impossible de charger les programmes</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d cours</item>
+        <item quantity="other">%1$d cours</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Erreur : %1$s</string>
     <string name="a11y_required">Requis</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-ga/strings.xml b/libs/horizon/src/main/res/values-ga/strings.xml
index fa2035f8f8..25e516c86c 100644
--- a/libs/horizon/src/main/res/values-ga/strings.xml
+++ b/libs/horizon/src/main/res/values-ga/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Mír an chéad mhodúil eile</string>
     <string name="a11y_nextModule">An chéad mhodúl eile</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marcáilte mar %2$s, tapáil faoi dhó chun nóta a chur in eagar</string>
+    <string name="learnCoursesTabLabel">Cúrsaí</string>
+    <string name="learnProgramsTabLabel">Cláir</string>
     <string name="reportAProblemDescriptionMessage">Comhdaigh ticéad le haghaidh freagra pearsanta ónár bhfoireann tacaíochta.</string>
     <string name="igniteAIEnterAPromptLabel">Cuir isteach leid</string>
     <string name="a11y_igniteAiLoadingContentDescription">Freagra á lódáil</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Cas an cárta</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Theip ar chúrsaí a lódáil</string>
+    <string name="learnCourseListFilterAll">Cúrsaí Ar Fad</string>
+    <string name="learnCourseListFilterNotStarted">Níor tosaíodh</string>
+    <string name="learnCourseListFilterInProgress">Ar siúl</string>
+    <string name="learnCourseListFilterCompleted">Críochnaithe</string>
+    <string name="learnCourseListStartLearningLabel">Tosaigh ag foghlaim</string>
+    <string name="learnCourseListResumeLearningLabel">Lean ar aghaidh ag foghlaim</string>
+    <string name="learnCourseListViewCourseLabel">Féach ar an gcúrsa</string>
+    <string name="learnCourseListShowMoreLabel">Taispeáin tuilleadh</string>
+    <string name="learnCourseListSearchBarPlaceholder">Cuardaigh cúrsaí</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Cuid de %1$s</string>
+    <string name="learnCourseListEmptyMessage">Níor aimsíodh aon torthaí. Bain triail as do théarmaí cuardaigh a choigeartú.</string>
+    <string name="learnProgramListFilterAll">Gach clár</string>
+    <string name="learnProgramListFilterNotStarted">Níor tosaíodh</string>
+    <string name="learnProgramListFilterInProgress">Ar siúl</string>
+    <string name="learnProgramListFilterCompleted">Críochnaithe</string>
+    <string name="learnProgramListShowMoreLabel">Taispeáin tuilleadh</string>
+    <string name="learnProgramListEmptyMessage">Níor aimsíodh aon torthaí. Bain triail as do théarmaí cuardaigh a choigeartú.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Cuardaigh cláir</string>
+    <string name="learnProgramListFailedToLoadMessage">Theip ar lódáil na cláir</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d cúrsa</item>
+        <item quantity="other">%1$d cúrsa</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Earráid: %1$s</string>
     <string name="a11y_required">Ag teastáil</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-hi/strings.xml b/libs/horizon/src/main/res/values-hi/strings.xml
index b46d4f585f..67cc17a585 100644
--- a/libs/horizon/src/main/res/values-hi/strings.xml
+++ b/libs/horizon/src/main/res/values-hi/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">अगला मॉड्यूल आइटम</string>
     <string name="a11y_nextModule">अगला मॉड्यूल</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, जिसे %2$s के रूप में चिह्नित किया गया है, नोट संपादित करने के लिए दो बार टैप करें</string>
+    <string name="learnCoursesTabLabel">पाठ्यक्रम</string>
+    <string name="learnProgramsTabLabel">कार्यक्रम</string>
     <string name="reportAProblemDescriptionMessage">हमारी सहायता टीम से व्यक्तिगत प्रतिक्रिया पाने के लिए टिकट दाखिल करें।</string>
     <string name="igniteAIEnterAPromptLabel">प्रॉम्प्ट दर्ज करें</string>
     <string name="a11y_igniteAiLoadingContentDescription">प्रतिक्रिया लोड की जा रही है</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">कार्ड फ़्लिप करें</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">पाठ्यक्रम लोड करने में विफल</string>
+    <string name="learnCourseListFilterAll">सभी पाठ्यक्रम</string>
+    <string name="learnCourseListFilterNotStarted">शुरू नहीं हुआ</string>
+    <string name="learnCourseListFilterInProgress">प्रगति में</string>
+    <string name="learnCourseListFilterCompleted">पूरा हुआ</string>
+    <string name="learnCourseListStartLearningLabel">सीखना शुरू करें</string>
+    <string name="learnCourseListResumeLearningLabel">सीखना फिर से शुरू करें</string>
+    <string name="learnCourseListViewCourseLabel">पाठ्यक्रम देखें</string>
+    <string name="learnCourseListShowMoreLabel">और अधिक दिखाएं</string>
+    <string name="learnCourseListSearchBarPlaceholder">पाठ्यक्रम खोजें</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">%1$s का हिस्सा</string>
+    <string name="learnCourseListEmptyMessage">कोई नतीजा नहीं मिला। अपने खोज शब्द समायोजित करने की कोशिश करें।</string>
+    <string name="learnProgramListFilterAll">सभी कार्यक्रम</string>
+    <string name="learnProgramListFilterNotStarted">शुरू नहीं हुआ</string>
+    <string name="learnProgramListFilterInProgress">प्रगति में</string>
+    <string name="learnProgramListFilterCompleted">पूरा हुआ</string>
+    <string name="learnProgramListShowMoreLabel">और अधिक दिखाएं</string>
+    <string name="learnProgramListEmptyMessage">कोई नतीजा नहीं मिला। अपने खोज शब्द समायोजित करने की कोशिश करें।</string>
+    <string name="learnProgramListSearchBarPlaceholder">कार्यक्रम खोजें</string>
+    <string name="learnProgramListFailedToLoadMessage">कार्यक्रम लोड नहीं किए जा सके</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d पाठ्यक्रम</item>
+        <item quantity="other">%1$d पाठ्यक्रम</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">त्रुटि: %1$s</string>
     <string name="a11y_required">आवश्यक</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-ht/strings.xml b/libs/horizon/src/main/res/values-ht/strings.xml
index 1721f4b07f..83f93a938d 100644
--- a/libs/horizon/src/main/res/values-ht/strings.xml
+++ b/libs/horizon/src/main/res/values-ht/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Atik modil apre a</string>
     <string name="a11y_nextModule">pwochen modil la</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, make kòm %2$s, Tape de fwa pou modifye nòt la</string>
+    <string name="learnCoursesTabLabel">Kou</string>
+    <string name="learnProgramsTabLabel">Pwogram</string>
     <string name="reportAProblemDescriptionMessage">Depoze yon biyè pou ekip sipò nou an pou yon repons pèsonèl.</string>
     <string name="igniteAIEnterAPromptLabel">Antre yon demann</string>
     <string name="a11y_igniteAiLoadingContentDescription">Chajman repons</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Vire kat la</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Echwe pou chaje kou yo</string>
+    <string name="learnCourseListFilterAll">Tout kou yo</string>
+    <string name="learnCourseListFilterNotStarted">Pa kòmanse</string>
+    <string name="learnCourseListFilterInProgress">Ankou</string>
+    <string name="learnCourseListFilterCompleted">Fini</string>
+    <string name="learnCourseListStartLearningLabel">Kòmanse aprann</string>
+    <string name="learnCourseListResumeLearningLabel">Rekòmanse aprantisaj</string>
+    <string name="learnCourseListViewCourseLabel">Gade kou a</string>
+    <string name="learnCourseListShowMoreLabel">Afiche plis</string>
+    <string name="learnCourseListSearchBarPlaceholder">Chèche kou</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Pati nan %1$s</string>
+    <string name="learnCourseListEmptyMessage">Nou pa jwenn rezilta. Eseye ajiste tèm rechèch ou yo.</string>
+    <string name="learnProgramListFilterAll">Tout pwogram yo</string>
+    <string name="learnProgramListFilterNotStarted">Pa kòmanse</string>
+    <string name="learnProgramListFilterInProgress">Ankou</string>
+    <string name="learnProgramListFilterCompleted">Fini</string>
+    <string name="learnProgramListShowMoreLabel">Afiche plis</string>
+    <string name="learnProgramListEmptyMessage">Nou pa jwenn rezilta. Eseye ajiste tèm rechèch ou yo.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Chèche pwogram</string>
+    <string name="learnProgramListFailedToLoadMessage">Echèk pou chaje pwogram yo</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d kou</item>
+        <item quantity="other">%1$d kou</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Erè: %1$s</string>
     <string name="a11y_required">Obligatwa</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-id/strings.xml b/libs/horizon/src/main/res/values-id/strings.xml
index 4d087c5e27..3a6f4cf82c 100644
--- a/libs/horizon/src/main/res/values-id/strings.xml
+++ b/libs/horizon/src/main/res/values-id/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Item modul selanjutnya</string>
     <string name="a11y_nextModule">Modul selanjutnya</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, ditandai sebagai %2$s, ketuk dua kali untuk mengedit catatan</string>
+    <string name="learnCoursesTabLabel">Kursus</string>
+    <string name="learnProgramsTabLabel">Programs</string>
     <string name="reportAProblemDescriptionMessage">Ajukan tiket untuk respons pribadi dari tim dukungan kami.</string>
     <string name="igniteAIEnterAPromptLabel">Masukkan prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Memuat respons</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Balik kartu</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Gagal memuat kursus</string>
+    <string name="learnCourseListFilterAll">Semua kursus</string>
+    <string name="learnCourseListFilterNotStarted">Tidak dimulai</string>
+    <string name="learnCourseListFilterInProgress">Sedang berlangsung</string>
+    <string name="learnCourseListFilterCompleted">Selesai</string>
+    <string name="learnCourseListStartLearningLabel">Mulai pembelajaran</string>
+    <string name="learnCourseListResumeLearningLabel">Lanjutkan pembelajaran</string>
+    <string name="learnCourseListViewCourseLabel">Lihat kursus</string>
+    <string name="learnCourseListShowMoreLabel">Tampilkan lebih banyak</string>
+    <string name="learnCourseListSearchBarPlaceholder">Cari kursus</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Bagian dari %1$s</string>
+    <string name="learnCourseListEmptyMessage">Hasil tidak ditemukan. Cobalah menyesuaikan istilah pencarian Anda.</string>
+    <string name="learnProgramListFilterAll">Semua program</string>
+    <string name="learnProgramListFilterNotStarted">Tidak dimulai</string>
+    <string name="learnProgramListFilterInProgress">Sedang berlangsung</string>
+    <string name="learnProgramListFilterCompleted">Selesai</string>
+    <string name="learnProgramListShowMoreLabel">Tampilkan lebih banyak</string>
+    <string name="learnProgramListEmptyMessage">Hasil tidak ditemukan. Cobalah menyesuaikan istilah pencarian Anda.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Cari program</string>
+    <string name="learnProgramListFailedToLoadMessage">Gagal memuat program</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d kursus</item>
+        <item quantity="other">Kursus %1$d.</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Kesalahan: %1$s</string>
     <string name="a11y_required">Dibutuhkan</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-is/strings.xml b/libs/horizon/src/main/res/values-is/strings.xml
index 6abbf6f36d..f6cc8695be 100644
--- a/libs/horizon/src/main/res/values-is/strings.xml
+++ b/libs/horizon/src/main/res/values-is/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Næsta námsefnisatriði</string>
     <string name="a11y_nextModule">Næsta námsefni</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, merkt sem %2$s, pikkaðu tvisvar til að breyta glósu</string>
+    <string name="learnCoursesTabLabel">Námskeið</string>
+    <string name="learnProgramsTabLabel">Brautir</string>
     <string name="reportAProblemDescriptionMessage">Skrá beiðni um persónulegt svar frá hjálparsveit okkar.</string>
     <string name="igniteAIEnterAPromptLabel">Settu inn kvaðningu</string>
     <string name="a11y_igniteAiLoadingContentDescription">Hleður svar</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Snúa kortinu</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Ekki tókst að hlaða inn námskeiðum</string>
+    <string name="learnCourseListFilterAll">Öll námskeið</string>
+    <string name="learnCourseListFilterNotStarted">Ekki byrjað</string>
+    <string name="learnCourseListFilterInProgress">Í gangi</string>
+    <string name="learnCourseListFilterCompleted">Lokið</string>
+    <string name="learnCourseListStartLearningLabel">Hefja nám</string>
+    <string name="learnCourseListResumeLearningLabel">Halda áfram námi</string>
+    <string name="learnCourseListViewCourseLabel">Skoða námskeið</string>
+    <string name="learnCourseListShowMoreLabel">Sýna meira</string>
+    <string name="learnCourseListSearchBarPlaceholder">Leita í námskeiðum</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Hluti af %1$s</string>
+    <string name="learnCourseListEmptyMessage">Engar niðurstöður fundust. Prófaðu að breyta leitarorðinu.</string>
+    <string name="learnProgramListFilterAll">Allar brautir</string>
+    <string name="learnProgramListFilterNotStarted">Ekki byrjað</string>
+    <string name="learnProgramListFilterInProgress">Í gangi</string>
+    <string name="learnProgramListFilterCompleted">Lokið</string>
+    <string name="learnProgramListShowMoreLabel">Sýna meira</string>
+    <string name="learnProgramListEmptyMessage">Engar niðurstöður fundust. Prófaðu að breyta leitarorðinu.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Leita að brautum</string>
+    <string name="learnProgramListFailedToLoadMessage">Ekki tókst að hlaða inn brautum</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d námskeið</item>
+        <item quantity="other">%1$d námskeið</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Villa: %1$s</string>
     <string name="a11y_required">Krafist</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-it/strings.xml b/libs/horizon/src/main/res/values-it/strings.xml
index 5316c6e4fb..d15b586481 100644
--- a/libs/horizon/src/main/res/values-it/strings.xml
+++ b/libs/horizon/src/main/res/values-it/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Elemento modulo successivo</string>
     <string name="a11y_nextModule">Modulo successivo</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, contrassegnato come %2$s, tocca due volte per modificare la nota</string>
+    <string name="learnCoursesTabLabel">Corsi</string>
+    <string name="learnProgramsTabLabel">Programmi</string>
     <string name="reportAProblemDescriptionMessage">Archivia un ticket per una risposta personale dal nostro team di assistenza.</string>
     <string name="igniteAIEnterAPromptLabel">Inserisci richiesta</string>
     <string name="a11y_igniteAiLoadingContentDescription">Caricamento risposta</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Gira la scheda</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Impossibile caricare corsi</string>
+    <string name="learnCourseListFilterAll">Tutti i corsi</string>
+    <string name="learnCourseListFilterNotStarted">Non iniziata</string>
+    <string name="learnCourseListFilterInProgress">In corso</string>
+    <string name="learnCourseListFilterCompleted">Completato</string>
+    <string name="learnCourseListStartLearningLabel">Inizia apprendimento</string>
+    <string name="learnCourseListResumeLearningLabel">Riprendi apprendimento</string>
+    <string name="learnCourseListViewCourseLabel">Visualizza corso</string>
+    <string name="learnCourseListShowMoreLabel">Mostra di più</string>
+    <string name="learnCourseListSearchBarPlaceholder">Cerca corsi</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Parte di %1$s</string>
+    <string name="learnCourseListEmptyMessage">Nessun risultato trovato. Prova a modificare i termini di ricerca.</string>
+    <string name="learnProgramListFilterAll">Tutti i  programmi</string>
+    <string name="learnProgramListFilterNotStarted">Non iniziata</string>
+    <string name="learnProgramListFilterInProgress">In corso</string>
+    <string name="learnProgramListFilterCompleted">Completato</string>
+    <string name="learnProgramListShowMoreLabel">Mostra di più</string>
+    <string name="learnProgramListEmptyMessage">Nessun risultato trovato. Prova a modificare i termini di ricerca.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Cerca programmi</string>
+    <string name="learnProgramListFailedToLoadMessage">Impossibile caricare i programmi</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d corso</item>
+        <item quantity="other">%1$d corsi</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Errore: %1$s</string>
     <string name="a11y_required">Obbligatorio</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-ja/strings.xml b/libs/horizon/src/main/res/values-ja/strings.xml
index 1109eb4e79..1ea2563fe3 100644
--- a/libs/horizon/src/main/res/values-ja/strings.xml
+++ b/libs/horizon/src/main/res/values-ja/strings.xml
@@ -503,10 +503,35 @@
     <string name="a11y_nextModuleItem">次のモジュール項目</string>
     <string name="a11y_nextModule">次のモジュー</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s、%2$sは未読としてマーク、ダブルタップしてノートを編集する</string>
+    <string name="learnCoursesTabLabel">コース</string>
+    <string name="learnProgramsTabLabel">プログラム</string>
     <string name="reportAProblemDescriptionMessage">サポート チームからの個人向け応答のチケットを保存する。</string>
     <string name="igniteAIEnterAPromptLabel">プロンプトを入力</string>
     <string name="a11y_igniteAiLoadingContentDescription">応答を読み込み中</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">カードを裏返す</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">コースの読み込みに失敗しました</string>
+    <string name="learnCourseListFilterAll">全コース</string>
+    <string name="learnCourseListFilterNotStarted">開始されていない</string>
+    <string name="learnCourseListFilterInProgress">進行中</string>
+    <string name="learnCourseListFilterCompleted">完了</string>
+    <string name="learnCourseListStartLearningLabel">学習を開始する</string>
+    <string name="learnCourseListResumeLearningLabel">学習を再開する</string>
+    <string name="learnCourseListViewCourseLabel">コースを表示</string>
+    <string name="learnCourseListShowMoreLabel">多く表示</string>
+    <string name="learnCourseListSearchBarPlaceholder">コースの検索</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">%1$sの一部</string>
+    <string name="learnCourseListEmptyMessage">検索結果が見つかりません。検索項目を調整してみてください。</string>
+    <string name="learnProgramListFilterAll">すべてのプログラム</string>
+    <string name="learnProgramListFilterNotStarted">開始されていない</string>
+    <string name="learnProgramListFilterInProgress">進行中</string>
+    <string name="learnProgramListFilterCompleted">完了</string>
+    <string name="learnProgramListShowMoreLabel">多く表示</string>
+    <string name="learnProgramListEmptyMessage">検索結果が見つかりません。検索項目を調整してみてください。</string>
+    <string name="learnProgramListSearchBarPlaceholder">プログラムを検索する</string>
+    <string name="learnProgramListFailedToLoadMessage">プログラムの読み込みに失敗しました</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="other">%1$dコース</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">エラー: %1$s</string>
     <string name="a11y_required">必須</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-ko/strings.xml b/libs/horizon/src/main/res/values-ko/strings.xml
index 3239849848..75921440af 100644
--- a/libs/horizon/src/main/res/values-ko/strings.xml
+++ b/libs/horizon/src/main/res/values-ko/strings.xml
@@ -21,7 +21,7 @@
     <string name="bottomNav_learn">학습</string>
     <string name="bottomNav_skillspace">Skillspace</string>
     <string name="bottomNav_account">계정</string>
-    <string name="bottomNav_aiAssist">AI 어시스트</string>
+    <string name="bottomNav_igniteAI">IgniteAI</string>
     <string name="progressBar_percent">%1$s\%%</string>
     <string name="dashboard_resumeLearning">학습 다시 시작</string>
     <string name="learningObject_assignment">과제</string>
@@ -45,7 +45,7 @@
     <string name="fileDropSheet_takeVideo">동영상 촬영</string>
     <string name="fileDropSheet_chooseFile">파일 선택</string>
     <string name="avatar_contentDescription">아바타</string>
-    <string name="requiredMark">" *"</string>
+    <string name="inputRequiredMark">"*"</string>
     <string name="optionalMark">" (선택 사항)"</string>
     <string name="a11y_increaseValue">값 높이기</string>
     <string name="a11y_decreaseValue">값 낮추기</string>
@@ -116,9 +116,9 @@
     <string name="accountNotificationsLabel">알림</string>
     <string name="accountCalendarFeedLabel">캘린더 피드</string>
     <string name="accountAdvancedLabel">고급</string>
-    <string name="accountSupportHeading">지원</string>
+    <string name="accountHelpHeading">도움말</string>
     <string name="accountGiveFeedbackLabel">피드백 제공</string>
-    <string name="accountReportABug">버그 신고</string>
+    <string name="accountReportAProblem">문제 신고</string>
     <string name="accountBetaCommunityLabel">베타 커뮤니티</string>
     <string name="accountFullNameLabel">전체 이름</string>
     <string name="a11yNavigateBack">뒤로 탐색</string>
@@ -164,6 +164,22 @@
     <string name="accountNotificationsEnableNotificationButtonLabel">Android 알림 사용으로 설정</string>
     <string name="externalTool_openInANewTab">새 탭에서 열기</string>
     <string name="notificationsTitle">알림</string>
+    <string name="reportAProblemTitle">문제 신고</string>
+    <string name="reportAProblemTopic">주제</string>
+    <string name="reportAProblemTopicSuggestion">제안 또는 의견</string>
+    <string name="reportAProblemTopicGeneralHelp">일반 도움말</string>
+    <string name="reportAProblemTopicMinorIssue">경미한 문제</string>
+    <string name="reportAProblemTopicUrgentIssue">긴급한 문제</string>
+    <string name="reportAProblemTopicCriticalError">중요 시스템 오류</string>
+    <string name="reportAProblemTopicRequired">주제 선택</string>
+    <string name="reportAProblemSubject">과목</string>
+    <string name="reportAProblemDescription">설명</string>
+    <string name="reportAProblemCancel">취소</string>
+    <string name="reportAProblemSubmit">티켓 제출</string>
+    <string name="reportAProblemSubjectRequired">과목 입력</string>
+    <string name="reportAProblemDescriptionRequired">설명 추가</string>
+    <string name="reportAProblemSuccessMessage">티켓을 제출했습니다.</string>
+    <string name="reportAProblemErrorMessage">티켓을 제출할 수 없습니다. 다시 시도하세요.</string>
     <string name="notificationsEmptyMessage">아직 알림 활동이 없습니다.</string>
     <string name="notificationsFailedToRefresh">알림을 새로 고치지 못함</string>
     <string name="notificationsFailedToLoad">알림을 로드하지 못함</string>
@@ -180,10 +196,10 @@
     <string name="fileDetails_downloadFile">파일 다운로드</string>
     <string name="fileDetails_openWith">다른 프로그램으로 열기</string>
     <string name="fileDetails_downloadError">파일을 다운로드할 수 없습니다.</string>
-    <string name="aiAssistToolbarTitle">어시스트</string>
-    <string name="aiAssistDismissContentDescription">어시스트 해제</string>
-    <string name="a11y_aiAssistPositiveFeedback">긍정적 피드백으로 어시스트 등급 평가</string>
-    <string name="a11y_aiAssistNegativeFeedback">부정적 피드백으로 어시스트 등급 평가</string>
+    <string name="igniteAIToolbarTitle">IgniteAI</string>
+    <string name="igniteAIDismissContentDescription">IgniteAI 해제</string>
+    <string name="a11y_igniteAIPositiveFeedback">긍정적 피드백으로 IgniteAI 등급 평가</string>
+    <string name="a11y_igniteAINegativeFeedback">부정적 피드백으로 IgniteAI 등급 평가</string>
     <string name="aiAssistEnterAPromptLabel">프롬프트 입력</string>
     <string name="aiAssistSubmitPrompt">프롬프트 제출</string>
     <string name="aiAssistCheckAnswerLabel">응답 확인</string>
@@ -481,10 +497,41 @@
     <string name="a11y_unreadInboxMessage">읽지 않음</string>
     <string name="a11y_previousModuleItem">이전 모듈 문항</string>
     <string name="a11y_previousModule">이전 모듈</string>
-    <string name="a11y_openAIAssistant">AI 어시스턴트 열기</string>
+    <string name="a11y_openIgniteAI">IgniteAI 열기</string>
     <string name="a11y_openNotebook">노트북 열기</string>
     <string name="a11y_openMoreOptions">더 많은 옵션 열기</string>
     <string name="a11y_nextModuleItem">다음 모듈 문항</string>
     <string name="a11y_nextModule">다음 모듈</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s이(가) %2$s(으)로 표시됨. 두 번 탭하여 메모를 편집</string>
+    <string name="learnCoursesTabLabel">과목</string>
+    <string name="learnProgramsTabLabel">프로그램</string>
+    <string name="reportAProblemDescriptionMessage">지원 팀에게 개인 응답에 대해 티켓을 제출합니다.</string>
+    <string name="igniteAIEnterAPromptLabel">프롬프트 입력</string>
+    <string name="a11y_igniteAiLoadingContentDescription">응답 로드</string>
+    <string name="a11y_aiAssistFlashcardClickActionLabel">카드 뒤집기</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">과목을 로드하지 못함</string>
+    <string name="learnCourseListFilterAll">모든 과목</string>
+    <string name="learnCourseListFilterNotStarted">시작되지 않음</string>
+    <string name="learnCourseListFilterInProgress">진행 중</string>
+    <string name="learnCourseListFilterCompleted">완료됨</string>
+    <string name="learnCourseListStartLearningLabel">학습 시작</string>
+    <string name="learnCourseListResumeLearningLabel">학습 다시 시작</string>
+    <string name="learnCourseListViewCourseLabel">과목 보기</string>
+    <string name="learnCourseListShowMoreLabel">자세히 표시</string>
+    <string name="learnCourseListSearchBarPlaceholder">과목 검색</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">%1$s의 일부분</string>
+    <string name="learnCourseListEmptyMessage">찾은 결과가 없습니다. 검색어를 조정해 보세요.</string>
+    <string name="learnProgramListFilterAll">모든 프로그램</string>
+    <string name="learnProgramListFilterNotStarted">시작되지 않음</string>
+    <string name="learnProgramListFilterInProgress">진행 중</string>
+    <string name="learnProgramListFilterCompleted">완료됨</string>
+    <string name="learnProgramListShowMoreLabel">자세히 표시</string>
+    <string name="learnProgramListEmptyMessage">찾은 결과가 없습니다. 검색어를 조정해 보세요.</string>
+    <string name="learnProgramListSearchBarPlaceholder">프로그램 검색</string>
+    <string name="learnProgramListFailedToLoadMessage">프로그램을 로드하지 못함</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="other">%1$d개 과목</item>
+    </plurals>
+    <string name="a11y_inputErrorMessage">오류: %1$s</string>
+    <string name="a11y_required">필수</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-mi/strings.xml b/libs/horizon/src/main/res/values-mi/strings.xml
index 216bf96859..223d0114ad 100644
--- a/libs/horizon/src/main/res/values-mi/strings.xml
+++ b/libs/horizon/src/main/res/values-mi/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Tuemi kōwae e whai ake nei</string>
     <string name="a11y_nextModule">Kōwae e whai ake nei</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, kua tohua hei %2$s, pato rua hei whakatika i te tuhipoka</string>
+    <string name="learnCoursesTabLabel">Ngā Akoranga</string>
+    <string name="learnProgramsTabLabel">Ngā Hōtaka</string>
     <string name="reportAProblemDescriptionMessage">Kōnae he tīkiti mo te whakautu whaiaro i to tatou rōpū tautoko.</string>
     <string name="igniteAIEnterAPromptLabel">Whakauruhia he tohu</string>
     <string name="a11y_igniteAiLoadingContentDescription">Utaina ana te whakautu</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Tahurihia te kāri</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">I rahua te uta i nga akoranga</string>
+    <string name="learnCourseListFilterAll">Ngā akoranga kato</string>
+    <string name="learnCourseListFilterNotStarted">Kaore i timata</string>
+    <string name="learnCourseListFilterInProgress">Kei te ahu whakamua</string>
+    <string name="learnCourseListFilterCompleted">Kua Oti</string>
+    <string name="learnCourseListStartLearningLabel">Tīmata te ako</string>
+    <string name="learnCourseListResumeLearningLabel">Whakahokia te ako</string>
+    <string name="learnCourseListViewCourseLabel">Tirohia te akoranga</string>
+    <string name="learnCourseListShowMoreLabel">Whakāturia mai ētahi atu</string>
+    <string name="learnCourseListSearchBarPlaceholder">Rapu akoranga</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Wāhanga o %1$s</string>
+    <string name="learnCourseListEmptyMessage">Kāore i kitea he hua. Whakamātauria te whakarerekē i ō kupu rapu.</string>
+    <string name="learnProgramListFilterAll">Ngā hōtaka katoa</string>
+    <string name="learnProgramListFilterNotStarted">Kaore i timata</string>
+    <string name="learnProgramListFilterInProgress">Kei te ahu whakamua</string>
+    <string name="learnProgramListFilterCompleted">Kua Oti</string>
+    <string name="learnProgramListShowMoreLabel">Whakāturia mai ētahi atu</string>
+    <string name="learnProgramListEmptyMessage">Kāore i kitea he hua. Ngāna ki te whakarerekē i ō kupu rapu.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Rapu kaupapa</string>
+    <string name="learnProgramListFailedToLoadMessage">Kāore i taea te uta i ngā kaupapa</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d akoranga</item>
+        <item quantity="other">%1$d ngā akoranga</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Hapa: %1$s</string>
     <string name="a11y_required">E Hiahiatia Ana</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-ms/strings.xml b/libs/horizon/src/main/res/values-ms/strings.xml
index cf0b7eda8c..5805b69022 100644
--- a/libs/horizon/src/main/res/values-ms/strings.xml
+++ b/libs/horizon/src/main/res/values-ms/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Item modul seterusnya</string>
     <string name="a11y_nextModule">Modul seterusnya</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, ditandakan sebagai %2$s, ketik dua kali untuk mengedit nota</string>
+    <string name="learnCoursesTabLabel">Kursus</string>
+    <string name="learnProgramsTabLabel">Program</string>
     <string name="reportAProblemDescriptionMessage">Failkan tiket untuk memperoleh maklum balas peribadi daripada pasukan sokongan kami.</string>
     <string name="igniteAIEnterAPromptLabel">Masukkan gesaan</string>
     <string name="a11y_igniteAiLoadingContentDescription">Memuatkan respons</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Balikkan kad</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Gagal memuatkan kursus</string>
+    <string name="learnCourseListFilterAll">Semua kursus</string>
+    <string name="learnCourseListFilterNotStarted">Belum bermula</string>
+    <string name="learnCourseListFilterInProgress">Sedang berjalan</string>
+    <string name="learnCourseListFilterCompleted">Dilengkapkan</string>
+    <string name="learnCourseListStartLearningLabel">Mula belajar</string>
+    <string name="learnCourseListResumeLearningLabel">Sambung pembelajaran</string>
+    <string name="learnCourseListViewCourseLabel">Lihat kursus</string>
+    <string name="learnCourseListShowMoreLabel">Tunjuk lagi</string>
+    <string name="learnCourseListSearchBarPlaceholder">Cari kursus</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Bahagian daripada %1$s</string>
+    <string name="learnCourseListEmptyMessage">Tiada hasil ditemui. Cuba laraskan istilah carian anda.</string>
+    <string name="learnProgramListFilterAll">Semua program</string>
+    <string name="learnProgramListFilterNotStarted">Belum bermula</string>
+    <string name="learnProgramListFilterInProgress">Sedang berjalan</string>
+    <string name="learnProgramListFilterCompleted">Dilengkapkan</string>
+    <string name="learnProgramListShowMoreLabel">Tunjuk lagi</string>
+    <string name="learnProgramListEmptyMessage">Tiada hasil ditemui. Cuba laraskan istilah carian anda.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Cari program</string>
+    <string name="learnProgramListFailedToLoadMessage">Gagal memuatkan program</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d kursus</item>
+        <item quantity="other">%1$d kursus</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Ralat: %1$s</string>
     <string name="a11y_required">Diperlukan</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-nb/strings.xml b/libs/horizon/src/main/res/values-nb/strings.xml
index ee4e6b4066..1cf3a9caa5 100644
--- a/libs/horizon/src/main/res/values-nb/strings.xml
+++ b/libs/horizon/src/main/res/values-nb/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Neste modulelement</string>
     <string name="a11y_nextModule">Neste modul</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, merket som %2$s, dobbelttrykk for å redigere notatet</string>
+    <string name="learnCoursesTabLabel">Emner</string>
+    <string name="learnProgramsTabLabel">Programmer</string>
     <string name="reportAProblemDescriptionMessage">Send inn en personlig melding for personlig respons fra vårt support-team.</string>
     <string name="igniteAIEnterAPromptLabel">Skriv inn et spørsmål</string>
     <string name="a11y_igniteAiLoadingContentDescription">Laster inn svar</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Snu kortet</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Kunne ikke laste inn emner</string>
+    <string name="learnCourseListFilterAll">Alle åpne emner</string>
+    <string name="learnCourseListFilterNotStarted">Ikke startet</string>
+    <string name="learnCourseListFilterInProgress">Pågår</string>
+    <string name="learnCourseListFilterCompleted">Godkjent</string>
+    <string name="learnCourseListStartLearningLabel">Begynn å lære</string>
+    <string name="learnCourseListResumeLearningLabel">Fortsett læring</string>
+    <string name="learnCourseListViewCourseLabel">Vis emne</string>
+    <string name="learnCourseListShowMoreLabel">Vis mer</string>
+    <string name="learnCourseListSearchBarPlaceholder">Søk etter emner</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Del av %1$s</string>
+    <string name="learnCourseListEmptyMessage">Fant ingen resultater. Prøv å endre søkeordene dine.</string>
+    <string name="learnProgramListFilterAll">Alle programmer</string>
+    <string name="learnProgramListFilterNotStarted">Ikke startet</string>
+    <string name="learnProgramListFilterInProgress">Pågår</string>
+    <string name="learnProgramListFilterCompleted">Godkjent</string>
+    <string name="learnProgramListShowMoreLabel">Vis mer</string>
+    <string name="learnProgramListEmptyMessage">Fant ingen resultater. Prøv å endre søkeordene dine.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Søk etter programmer</string>
+    <string name="learnProgramListFailedToLoadMessage">Kunne ikke laste inn programmer</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d emne</item>
+        <item quantity="other">%1$d emner</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Feil: %1$s</string>
     <string name="a11y_required">Obligatorisk</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-nl/strings.xml b/libs/horizon/src/main/res/values-nl/strings.xml
index 4d00d09878..f0d78550d2 100644
--- a/libs/horizon/src/main/res/values-nl/strings.xml
+++ b/libs/horizon/src/main/res/values-nl/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Volgende module-item</string>
     <string name="a11y_nextModule">Volgende module</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, gemarkeerd als %2$s, tik twee keer om notitie te bewerken</string>
+    <string name="learnCoursesTabLabel">Cursussen</string>
+    <string name="learnProgramsTabLabel">Programma\'s</string>
     <string name="reportAProblemDescriptionMessage">Dien een ticket in en krijg een persoonlijk antwoord van ons ondersteuningsteam.</string>
     <string name="igniteAIEnterAPromptLabel">Een prompt invoeren</string>
     <string name="a11y_igniteAiLoadingContentDescription">Bezig met laden van reactie</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">De kaart omdraaien</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Kan cursussen niet laden</string>
+    <string name="learnCourseListFilterAll">Alle cursussen</string>
+    <string name="learnCourseListFilterNotStarted">Niet gestart</string>
+    <string name="learnCourseListFilterInProgress">Lopend</string>
+    <string name="learnCourseListFilterCompleted">Voltooid</string>
+    <string name="learnCourseListStartLearningLabel">Begin met leren</string>
+    <string name="learnCourseListResumeLearningLabel">Doorgaan met leren</string>
+    <string name="learnCourseListViewCourseLabel">Cursus weergeven</string>
+    <string name="learnCourseListShowMoreLabel">Meer weergeven</string>
+    <string name="learnCourseListSearchBarPlaceholder">Cursussen zoeken</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Onderdeel van %1$s</string>
+    <string name="learnCourseListEmptyMessage">Geen resultaten aangetroffen. Probeer je zoektermen aan te passen.</string>
+    <string name="learnProgramListFilterAll">Alle programma\'s</string>
+    <string name="learnProgramListFilterNotStarted">Niet gestart</string>
+    <string name="learnProgramListFilterInProgress">Lopend</string>
+    <string name="learnProgramListFilterCompleted">Voltooid</string>
+    <string name="learnProgramListShowMoreLabel">Meer weergeven</string>
+    <string name="learnProgramListEmptyMessage">Geen resultaten aangetroffen. Probeer je zoektermen aan te passen.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Zoeken naar programma\'s</string>
+    <string name="learnProgramListFailedToLoadMessage">Kan programma\'s niet laden.</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d cursus</item>
+        <item quantity="other">%1$d cursussen</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Fout: %1$s</string>
     <string name="a11y_required">Vereist</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-pl/strings.xml b/libs/horizon/src/main/res/values-pl/strings.xml
index e876177dd1..9aa2410c8e 100644
--- a/libs/horizon/src/main/res/values-pl/strings.xml
+++ b/libs/horizon/src/main/res/values-pl/strings.xml
@@ -533,10 +533,38 @@
     <string name="a11y_nextModuleItem">Następny element modułu</string>
     <string name="a11y_nextModule">Następny moduł</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, oznaczono jako %2$s; stuknij dwukrotnie, aby edytować notatkę</string>
+    <string name="learnCoursesTabLabel">Kursy</string>
+    <string name="learnProgramsTabLabel">Programy</string>
     <string name="reportAProblemDescriptionMessage">Wyślij zgłoszenie do naszego zespołu pomocy</string>
     <string name="igniteAIEnterAPromptLabel">Wpisz monit</string>
     <string name="a11y_igniteAiLoadingContentDescription">Wczytywanie odpowiedzi</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Odwróć kartę</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Nie udało się wczytać kursów</string>
+    <string name="learnCourseListFilterAll">Wszystkie kursy</string>
+    <string name="learnCourseListFilterNotStarted">Nie rozpoczęto</string>
+    <string name="learnCourseListFilterInProgress">W toku</string>
+    <string name="learnCourseListFilterCompleted">Ukończono</string>
+    <string name="learnCourseListStartLearningLabel">Rozpocznij naukę</string>
+    <string name="learnCourseListResumeLearningLabel">Wznów naukę</string>
+    <string name="learnCourseListViewCourseLabel">Wyświetl kurs</string>
+    <string name="learnCourseListShowMoreLabel">Pokaż więcej</string>
+    <string name="learnCourseListSearchBarPlaceholder">Przeszukaj kursy</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Część z %1$s</string>
+    <string name="learnCourseListEmptyMessage">Nie znaleziono żadnych wyników Spróbuj dostosować wyszukiwane wyrażenia.</string>
+    <string name="learnProgramListFilterAll">Wszystkie programy</string>
+    <string name="learnProgramListFilterNotStarted">Nie rozpoczęto</string>
+    <string name="learnProgramListFilterInProgress">W toku</string>
+    <string name="learnProgramListFilterCompleted">Ukończono</string>
+    <string name="learnProgramListShowMoreLabel">Pokaż więcej</string>
+    <string name="learnProgramListEmptyMessage">Nie znaleziono żadnych wyników Spróbuj dostosować wyszukiwane wyrażenia.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Wyszukaj programy</string>
+    <string name="learnProgramListFailedToLoadMessage">Nie udało się wczytać programów</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d kurs</item>
+        <item quantity="few">Kursy: %1$d</item>
+        <item quantity="many">Kursy: %1$d</item>
+        <item quantity="other">Kursy: %1$d</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Błąd: %1$s</string>
     <string name="a11y_required">Wymagane</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-pt-rBR/strings.xml b/libs/horizon/src/main/res/values-pt-rBR/strings.xml
index 4e5d235e19..25abcfdcd6 100644
--- a/libs/horizon/src/main/res/values-pt-rBR/strings.xml
+++ b/libs/horizon/src/main/res/values-pt-rBR/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Próximo item do módulo</string>
     <string name="a11y_nextModule">Próximo módulo</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marcado como %2$s, toque duas vezes para editar a nota</string>
+    <string name="learnCoursesTabLabel">Cursos</string>
+    <string name="learnProgramsTabLabel">Trilhas</string>
     <string name="reportAProblemDescriptionMessage">Apresentar um pedido de resposta pessoal da nossa equipe de suporte.</string>
     <string name="igniteAIEnterAPromptLabel">Inserir um prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Carregando resposta</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Virar a carta</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Falha no carregamento de cursos</string>
+    <string name="learnCourseListFilterAll">Todos os cursos</string>
+    <string name="learnCourseListFilterNotStarted">Não iniciado</string>
+    <string name="learnCourseListFilterInProgress">Em andamento</string>
+    <string name="learnCourseListFilterCompleted">Completo</string>
+    <string name="learnCourseListStartLearningLabel">Comece a aprender</string>
+    <string name="learnCourseListResumeLearningLabel">Retomar aprendizagem</string>
+    <string name="learnCourseListViewCourseLabel">Ver curso</string>
+    <string name="learnCourseListShowMoreLabel">Mostrar mais</string>
+    <string name="learnCourseListSearchBarPlaceholder">Pesquisar cursos</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Parte de %1$s</string>
+    <string name="learnCourseListEmptyMessage">Nenhum resultado foi encontrado. Tente ajustar seus termos de pesquisa.</string>
+    <string name="learnProgramListFilterAll">Todos os programas</string>
+    <string name="learnProgramListFilterNotStarted">Não iniciado</string>
+    <string name="learnProgramListFilterInProgress">Em andamento</string>
+    <string name="learnProgramListFilterCompleted">Completo</string>
+    <string name="learnProgramListShowMoreLabel">Mostrar mais</string>
+    <string name="learnProgramListEmptyMessage">Nenhum resultado foi encontrado. Tente ajustar seus termos de pesquisa.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Programas de busca</string>
+    <string name="learnProgramListFailedToLoadMessage">Falha ao carregar os programas</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d curso</item>
+        <item quantity="other">%1$d cursos</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Erro: %1$s</string>
     <string name="a11y_required">Obrigatório</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-pt-rPT/strings.xml b/libs/horizon/src/main/res/values-pt-rPT/strings.xml
index 1eab7284b7..085ee3f46c 100644
--- a/libs/horizon/src/main/res/values-pt-rPT/strings.xml
+++ b/libs/horizon/src/main/res/values-pt-rPT/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Próximo item do módulo</string>
     <string name="a11y_nextModule">Próximo módulo,</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s marcado como %2$s, toque duas vezes para editar a nota</string>
+    <string name="learnCoursesTabLabel">Disciplinas</string>
+    <string name="learnProgramsTabLabel">Programas</string>
     <string name="reportAProblemDescriptionMessage">Registar um bilhete para obter uma resposta pessoal da nossa equipa de suporte.</string>
     <string name="igniteAIEnterAPromptLabel">Introduzir uma sugestão</string>
     <string name="a11y_igniteAiLoadingContentDescription">A carregar resposta</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Virar o cartão</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Falha ao carregar disciplinas</string>
+    <string name="learnCourseListFilterAll">Todas as disciplinas</string>
+    <string name="learnCourseListFilterNotStarted">Não iniciado</string>
+    <string name="learnCourseListFilterInProgress">Em curso</string>
+    <string name="learnCourseListFilterCompleted">Concluído</string>
+    <string name="learnCourseListStartLearningLabel">Começar a aprender</string>
+    <string name="learnCourseListResumeLearningLabel">Retomar a aprendizagem</string>
+    <string name="learnCourseListViewCourseLabel">Ver disciplina</string>
+    <string name="learnCourseListShowMoreLabel">Mostrar mais</string>
+    <string name="learnCourseListSearchBarPlaceholder">Procurar disciplinas</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Parte de %1$s</string>
+    <string name="learnCourseListEmptyMessage">Sem resultados Tente ajustar os seus termos de busca.</string>
+    <string name="learnProgramListFilterAll">Todos os programas</string>
+    <string name="learnProgramListFilterNotStarted">Não iniciado</string>
+    <string name="learnProgramListFilterInProgress">Em curso</string>
+    <string name="learnProgramListFilterCompleted">Concluído</string>
+    <string name="learnProgramListShowMoreLabel">Mostrar mais</string>
+    <string name="learnProgramListEmptyMessage">Sem resultados Tente ajustar os seus termos de busca.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Buscar programas</string>
+    <string name="learnProgramListFailedToLoadMessage">Falha ao carregar programas</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d disciplina</item>
+        <item quantity="other">%1$d disciplinas</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Erro: %1$s</string>
     <string name="a11y_required">Necessário</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-ru/strings.xml b/libs/horizon/src/main/res/values-ru/strings.xml
index 68d94d5737..8b60d4d965 100644
--- a/libs/horizon/src/main/res/values-ru/strings.xml
+++ b/libs/horizon/src/main/res/values-ru/strings.xml
@@ -533,10 +533,38 @@
     <string name="a11y_nextModuleItem">Следующий элемент модуля</string>
     <string name="a11y_nextModule">Следующий модуль</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, отмеченный как %2$s, щелкните дважды, чтобы отредактировать заметку</string>
+    <string name="learnCoursesTabLabel">Курсы</string>
+    <string name="learnProgramsTabLabel">Программы</string>
     <string name="reportAProblemDescriptionMessage">Заполните заявку на персональный ответ от нашей службы поддержки.</string>
     <string name="igniteAIEnterAPromptLabel">Ввести подсказку</string>
     <string name="a11y_igniteAiLoadingContentDescription">Загрузка ответа</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Перевернуть карту</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Не удалось загрузить курсы</string>
+    <string name="learnCourseListFilterAll">Все курсы</string>
+    <string name="learnCourseListFilterNotStarted">Не начато</string>
+    <string name="learnCourseListFilterInProgress">В процессе выполнения</string>
+    <string name="learnCourseListFilterCompleted">Завершено</string>
+    <string name="learnCourseListStartLearningLabel">Начать обучение</string>
+    <string name="learnCourseListResumeLearningLabel">Возобновить обучение</string>
+    <string name="learnCourseListViewCourseLabel">Просмотр курса</string>
+    <string name="learnCourseListShowMoreLabel">Показать больше</string>
+    <string name="learnCourseListSearchBarPlaceholder">Поиск курсов</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Часть из %1$s</string>
+    <string name="learnCourseListEmptyMessage">Результатов не найдено. Попробуйте уточнить параметры своего поиска.</string>
+    <string name="learnProgramListFilterAll">Все программы</string>
+    <string name="learnProgramListFilterNotStarted">Не начато</string>
+    <string name="learnProgramListFilterInProgress">В процессе выполнения</string>
+    <string name="learnProgramListFilterCompleted">Завершено</string>
+    <string name="learnProgramListShowMoreLabel">Показать больше</string>
+    <string name="learnProgramListEmptyMessage">Результатов не найдено. Попробуйте уточнить параметры своего поиска.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Поиск программ</string>
+    <string name="learnProgramListFailedToLoadMessage">Не удалось загрузить программы</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d курс</item>
+        <item quantity="few">%1$d курса(-ов)</item>
+        <item quantity="many">%1$d курса(-ов)</item>
+        <item quantity="other">%1$d курса(-ов)</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Ошибка: %1$s</string>
     <string name="a11y_required">Необходимо</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-sl/strings.xml b/libs/horizon/src/main/res/values-sl/strings.xml
index 4d55e05c6f..9e52241dbd 100644
--- a/libs/horizon/src/main/res/values-sl/strings.xml
+++ b/libs/horizon/src/main/res/values-sl/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Naslednji element modula</string>
     <string name="a11y_nextModule">Naslednji modul</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, označeno kot %2$s, dvakrat tapnite za urejanje opombe</string>
+    <string name="learnCoursesTabLabel">Predmeti</string>
+    <string name="learnProgramsTabLabel">Programi</string>
     <string name="reportAProblemDescriptionMessage">Vložite vstopnico za osebni odziv naše ekipe za podporo.</string>
     <string name="igniteAIEnterAPromptLabel">Vnesi poziv</string>
     <string name="a11y_igniteAiLoadingContentDescription">Nalaganje odgovora</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Obrni kartico</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Nalaganje predmetov ni uspelo</string>
+    <string name="learnCourseListFilterAll">Vsi predmeti</string>
+    <string name="learnCourseListFilterNotStarted">Ni začeto</string>
+    <string name="learnCourseListFilterInProgress">V poteku</string>
+    <string name="learnCourseListFilterCompleted">Zaključeno</string>
+    <string name="learnCourseListStartLearningLabel">Začnite z učenjem</string>
+    <string name="learnCourseListResumeLearningLabel">Nadaljuj z učenjem</string>
+    <string name="learnCourseListViewCourseLabel">Ogled predmeta</string>
+    <string name="learnCourseListShowMoreLabel">Prikaži več</string>
+    <string name="learnCourseListSearchBarPlaceholder">Iskanje predmetov</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Del od %1$s</string>
+    <string name="learnCourseListEmptyMessage">Rezultatov ni mogoče najti. Poskusite z drugimi iskalnimi izrazi.</string>
+    <string name="learnProgramListFilterAll">Vsi programi</string>
+    <string name="learnProgramListFilterNotStarted">Ni začeto</string>
+    <string name="learnProgramListFilterInProgress">V poteku</string>
+    <string name="learnProgramListFilterCompleted">Zaključeno</string>
+    <string name="learnProgramListShowMoreLabel">Prikaži več</string>
+    <string name="learnProgramListEmptyMessage">Rezultatov ni mogoče najti. Poskusite z drugimi iskalnimi izrazi.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Iskanje programov</string>
+    <string name="learnProgramListFailedToLoadMessage">Nalaganje programov ni uspelo</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d predmet</item>
+        <item quantity="other">%1$d predmetov (-a/-i)</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Napaka: %1$s</string>
     <string name="a11y_required">Zahtevano</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-sv/strings.xml b/libs/horizon/src/main/res/values-sv/strings.xml
index bcfc4c392f..2f4472f533 100644
--- a/libs/horizon/src/main/res/values-sv/strings.xml
+++ b/libs/horizon/src/main/res/values-sv/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Nästa modulobjekt</string>
     <string name="a11y_nextModule">Nästa modul</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, markerad som %2$s, dubbeltryck för att redigera anteckning</string>
+    <string name="learnCoursesTabLabel">Kurser</string>
+    <string name="learnProgramsTabLabel">Program</string>
     <string name="reportAProblemDescriptionMessage">Registrera ett ärende för ett personligt svar från vårt supportteam.</string>
     <string name="igniteAIEnterAPromptLabel">Ange en prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Läser in svar</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Vänd på kortet</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Det gick inte att läsa in kurser</string>
+    <string name="learnCourseListFilterAll">Alla kurser</string>
+    <string name="learnCourseListFilterNotStarted">Ej startade</string>
+    <string name="learnCourseListFilterInProgress">Pågår</string>
+    <string name="learnCourseListFilterCompleted">Färdig</string>
+    <string name="learnCourseListStartLearningLabel">Börja inlärningen</string>
+    <string name="learnCourseListResumeLearningLabel">Återuppta lärande</string>
+    <string name="learnCourseListViewCourseLabel">Visa kursen</string>
+    <string name="learnCourseListShowMoreLabel">Visa mer</string>
+    <string name="learnCourseListSearchBarPlaceholder">Sök efter kurser</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Del av %1$s</string>
+    <string name="learnCourseListEmptyMessage">Inga resultat hittades. Prova att ändra söktermerna.</string>
+    <string name="learnProgramListFilterAll">Alla program</string>
+    <string name="learnProgramListFilterNotStarted">Ej startade</string>
+    <string name="learnProgramListFilterInProgress">Pågår</string>
+    <string name="learnProgramListFilterCompleted">Färdig</string>
+    <string name="learnProgramListShowMoreLabel">Visa mer</string>
+    <string name="learnProgramListEmptyMessage">Inga resultat hittades. Prova att ändra söktermerna.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Sök efter program</string>
+    <string name="learnProgramListFailedToLoadMessage">Det gick inte att läsa in programmen</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d kurs</item>
+        <item quantity="other">%1$d kurser</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Fel: %1$s</string>
     <string name="a11y_required">Obligatorisk</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-th/strings.xml b/libs/horizon/src/main/res/values-th/strings.xml
index 1edc674148..32c5a2b392 100644
--- a/libs/horizon/src/main/res/values-th/strings.xml
+++ b/libs/horizon/src/main/res/values-th/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">รายการหน่วยการเรียนถัดไป</string>
     <string name="a11y_nextModule">หน่วยการเรียนถัดไป</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, กำกับเป็น %2$s กดสองครั้งเพื่อแก้ไขหมายเหตุ</string>
+    <string name="learnCoursesTabLabel">บทเรียน</string>
+    <string name="learnProgramsTabLabel">หลักสูตร</string>
     <string name="reportAProblemDescriptionMessage">แจ้งตั๋วรับบริการสำหรับการตอบกลับส่วนบุคคลจากทีมงานให้บริการของเรา</string>
     <string name="igniteAIEnterAPromptLabel">กรอกข้อความแจ้ง</string>
     <string name="a11y_igniteAiLoadingContentDescription">กำลังโหลดคำตอบ</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">พลิกบัตรข้อมูล</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">ไม่สามารถโหลดบทเรียนได้</string>
+    <string name="learnCourseListFilterAll">บทเรียนทั้งหมด</string>
+    <string name="learnCourseListFilterNotStarted">ไม่ได้เริ่มต้น</string>
+    <string name="learnCourseListFilterInProgress">กำลังดำเนินการ</string>
+    <string name="learnCourseListFilterCompleted">เสร็จสิ้นแล้ว</string>
+    <string name="learnCourseListStartLearningLabel">เริ่มการเรียนรู้</string>
+    <string name="learnCourseListResumeLearningLabel">เรียนรู้ต่อ</string>
+    <string name="learnCourseListViewCourseLabel">ดูบทเรียน</string>
+    <string name="learnCourseListShowMoreLabel">แสดงเพิ่มเติม</string>
+    <string name="learnCourseListSearchBarPlaceholder">ค้นหาบทเรียน</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">ส่วนเนื้อหาจาก %1$s</string>
+    <string name="learnCourseListEmptyMessage">ไม่พบผลลัพธ์ ลองปรับคำค้นหาของคุณ</string>
+    <string name="learnProgramListFilterAll">ทุกหลักสูตร</string>
+    <string name="learnProgramListFilterNotStarted">ไม่ได้เริ่มต้น</string>
+    <string name="learnProgramListFilterInProgress">กำลังดำเนินการ</string>
+    <string name="learnProgramListFilterCompleted">เสร็จสิ้นแล้ว</string>
+    <string name="learnProgramListShowMoreLabel">แสดงเพิ่มเติม</string>
+    <string name="learnProgramListEmptyMessage">ไม่พบผลลัพธ์ ลองปรับคำค้นหาของคุณ</string>
+    <string name="learnProgramListSearchBarPlaceholder">ค้นหาหลักสูตร</string>
+    <string name="learnProgramListFailedToLoadMessage">ไม่สามารถโหลดหลักสูตรได้</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d บทเรียน</item>
+        <item quantity="other">%1$d บทเรียน</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">ข้อผิดพลาด: %1$s</string>
     <string name="a11y_required">บังคับ</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-vi/strings.xml b/libs/horizon/src/main/res/values-vi/strings.xml
index ce61e59f7e..fb6ffb53b7 100644
--- a/libs/horizon/src/main/res/values-vi/strings.xml
+++ b/libs/horizon/src/main/res/values-vi/strings.xml
@@ -513,10 +513,36 @@
     <string name="a11y_nextModuleItem">Mục học phần tiếp theo</string>
     <string name="a11y_nextModule">Học phần tiếp theo</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s, được đánh dấu là %2$s, nhấn đúp để chỉnh sửa ghi chú</string>
+    <string name="learnCoursesTabLabel">Các khóa học</string>
+    <string name="learnProgramsTabLabel">Chương Trình</string>
     <string name="reportAProblemDescriptionMessage">Gửi phiếu yêu cầu phản hồi cá nhân từ nhóm hỗ trợ của chúng tôi.</string>
     <string name="igniteAIEnterAPromptLabel">Nhập một lời nhắc</string>
     <string name="a11y_igniteAiLoadingContentDescription">Đang tải phản hồi</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">Lật thẻ</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">Không tải được các khóa học</string>
+    <string name="learnCourseListFilterAll">Tất cả các khóa học</string>
+    <string name="learnCourseListFilterNotStarted">Chưa bắt đầu</string>
+    <string name="learnCourseListFilterInProgress">Trong tiến trình</string>
+    <string name="learnCourseListFilterCompleted">Đã hoàn thành</string>
+    <string name="learnCourseListStartLearningLabel">Bắt đầu học</string>
+    <string name="learnCourseListResumeLearningLabel">Tiếp tục học</string>
+    <string name="learnCourseListViewCourseLabel">Xem khóa học</string>
+    <string name="learnCourseListShowMoreLabel">Hiển thị thêm</string>
+    <string name="learnCourseListSearchBarPlaceholder">Tìm kiếm khóa học</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">Một phần của %1$s</string>
+    <string name="learnCourseListEmptyMessage">Không tìm thấy kết quả. Thử điều chỉnh từ khóa tìm kiếm.</string>
+    <string name="learnProgramListFilterAll">Tất cả các chương trình</string>
+    <string name="learnProgramListFilterNotStarted">Chưa bắt đầu</string>
+    <string name="learnProgramListFilterInProgress">Trong tiến trình</string>
+    <string name="learnProgramListFilterCompleted">Đã hoàn thành</string>
+    <string name="learnProgramListShowMoreLabel">Hiển thị thêm</string>
+    <string name="learnProgramListEmptyMessage">Không tìm thấy kết quả. Thử điều chỉnh từ khóa tìm kiếm.</string>
+    <string name="learnProgramListSearchBarPlaceholder">Tìm kiếm chương trình</string>
+    <string name="learnProgramListFailedToLoadMessage">Không tải được chương trình</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="one">%1$d khóa học</item>
+        <item quantity="other">%1$d khóa học</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">Lỗi: %1$s</string>
     <string name="a11y_required">Bắt Buộc</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values-zh/strings.xml b/libs/horizon/src/main/res/values-zh/strings.xml
index 9eaa9a7a1f..0c947df97a 100644
--- a/libs/horizon/src/main/res/values-zh/strings.xml
+++ b/libs/horizon/src/main/res/values-zh/strings.xml
@@ -503,10 +503,35 @@
     <string name="a11y_nextModuleItem">下一个模块项目</string>
     <string name="a11y_nextModule">下一个模块</string>
     <string name="a11y_notebookHighlightMarkedAs">%1$s，标记为%2$s，双击以编辑笔记</string>
+    <string name="learnCoursesTabLabel">课程</string>
+    <string name="learnProgramsTabLabel">项目</string>
     <string name="reportAProblemDescriptionMessage">向我们的支持团队提问。</string>
     <string name="igniteAIEnterAPromptLabel">输入提示</string>
     <string name="a11y_igniteAiLoadingContentDescription">加载回应</string>
     <string name="a11y_aiAssistFlashcardClickActionLabel">翻转卡片</string>
+    <string name="learnCourseListFailedToLoadCoursesMessage">加载课程失败</string>
+    <string name="learnCourseListFilterAll">所有课程</string>
+    <string name="learnCourseListFilterNotStarted">未开始</string>
+    <string name="learnCourseListFilterInProgress">进行中</string>
+    <string name="learnCourseListFilterCompleted">已完成</string>
+    <string name="learnCourseListStartLearningLabel">开始学习</string>
+    <string name="learnCourseListResumeLearningLabel">恢复学习</string>
+    <string name="learnCourseListViewCourseLabel">查看课程</string>
+    <string name="learnCourseListShowMoreLabel">显示更多</string>
+    <string name="learnCourseListSearchBarPlaceholder">搜索课程</string>
+    <string name="learnCourseOverviewPartOfProgramsLabel">%1$s 的一部分</string>
+    <string name="learnCourseListEmptyMessage">未找到结果。尝试调整搜索词。</string>
+    <string name="learnProgramListFilterAll">所有计划</string>
+    <string name="learnProgramListFilterNotStarted">未开始</string>
+    <string name="learnProgramListFilterInProgress">进行中</string>
+    <string name="learnProgramListFilterCompleted">已完成</string>
+    <string name="learnProgramListShowMoreLabel">显示更多</string>
+    <string name="learnProgramListEmptyMessage">未找到结果。尝试调整搜索词</string>
+    <string name="learnProgramListSearchBarPlaceholder">搜索计划</string>
+    <string name="learnProgramListFailedToLoadMessage">加载计划失败</string>
+    <plurals name="learnProgramListCourseCount">
+        <item quantity="other">%1$d 门课程</item>
+    </plurals>
     <string name="a11y_inputErrorMessage">错误：%1$s</string>
     <string name="a11y_required">必填</string>
 </resources>
diff --git a/libs/horizon/src/main/res/values/strings.xml b/libs/horizon/src/main/res/values/strings.xml
index a5eca76fbf..870f4f606d 100644
--- a/libs/horizon/src/main/res/values/strings.xml
+++ b/libs/horizon/src/main/res/values/strings.xml
@@ -514,6 +514,7 @@
     <string name="a11y_notebookHighlightMarkedAs">%1$s, marked as %2$s, double tap to edit note</string>
     <string name="learnCoursesTabLabel">Courses</string>
     <string name="learnProgramsTabLabel">Programs</string>
+    <string name="learnBrowseTabLabel">Browse</string>
     <string name="reportAProblemDescriptionMessage">File a ticket for a personal response from our support team.</string>
     <string name="igniteAIEnterAPromptLabel">Enter a prompt</string>
     <string name="a11y_igniteAiLoadingContentDescription">Loading response</string>
@@ -544,4 +545,117 @@
     </plurals>
     <string name="a11y_inputErrorMessage">Error: %1$s</string>
     <string name="a11y_required">Required</string>
+    <string name="learnLearningLibraryListSearchPlaceholder">Search</string>
+    <string name="a11y_learnLearningLibraryBookmarkContentDescription">Bookmarked items</string>
+    <string name="a11y_learnLearningLibraryCompletedContentDescription">Completed items</string>
+    <string name="a11y_learnLearningLibraryItemCompletedContentDescription">Completed</string>
+    <string name="a11y_learnLearningLibraryItemBookmarkContentDescription">Bookmark</string>
+    <string name="a11y_learnLearningLibraryItemRemoveBookmarkContentDescription">Remove bookmark</string>
+    <string name="learnLearningLibraryItemEnrollLabel">Enroll</string>
+    <string name="a11y_learnLearningLibraryCollectionCollapseContentDescription">Collapse</string>
+    <string name="a11y_learnLearningLibraryCollectionExpandContentDescription">Expand</string>
+    <string name="learnLearningLibraryCollectionViewCollectionLabel">View full collection</string>
+    <string name="learnLearningLibraryListEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnLearningLibraryFailedToUpdateBookmarkMessage">Failed to update the bookmark</string>
+    <string name="learnLearningLibraryFailedToEnrollMessage">Failed to enroll in item</string>
+    <string name="learningLibraryListShowMoreLabel">Show more</string>
+    <string name="learnLearningLibraryInProgressLabel">In progress</string>
+    <string name="learnLearningLibraryCompletedLabel">Completed</string>
+    <string name="learnLearningLibraryAssessmentLabel">Assessment</string>
+    <string name="learnLearningLibraryAssignmentLabel">Assignment</string>
+    <string name="learnLearningLibraryProgramLabel">Program</string>
+    <string name="learnLearningLibraryCourseLabel">Course</string>
+    <string name="learnLearningLibraryExternalToolLabel">External tool</string>
+    <string name="learnLearningLibraryExternalLinkLabel">External link</string>
+    <string name="learnLearningLibraryFileLabel">File</string>
+    <string name="learnLearningLibraryPageLabel">Page</string>
+    <string name="learnLearningLibraryFailedToLoadCollectionMessage">Failed to load collection</string>
+    <string name="learnLearningLibraryDetailsSearchLabel">Search collection</string>
+    <string name="learningLibraryDetailsShowMoreLabel">Show more</string>
+    <string name="learnLearningLibraryDetailsEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnLearningLibraryBookmarksTitle">Bookmarks</string>
+    <string name="learnLearningLibraryItemFailedToLoadMessage">Failed to load collection items</string>
+    <string name="learnLearningLibraryBookmarkedSearchPlaceholder">Search</string>
+    <string name="learnLearningLibraryBookmarkedEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <plurals name="learnLearningLibraryCollectionItemCount">
+        <item quantity="one">%1$d item</item>
+        <item quantity="other">%1$d items</item>
+    </plurals>
+    <plurals name="learnLearningLibraryEstimatedDuration">
+        <item quantity="one">%1$d min</item>
+        <item quantity="other">%1$d mins</item>
+    </plurals>
+    <plurals name="learnLearningLibraryContainedUnits">
+        <item quantity="one">%1$d unit</item>
+        <item quantity="other">%1$d units</item>
+    </plurals>
+    <string name="LearnLearningLibraryTypeFilterAllLabel">Any type</string>
+    <string name="LearnLearningLibraryTypeFilterCoursesLabel">Courses</string>
+    <string name="LearnLearningLibraryTypeFilterProgramsLabel">Programs</string>
+    <string name="LearnLearningLibraryTypeFilterAssessmentsLabel">Assessments</string>
+    <string name="LearnLearningLibraryTypeFilterAssignmentsLabel">Assignments</string>
+    <string name="LearnLearningLibraryTypeFilterExternalLinksLabel">External links</string>
+    <string name="LearnLearningLibraryTypeFilterExternalToolsLabel">External tools</string>
+    <string name="LearnLearningLibraryTypeFilterFilesLabel">Files</string>
+    <string name="LearnLearningLibraryTypeFilterPagesLabel">Pages</string>
+    <string name="learnLearningLibraryItemSearchPlaceholder">Search</string>
+    <string name="learnLearningLibraryItemEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnLearningLibraryStatusFilterAllLabel">Any status</string>
+    <string name="learnLearningLibraryStatusFilterCompletedLabel">Completed</string>
+    <string name="learnLearningLibraryStatusFilterBookmarkedLabel">Bookmarked</string>
+    <string name="learnLearningLibraryFailedToLoadMessage">Failed to load collections</string>
+    <string name="a11y_learningLibraryClearFiltersContentDescription">Clear filters</string>
+    <string name="a11y_learnClearSearchQueryContentDescription">Clear search query</string>
+    <string name="learnLearningLibraryEnrollDialogOverviewTitle">Overview</string>
+    <string name="learnLearningLibraryEnrollDialogReadyToJoinTitle">Ready to join?</string>
+    <string name="learnLearningLibraryEnrollDialogNotNowLabel">Not now</string>
+    <string name="learnLearningLibraryEnrollDialogEnrollLabel">Enroll</string>
+    <string name="learnLearningLibraryEnrollDialogDetailsMessage">Enroll to access the course and start learning.</string>
+    <string name="learnLearningLibraryEnrollDialogFailedToEnrollMessage">Failed to enroll</string>
+    <string name="learnLearningLibraryEmptyCollectionMessage">No items in this collection</string>
+    <string name="learnLearningLibraryRecommendedLabel">Recommended</string>
+    <string name="learnLearningLibraryRecommendationPopularityDescription">Popular with learners at your organization</string>
+    <string name="learnLearningLibraryRecommendationPastLearningDescription">A next step after %1$s</string>
+    <string name="learnLearningLibraryRecommendationBookmarkedDescription">Related to content you\'re interested in</string>
+    <string name="learnLearningLibraryRecommendationExistingSkillsDescription">To deepen your skills in %1$s</string>
+    <string name="learnLEarningLibraryListYou">you</string>
+    <string name="learnLearningLibraryListRecommendedForLabel">Recommended for %1$s</string>
+    <string name="a11y_learningLibraryRecommendedPreviousContentDescription">Previous item</string>
+    <string name="a11y_learningLibraryRecommendedNextContentDescription">Next item</string>
+    <string name="learnLearningLibraryCollectionsHeader">Collections</string>
+    <string name="learnLearningLibraryFilterAndSortTitle">Filter and sort</string>
+    <string name="learnLearningLibraryFilterSortByLabel">Sort by</string>
+    <string name="learnLearningLibraryFilterItemTypeLabel">Item type</string>
+    <string name="learnLearningLibraryFilterApplyFiltersLabel">Apply filters</string>
+    <string name="learnLearningLibraryFilterClearFiltersLabel">Clear filters</string>
+    <string name="learnLearningLibrarySortMostRecentLabel">Most recent</string>
+    <string name="learnLearningLibrarySortLeastRecentLabel">Least recent</string>
+    <string name="learnLearningLibrarySortNameAZLabel">Name: A-Z</string>
+    <string name="learnLearningLibrarySortNameZALabel">Name: Z-A</string>
+    <string name="a11y_learnLearningLibraryFilterContentDescription">Filter</string>
+    <string name="learnMyContentCourseLabel">Course</string>
+    <string name="learnMyContentProgramLabel">Program</string>
+    <plurals name="learnMyContentProgramCourseCount">
+        <item quantity="one">%1$d course</item>
+        <item quantity="other">%1$d courses</item>
+    </plurals>
+    <string name="learnMyContentProgramErrorMessage">Failed to load items</string>
+    <string name="learnMyContentStartLearning">Start learning</string>
+    <string name="learnMyContentResumeLearning">Resume learning</string>
+    <string name="LearnMyContentInProgressLabel">In Progress</string>
+    <string name="LearnMyContentCompletedLabel">Completed</string>
+    <string name="LearnMyContentSavedLabel">Saved</string>
+    <string name="learnMyContentSearchLabel">Search</string>
+    <string name="learnMyContentTabLabel">My content</string>
+    <string name="learnMyContentShowMoreLabel">Show more</string>
+    <string name="learnMyContentCoursesSection">Courses</string>
+    <plurals name="learnMyContentItemsCount">
+        <item quantity="one">%1$d item</item>
+        <item quantity="other">%1$d items</item>
+    </plurals>
+    <string name="learnMyContentDurationHrsMin">%1$d hrs %2$d min</string>
+    <string name="learnMyContentDurationHrs">%1$d hrs</string>
+    <string name="learnMyContentDurationMin">%1$d min</string>
+    <string name="learnMyContentEmptyMessage">No results found. Try adjusting your search terms.</string>
+    <string name="learnMyContentSavedFailedToBookmarkErrorMessage">Failed to update</string>
 </resources>
\ No newline at end of file
diff --git a/libs/horizon/src/main/res/values/styles.xml b/libs/horizon/src/main/res/values/styles.xml
index bc8c00cbec..b4a36a96cf 100644
--- a/libs/horizon/src/main/res/values/styles.xml
+++ b/libs/horizon/src/main/res/values/styles.xml
@@ -17,6 +17,5 @@
   -->
 <resources>
     <style name="HorizonTheme" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModelTest.kt
index f45de8e061..3a4a6de482 100644
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModelTest.kt
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/chat/AiAssistChatViewModelTest.kt
@@ -17,9 +17,9 @@
 package com.instructure.horizon.features.aiassistant.chat
 
 import androidx.compose.ui.text.input.TextFieldValue
-import com.instructure.canvasapi2.models.journey.JourneyAssistChipOption
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistChipOption
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
 import com.instructure.horizon.features.aiassistant.common.AiAssistRepository
 import com.instructure.horizon.features.aiassistant.common.AiAssistResponse
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepositoryTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepositoryTest.kt
index bd61791e23..f63d58bcf7 100644
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepositoryTest.kt
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/common/AiAssistRepositoryTest.kt
@@ -17,15 +17,15 @@
 package com.instructure.horizon.features.aiassistant.common
 
 import com.instructure.canvasapi2.apis.JourneyAssistAPI
-import com.instructure.canvasapi2.models.journey.JourneyAssistChatMessage
-import com.instructure.canvasapi2.models.journey.JourneyAssistChipOption
-import com.instructure.canvasapi2.models.journey.JourneyAssistCitation
-import com.instructure.canvasapi2.models.journey.JourneyAssistCitationType
-import com.instructure.canvasapi2.models.journey.JourneyAssistFlashCard
-import com.instructure.canvasapi2.models.journey.JourneyAssistQuizItem
-import com.instructure.canvasapi2.models.journey.JourneyAssistResponse
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistChatMessage
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistChipOption
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistCitation
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistCitationType
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistFlashCard
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistQuizItem
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistResponse
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.mockk
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModelTest.kt
index 8e20decf62..98ff87ca1b 100644
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModelTest.kt
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/flashcard/AiAssistFlashcardViewModelTest.kt
@@ -16,9 +16,9 @@
  */
 package com.instructure.horizon.features.aiassistant.flashcard
 
-import com.instructure.canvasapi2.models.journey.JourneyAssistFlashCard
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistFlashCard
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
 import com.instructure.horizon.features.aiassistant.common.AiAssistRepository
 import com.instructure.horizon.features.aiassistant.common.AiAssistResponse
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModelTest.kt
index 3390c63753..61f725ed57 100644
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModelTest.kt
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/main/AiAssistMainViewModelTest.kt
@@ -16,8 +16,8 @@
  */
 package com.instructure.horizon.features.aiassistant.main
 
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
 import com.instructure.horizon.features.aiassistant.common.AiAssistRepository
 import com.instructure.horizon.features.aiassistant.common.AiAssistResponse
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModelTest.kt
index 3fe5ed1276..af5791bb7d 100644
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModelTest.kt
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/aiassistant/quiz/AiAssistQuizViewModelTest.kt
@@ -16,9 +16,9 @@
  */
 package com.instructure.horizon.features.aiassistant.quiz
 
-import com.instructure.canvasapi2.models.journey.JourneyAssistQuizItem
-import com.instructure.canvasapi2.models.journey.JourneyAssistRole
-import com.instructure.canvasapi2.models.journey.JourneyAssistState
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistQuizItem
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistRole
+import com.instructure.canvasapi2.models.journey.assist.JourneyAssistState
 import com.instructure.horizon.features.aiassistant.common.AiAssistContextProvider
 import com.instructure.horizon.features.aiassistant.common.AiAssistRepository
 import com.instructure.horizon.features.aiassistant.common.AiAssistResponse
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/LearnRepositoryTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/LearnRepositoryTest.kt
deleted file mode 100644
index 391ff0f645..0000000000
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/LearnRepositoryTest.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2025 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn
-
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithModuleItemDurations
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
-import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
-import com.instructure.canvasapi2.models.User
-import com.instructure.canvasapi2.utils.ApiPrefs
-import com.instructure.canvasapi2.utils.DataResult
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.mockk
-import junit.framework.TestCase.assertEquals
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-
-class LearnRepositoryTest {
-    private val horizonGetCoursesManager: HorizonGetCoursesManager = mockk(relaxed = true)
-    private val getProgramsManager: GetProgramsManager = mockk(relaxed = true)
-    private val apiPrefs: ApiPrefs = mockk(relaxed = true)
-
-    private val testUser = User(id = 123L)
-    private val coursesWithProgress = listOf(
-        CourseWithProgress(
-            courseId = 1L,
-            courseName = "Course 1",
-            courseImageUrl = "https://example.com/image1.png",
-            progress = 50.0,
-            courseSyllabus = "Syllabus 1"
-        ),
-        CourseWithProgress(
-            courseId = 2L,
-            courseName = "Course 2",
-            courseImageUrl = "https://example.com/image2.png",
-            progress = 100.0,
-            courseSyllabus = "Syllabus 2"
-        )
-    )
-
-    @Before
-    fun setup() {
-        every { apiPrefs.user } returns testUser
-        coEvery { horizonGetCoursesManager.getCoursesWithProgress(any(), any()) } returns DataResult.Success(coursesWithProgress)
-    }
-
-    @Test
-    fun `getCoursesWithProgress returns list of courses with progress`() = runTest {
-        val repository = getRepository()
-        val result = repository.getCoursesWithProgress(false)
-
-        assertEquals(2, result.size)
-        assertEquals(coursesWithProgress, result)
-        coVerify { horizonGetCoursesManager.getCoursesWithProgress(123L, false) }
-    }
-
-    @Test
-    fun `getCoursesWithProgress with forceNetwork true calls API with force network`() = runTest {
-        val repository = getRepository()
-        repository.getCoursesWithProgress(true)
-
-        coVerify { horizonGetCoursesManager.getCoursesWithProgress(123L, true) }
-    }
-
-    @Test
-    fun `getCoursesWithProgress uses -1 when user is null`() = runTest {
-        every { apiPrefs.user } returns null
-        val repository = getRepository()
-        repository.getCoursesWithProgress(false)
-
-        coVerify { horizonGetCoursesManager.getCoursesWithProgress(-1L, false) }
-    }
-
-    @Test
-    fun `getCoursesById returns list of courses`() = runTest {
-        val courseIds = listOf(1L, 2L, 3L)
-        val expectedCourses = courseIds.map { id ->
-            CourseWithModuleItemDurations(
-                courseId = id,
-                courseName = "Course $id",
-                moduleItemsDuration = listOf("30m", "45m"),
-                startDate = null,
-                endDate = null
-            )
-        }
-
-        coEvery { horizonGetCoursesManager.getProgramCourses(1L, false) } returns DataResult.Success(expectedCourses[0])
-        coEvery { horizonGetCoursesManager.getProgramCourses(2L, false) } returns DataResult.Success(expectedCourses[1])
-        coEvery { horizonGetCoursesManager.getProgramCourses(3L, false) } returns DataResult.Success(expectedCourses[2])
-
-        val repository = getRepository()
-        val result = repository.getCoursesById(courseIds)
-
-        assertEquals(3, result.size)
-        assertEquals(expectedCourses, result)
-        coVerify { horizonGetCoursesManager.getProgramCourses(1L, false) }
-        coVerify { horizonGetCoursesManager.getProgramCourses(2L, false) }
-        coVerify { horizonGetCoursesManager.getProgramCourses(3L, false) }
-    }
-
-    @Test
-    fun `getCoursesById with forceNetwork true calls API with force network`() = runTest {
-        val courseIds = listOf(1L)
-        val course = CourseWithModuleItemDurations(
-            courseId = 1L,
-            courseName = "Course 1",
-            moduleItemsDuration = listOf("30m"),
-            startDate = null,
-            endDate = null
-        )
-        coEvery { horizonGetCoursesManager.getProgramCourses(1L, true) } returns DataResult.Success(course)
-
-        val repository = getRepository()
-        repository.getCoursesById(courseIds, forceNetwork = true)
-
-        coVerify { horizonGetCoursesManager.getProgramCourses(1L, true) }
-    }
-
-    @Test
-    fun `getCoursesById with empty list returns empty list`() = runTest {
-        val repository = getRepository()
-        val result = repository.getCoursesById(emptyList())
-
-        assertEquals(0, result.size)
-    }
-
-    private fun getRepository(): LearnRepository {
-        return LearnRepository(horizonGetCoursesManager, getProgramsManager, apiPrefs)
-    }
-}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/LearnViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/LearnViewModelTest.kt
deleted file mode 100644
index 08f77ed2de..0000000000
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/LearnViewModelTest.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2025 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn
-
-import androidx.lifecycle.SavedStateHandle
-import com.instructure.horizon.features.learn.navigation.LearnRoute
-import io.mockk.every
-import io.mockk.mockk
-import junit.framework.TestCase.assertEquals
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.resetMain
-import kotlinx.coroutines.test.setMain
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class LearnViewModelTest {
-    private val testDispatcher = UnconfinedTestDispatcher()
-
-    @Before
-    fun setup() {
-        Dispatchers.setMain(testDispatcher)
-    }
-
-    @After
-    fun tearDown() {
-        Dispatchers.resetMain()
-    }
-
-    @Test
-    fun `Initial state has COURSES tab selected by default`() {
-        val savedStateHandle = SavedStateHandle()
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.COURSES, state.selectedTab)
-        assertEquals(LearnTab.entries, state.tabs)
-    }
-
-    @Test
-    fun `Initial state restores selected tab from SavedStateHandle when provided`() {
-        val savedStateHandle = SavedStateHandle(mapOf(
-            LearnRoute.LearnScreen.selectedTabAttr to "programs"
-        ))
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.PROGRAMS, state.selectedTab)
-    }
-
-    @Test
-    fun `Initial state ignores invalid tab string from SavedStateHandle`() {
-        val savedStateHandle = SavedStateHandle(mapOf(
-            LearnRoute.LearnScreen.selectedTabAttr to "invalid_tab"
-        ))
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.COURSES, state.selectedTab)
-    }
-
-    @Test
-    fun `updateSelectedTabIndex updates selected tab`() {
-        val savedStateHandle = SavedStateHandle()
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        viewModel.state.value.updateSelectedTabIndex(1)
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.PROGRAMS, state.selectedTab)
-    }
-
-    @Test
-    fun `updateSelectedTabIndex with 0 selects COURSES tab`() {
-        val savedStateHandle = SavedStateHandle(mapOf(
-            LearnRoute.LearnScreen.selectedTabAttr to "programs"
-        ))
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        viewModel.state.value.updateSelectedTabIndex(0)
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.COURSES, state.selectedTab)
-    }
-
-    @Test
-    fun `updateSelectedTab updates selected tab by string value`() {
-        val savedStateHandle = SavedStateHandle()
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        viewModel.state.value.updateSelectedTab("programs")
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.PROGRAMS, state.selectedTab)
-    }
-
-    @Test
-    fun `updateSelectedTab with courses string selects COURSES tab`() {
-        val savedStateHandle = SavedStateHandle(mapOf(
-            LearnRoute.LearnScreen.selectedTabAttr to "programs"
-        ))
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        viewModel.state.value.updateSelectedTab("courses")
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.COURSES, state.selectedTab)
-    }
-
-    @Test
-    fun `updateSelectedTab with invalid string does not change tab`() {
-        val savedStateHandle = SavedStateHandle()
-        val viewModel = LearnViewModel(savedStateHandle)
-        val initialTab = viewModel.state.value.selectedTab
-
-        viewModel.state.value.updateSelectedTab("invalid_value")
-
-        val state = viewModel.state.value
-        assertEquals(initialTab, state.selectedTab)
-    }
-
-    @Test
-    fun `State callbacks are properly initialized`() {
-        val savedStateHandle = SavedStateHandle()
-        val viewModel = LearnViewModel(savedStateHandle)
-
-        val state = viewModel.state.value
-        assertEquals(LearnTab.entries, state.tabs)
-        assertEquals(LearnTab.COURSES, state.selectedTab)
-    }
-}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/course/list/LearnCourseListRepositoryTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/course/list/LearnCourseListRepositoryTest.kt
deleted file mode 100644
index 88ed81cad2..0000000000
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/course/list/LearnCourseListRepositoryTest.kt
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2025 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.course.list
-
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
-import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
-import com.instructure.canvasapi2.models.User
-import com.instructure.canvasapi2.utils.ApiPrefs
-import com.instructure.canvasapi2.utils.DataResult
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.mockk
-import junit.framework.TestCase.assertEquals
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-
-class LearnCourseListRepositoryTest {
-    private val horizonGetCoursesManager: HorizonGetCoursesManager = mockk(relaxed = true)
-    private val apiPrefs: ApiPrefs = mockk(relaxed = true)
-
-    private val testUser = User(id = 456L)
-    private val coursesWithProgress = listOf(
-        CourseWithProgress(
-            courseId = 1L,
-            courseName = "Introduction to Programming",
-            courseImageUrl = "https://example.com/prog.png",
-            progress = 0.0,
-            courseSyllabus = "Learn programming basics"
-        ),
-        CourseWithProgress(
-            courseId = 2L,
-            courseName = "Advanced Mathematics",
-            courseImageUrl = "https://example.com/math.png",
-            progress = 50.0,
-            courseSyllabus = "Advanced math topics"
-        ),
-        CourseWithProgress(
-            courseId = 3L,
-            courseName = "Web Development",
-            courseImageUrl = "https://example.com/web.png",
-            progress = 100.0,
-            courseSyllabus = "Build modern websites"
-        )
-    )
-
-    @Before
-    fun setup() {
-        every { apiPrefs.user } returns testUser
-        coEvery { horizonGetCoursesManager.getCoursesWithProgress(any(), any()) } returns DataResult.Success(coursesWithProgress)
-    }
-
-    @Test
-    fun `getCoursesWithProgress returns list of courses`() = runTest {
-        val repository = getRepository()
-        val result = repository.getCoursesWithProgress(false)
-
-        assertEquals(3, result.size)
-        assertEquals(coursesWithProgress, result)
-        coVerify { horizonGetCoursesManager.getCoursesWithProgress(456L, false) }
-    }
-
-    @Test
-    fun `getCoursesWithProgress with forceNetwork true calls API with force network`() = runTest {
-        val repository = getRepository()
-        repository.getCoursesWithProgress(true)
-
-        coVerify { horizonGetCoursesManager.getCoursesWithProgress(456L, true) }
-    }
-
-    @Test
-    fun `getCoursesWithProgress uses -1 when user is null`() = runTest {
-        every { apiPrefs.user } returns null
-        val repository = getRepository()
-        repository.getCoursesWithProgress(false)
-
-        coVerify { horizonGetCoursesManager.getCoursesWithProgress(-1L, false) }
-    }
-
-    @Test
-    fun `getCoursesWithProgress returns empty list when no courses`() = runTest {
-        coEvery { horizonGetCoursesManager.getCoursesWithProgress(any(), any()) } returns DataResult.Success(emptyList())
-        val repository = getRepository()
-        val result = repository.getCoursesWithProgress(false)
-
-        assertEquals(0, result.size)
-    }
-
-    private fun getRepository(): LearnCourseListRepository {
-        return LearnCourseListRepository(horizonGetCoursesManager, apiPrefs)
-    }
-}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/course/list/LearnCourseListViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/course/list/LearnCourseListViewModelTest.kt
deleted file mode 100644
index e9b1493eb1..0000000000
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/course/list/LearnCourseListViewModelTest.kt
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (C) 2025 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.course.list
-
-import android.content.Context
-import androidx.compose.ui.text.input.TextFieldValue
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.mockk
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertFalse
-import junit.framework.TestCase.assertNull
-import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.resetMain
-import kotlinx.coroutines.test.setMain
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class LearnCourseListViewModelTest {
-    private val context: Context = mockk(relaxed = true)
-    private val repository: LearnCourseListRepository = mockk(relaxed = true)
-    private val testDispatcher = UnconfinedTestDispatcher()
-
-    private val testCourses = listOf(
-        CourseWithProgress(
-            courseId = 1L,
-            courseName = "Introduction to Programming",
-            courseImageUrl = "https://example.com/prog.png",
-            progress = 0.0,
-            courseSyllabus = "Learn programming basics"
-        ),
-        CourseWithProgress(
-            courseId = 2L,
-            courseName = "Advanced Mathematics",
-            courseImageUrl = "https://example.com/math.png",
-            progress = 50.0,
-            courseSyllabus = "Advanced math topics"
-        ),
-        CourseWithProgress(
-            courseId = 3L,
-            courseName = "Web Development",
-            courseImageUrl = "https://example.com/web.png",
-            progress = 100.0,
-            courseSyllabus = "Build modern websites"
-        ),
-        CourseWithProgress(
-            courseId = 4L,
-            courseName = "Data Science",
-            courseImageUrl = "https://example.com/data.png",
-            progress = 25.0,
-            courseSyllabus = "Analyze data"
-        )
-    )
-
-    @Before
-    fun setup() {
-        Dispatchers.setMain(testDispatcher)
-        coEvery { repository.getCoursesWithProgress(any()) } returns testCourses
-    }
-
-    @After
-    fun tearDown() {
-        Dispatchers.resetMain()
-    }
-
-    @Test
-    fun `Initial state loads courses successfully`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.state.value
-        assertFalse(state.loadingState.isLoading)
-        assertFalse(state.loadingState.isError)
-        assertEquals(4, state.coursesToDisplay.size)
-        coVerify { repository.getCoursesWithProgress(false) }
-    }
-
-    @Test
-    fun `Initial state sets default filter to All`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.state.value
-        assertEquals(LearnCourseFilterOption.All, state.selectedFilterValue)
-    }
-
-    @Test
-    fun `Initial state sets visible item count to 10`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.state.value
-        assertEquals(10, state.visibleItemCount)
-    }
-
-    @Test
-    fun `Initial state has empty search query`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.state.value
-        assertEquals("", state.searchQuery.text)
-    }
-
-    @Test
-    fun `Loading state shows error when repository fails`() {
-        coEvery { repository.getCoursesWithProgress(any()) } throws Exception("Network error")
-        val viewModel = getViewModel()
-
-        val state = viewModel.state.value
-        assertTrue(state.loadingState.isError)
-        assertFalse(state.loadingState.isLoading)
-    }
-
-    @Test
-    fun `Filter by NotStarted shows only courses with 0 progress`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.NotStarted)
-
-        val state = viewModel.state.value
-        assertEquals(1, state.coursesToDisplay.size)
-        assertEquals("Introduction to Programming", state.coursesToDisplay[0].courseName)
-        assertEquals(0.0, state.coursesToDisplay[0].progress)
-    }
-
-    @Test
-    fun `Filter by InProgress shows only courses with 0-100 progress`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.InProgress)
-
-        val state = viewModel.state.value
-        assertEquals(2, state.coursesToDisplay.size)
-        assertTrue(state.coursesToDisplay.any { it.courseName == "Advanced Mathematics" })
-        assertTrue(state.coursesToDisplay.any { it.courseName == "Data Science" })
-    }
-
-    @Test
-    fun `Filter by Completed shows only courses with 100 progress`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.Completed)
-
-        val state = viewModel.state.value
-        assertEquals(1, state.coursesToDisplay.size)
-        assertEquals("Web Development", state.coursesToDisplay[0].courseName)
-        assertEquals(100.0, state.coursesToDisplay[0].progress)
-    }
-
-    @Test
-    fun `Filter by All shows all courses`() {
-        val viewModel = getViewModel()
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.NotStarted)
-
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.All)
-
-        val state = viewModel.state.value
-        assertEquals(4, state.coursesToDisplay.size)
-    }
-
-    @Test
-    fun `Search query filters courses by name case-insensitive`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateSearchQuery(TextFieldValue("programming"))
-
-        val state = viewModel.state.value
-        assertEquals(1, state.coursesToDisplay.size)
-        assertEquals("Introduction to Programming", state.coursesToDisplay[0].courseName)
-    }
-
-    @Test
-    fun `Search query with partial match filters correctly`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateSearchQuery(TextFieldValue("dev"))
-
-        val state = viewModel.state.value
-        assertEquals(1, state.coursesToDisplay.size)
-        assertEquals("Web Development", state.coursesToDisplay[0].courseName)
-    }
-
-    @Test
-    fun `Search query with no match returns empty list`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateSearchQuery(TextFieldValue("NonExistentCourse"))
-
-        val state = viewModel.state.value
-        assertEquals(0, state.coursesToDisplay.size)
-    }
-
-    @Test
-    fun `Search query trims whitespace`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateSearchQuery(TextFieldValue("  mathematics  "))
-
-        val state = viewModel.state.value
-        assertEquals(1, state.coursesToDisplay.size)
-        assertEquals("Advanced Mathematics", state.coursesToDisplay[0].courseName)
-    }
-
-    @Test
-    fun `Combined filter and search works correctly`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.InProgress)
-        viewModel.state.value.updateSearchQuery(TextFieldValue("math"))
-
-        val state = viewModel.state.value
-        assertEquals(1, state.coursesToDisplay.size)
-        assertEquals("Advanced Mathematics", state.coursesToDisplay[0].courseName)
-    }
-
-    @Test
-    fun `Combined filter and search with no match returns empty list`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.Completed)
-        viewModel.state.value.updateSearchQuery(TextFieldValue("programming"))
-
-        val state = viewModel.state.value
-        assertEquals(0, state.coursesToDisplay.size)
-    }
-
-    @Test
-    fun `increaseVisibleItemCount increases count by 10`() {
-        val viewModel = getViewModel()
-        val initialCount = viewModel.state.value.visibleItemCount
-
-        viewModel.state.value.increaseVisibleItemCount()
-
-        val state = viewModel.state.value
-        assertEquals(initialCount + 10, state.visibleItemCount)
-    }
-
-    @Test
-    fun `Multiple increaseVisibleItemCount calls accumulate`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.increaseVisibleItemCount()
-        viewModel.state.value.increaseVisibleItemCount()
-
-        val state = viewModel.state.value
-        assertEquals(30, state.visibleItemCount)
-    }
-
-    @Test
-    fun `Refresh calls repository with forceNetwork true`() {
-        val viewModel = getViewModel()
-
-        viewModel.state.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        coVerify { repository.getCoursesWithProgress(true) }
-    }
-
-    @Test
-    fun `Refresh updates courses list`() {
-        val viewModel = getViewModel()
-        val updatedCourses = listOf(
-            CourseWithProgress(
-                courseId = 5L,
-                courseName = "New Course",
-                courseImageUrl = "https://example.com/new.png",
-                progress = 0.0,
-                courseSyllabus = "New syllabus"
-            )
-        )
-        coEvery { repository.getCoursesWithProgress(true) } returns updatedCourses
-
-        viewModel.state.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        val state = viewModel.state.value
-        assertFalse(state.loadingState.isRefreshing)
-        assertEquals(1, state.coursesToDisplay.size)
-        assertEquals("New Course", state.coursesToDisplay[0].courseName)
-    }
-
-    @Test
-    fun `Refresh on error shows snackbar message`() {
-        val viewModel = getViewModel()
-        coEvery { repository.getCoursesWithProgress(true) } throws Exception("Network error")
-
-        viewModel.state.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        val state = viewModel.state.value
-        assertFalse(state.loadingState.isRefreshing)
-        assertTrue(state.loadingState.snackbarMessage != null)
-    }
-
-    @Test
-    fun `Dismiss snackbar clears snackbar message`() {
-        val viewModel = getViewModel()
-        coEvery { repository.getCoursesWithProgress(true) } throws Exception("Network error")
-        viewModel.state.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        viewModel.state.value.loadingState.onSnackbarDismiss()
-
-        val state = viewModel.state.value
-        assertNull(state.loadingState.snackbarMessage)
-    }
-
-    @Test
-    fun `Courses are mapped correctly to LearnCourseState`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.state.value
-        val firstCourse = state.coursesToDisplay[0]
-        assertEquals(1L, firstCourse.courseId)
-        assertEquals("Introduction to Programming", firstCourse.courseName)
-        assertEquals("https://example.com/prog.png", firstCourse.imageUrl)
-        assertEquals(0.0, firstCourse.progress)
-    }
-
-    @Test
-    fun `Changing filter resets to filtered view of all loaded courses`() {
-        val viewModel = getViewModel()
-        viewModel.state.value.updateSearchQuery(TextFieldValue("programming"))
-
-        viewModel.state.value.updateFilterValue(LearnCourseFilterOption.InProgress)
-
-        val state = viewModel.state.value
-        assertEquals(0, state.coursesToDisplay.size)
-    }
-
-    @Test
-    fun `Empty courses list loads successfully`() {
-        coEvery { repository.getCoursesWithProgress(any()) } returns emptyList()
-        val viewModel = getViewModel()
-
-        val state = viewModel.state.value
-        assertFalse(state.loadingState.isLoading)
-        assertFalse(state.loadingState.isError)
-        assertEquals(0, state.coursesToDisplay.size)
-    }
-
-    private fun getViewModel(): LearnCourseListViewModel {
-        return LearnCourseListViewModel(context, repository)
-    }
-}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterViewModelTest.kt
new file mode 100644
index 0000000000..8b3b760c19
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/filter/LearnLearningLibraryFilterViewModelTest.kt
@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.filter
+
+import android.content.res.Resources
+import androidx.lifecycle.SavedStateHandle
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnLearningLibraryFilterViewModelTest {
+
+    private val resources: Resources = mockk(relaxed = true)
+    private val eventHandler = LearnEventHandler()
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    @Before
+    fun setup() {
+        Dispatchers.setMain(testDispatcher)
+        every { resources.getString(any()) } returns ""
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `Browse screenType includes standard item type filters excluding Programs`() = runTest {
+        every { resources.getString(LearnLearningLibraryTypeFilter.Programs.labelRes) } returns "Programs"
+        val viewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.Browse)
+
+        val typeSection = viewModel.uiState.value.sections.last()
+        val labels = typeSection.items.map { it.label }
+
+        assertTrue(labels.none { it == "Programs" })
+        assertTrue(typeSection.items.size > 2)
+    }
+
+    @Test
+    fun `MyContent screenType includes only All, Programs and Courses filters`() = runTest {
+        every { resources.getString(LearnLearningLibraryTypeFilter.All.labelRes) } returns "All"
+        every { resources.getString(LearnLearningLibraryTypeFilter.Programs.labelRes) } returns "Programs"
+        every { resources.getString(LearnLearningLibraryTypeFilter.Courses.labelRes) } returns "Courses"
+        val viewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.MyContent)
+
+        val typeSection = viewModel.uiState.value.sections.last()
+
+        assertEquals(3, typeSection.items.size)
+    }
+
+    @Test
+    fun `MyContentSaved screenType has same filter count as Browse`() = runTest {
+        val browseViewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.Browse)
+        val savedViewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.MyContentSaved)
+
+        val browseCount = browseViewModel.uiState.value.sections.last().items.size
+        val savedCount = savedViewModel.uiState.value.sections.last().items.size
+
+        assertEquals(browseCount, savedCount)
+    }
+
+    @Test
+    fun `Initial state has MostRecent sort option selected`() = runTest {
+        val viewModel = getViewModel()
+
+        val sortSection = viewModel.uiState.value.sections.first()
+        val mostRecentItem = sortSection.items.first()
+
+        assertTrue(mostRecentItem.isSelected)
+    }
+
+    @Test
+    fun `Initial state has All type filter selected`() = runTest {
+        val viewModel = getViewModel()
+
+        val typeSection = viewModel.uiState.value.sections.last()
+        val allItem = typeSection.items.first()
+
+        assertTrue(allItem.isSelected)
+    }
+
+    @Test
+    fun `Selecting a sort option updates isSelected in state`() = runTest {
+        val viewModel = getViewModel()
+        val sortSection = viewModel.uiState.value.sections.first()
+
+        sortSection.items[1].onSelected()
+
+        val updatedSortSection = viewModel.uiState.value.sections.first()
+        assertFalse(updatedSortSection.items[0].isSelected)
+        assertTrue(updatedSortSection.items[1].isSelected)
+    }
+
+    @Test
+    fun `Selecting a type filter updates isSelected in state`() = runTest {
+        val viewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.MyContent)
+        val typeSection = viewModel.uiState.value.sections.last()
+
+        typeSection.items[1].onSelected()
+
+        val updatedTypeSection = viewModel.uiState.value.sections.last()
+        assertFalse(updatedTypeSection.items[0].isSelected)
+        assertTrue(updatedTypeSection.items[1].isSelected)
+    }
+
+    @Test
+    fun `Selecting a type filter emits UpdateLearningLibraryFilter event`() = runTest {
+        val viewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.MyContent)
+        val typeSection = viewModel.uiState.value.sections.last()
+
+        var lastEvent: LearnEvent? = null
+        val job = launch(testDispatcher) {
+            eventHandler.events.collect { lastEvent = it }
+        }
+
+        typeSection.items[2].onSelected()
+
+        val event = lastEvent as? LearnEvent.UpdateLearningLibraryFilter
+        assertEquals(LearnLearningLibraryFilterScreenType.MyContent, event?.screenType)
+        job.cancel()
+    }
+
+    @Test
+    fun `Selecting a sort option emits UpdateLearningLibraryFilter event with correct sort`() = runTest {
+        val viewModel = getViewModel()
+        val sortSection = viewModel.uiState.value.sections.first()
+
+        var lastEvent: LearnEvent? = null
+        val job = launch(testDispatcher) {
+            eventHandler.events.collect { lastEvent = it }
+        }
+
+        sortSection.items.last().onSelected()
+
+        val event = lastEvent as? LearnEvent.UpdateLearningLibraryFilter
+        assertEquals(LearnLearningLibrarySortOption.NameDescending, event?.sortOption)
+        job.cancel()
+    }
+
+    @Test
+    fun `clearFilters resets to All type filter and MostRecent sort`() = runTest {
+        val viewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.MyContent)
+        viewModel.uiState.value.sections.last().items[1].onSelected()
+        viewModel.uiState.value.sections.first().items[2].onSelected()
+
+        viewModel.uiState.value.onClearFilters()
+
+        val sortSection = viewModel.uiState.value.sections.first()
+        val typeSection = viewModel.uiState.value.sections.last()
+        assertTrue(sortSection.items[0].isSelected)
+        assertTrue(typeSection.items[0].isSelected)
+    }
+
+    @Test
+    fun `clearFilters emits UpdateLearningLibraryFilter with All and MostRecent`() = runTest {
+        val viewModel = getViewModel(screenType = LearnLearningLibraryFilterScreenType.Browse)
+        viewModel.uiState.value.sections.last().items[1].onSelected()
+
+        var lastEvent: LearnEvent? = null
+        val job = launch(testDispatcher) {
+            eventHandler.events.collect { lastEvent = it }
+        }
+
+        viewModel.uiState.value.onClearFilters()
+
+        val event = lastEvent as? LearnEvent.UpdateLearningLibraryFilter
+        assertEquals(LearnLearningLibraryTypeFilter.All, event?.typeFilter)
+        assertEquals(LearnLearningLibrarySortOption.MostRecent, event?.sortOption)
+        job.cancel()
+    }
+
+    @Test
+    fun `SavedStateHandle initializes typeFilter from saved args`() = runTest {
+        val viewModel = getViewModel(
+            screenType = LearnLearningLibraryFilterScreenType.MyContent,
+            initialTypeFilter = LearnLearningLibraryTypeFilter.Courses,
+        )
+
+        val typeSection = viewModel.uiState.value.sections.last()
+        val coursesItem = typeSection.items.first { it.isSelected }
+
+        assertTrue(coursesItem.isSelected)
+    }
+
+    @Test
+    fun `SavedStateHandle initializes sortOption from saved args`() = runTest {
+        val viewModel = getViewModel(
+            initialSortOption = LearnLearningLibrarySortOption.NameAscending,
+        )
+
+        val sortSection = viewModel.uiState.value.sections.first()
+        val selectedItem = sortSection.items.first { it.isSelected }
+
+        assertTrue(selectedItem.isSelected)
+    }
+
+    @Test
+    fun `Two sort sections and type sections are always present`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(2, viewModel.uiState.value.sections.size)
+    }
+
+    private fun getViewModel(
+        screenType: LearnLearningLibraryFilterScreenType = LearnLearningLibraryFilterScreenType.Browse,
+        initialTypeFilter: LearnLearningLibraryTypeFilter = LearnLearningLibraryTypeFilter.All,
+        initialSortOption: LearnLearningLibrarySortOption = LearnLearningLibrarySortOption.MostRecent,
+    ): LearnLearningLibraryFilterViewModel {
+        val savedStateHandle = SavedStateHandle(
+            mapOf(
+                LearnRoute.LearnLearningLibraryFilterScreen.screenTypeAttr to screenType.name,
+                LearnRoute.LearnLearningLibraryFilterScreen.typeFilterAttr to initialTypeFilter.name,
+                LearnRoute.LearnLearningLibraryFilterScreen.sortOptionAttr to initialSortOption.name,
+            )
+        )
+        return LearnLearningLibraryFilterViewModel(resources, eventHandler, savedStateHandle)
+    }
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsRepositoryTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsRepositoryTest.kt
new file mode 100644
index 0000000000..fa549e295d
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsRepositoryTest.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.details
+
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+class LearnLearningLibraryDetailsRepositoryTest {
+    private val getLearningLibraryManager: GetLearningLibraryManager = mockk(relaxed = true)
+
+    private val testCollection = EnrolledLearningLibraryCollection(
+        id = "collection1",
+        name = "Test Collection",
+        publicName = "Test Collection Public",
+        description = "Test description",
+        createdAt = Date(),
+        updatedAt = Date(),
+        totalItemCount = 3,
+        items = listOf(
+            createTestCollectionItem(
+                id = "item1",
+                courseName = "Course 1",
+                courseId = "1",
+                isBookmarked = false,
+                itemType = CollectionItemType.COURSE
+            ),
+            createTestCollectionItem(
+                id = "item2",
+                courseName = "Course 2",
+                courseId = "2",
+                isBookmarked = true,
+                itemType = CollectionItemType.PAGE
+            ),
+            createTestCollectionItem(
+                id = "item3",
+                courseName = "Assignment 1",
+                courseId = "3",
+                isBookmarked = false,
+                itemType = CollectionItemType.ASSIGNMENT
+            )
+        )
+    )
+
+    @Before
+    fun setup() {
+        coEvery { getLearningLibraryManager.getEnrolledLearningLibraryCollection(any(), any()) } returns testCollection
+    }
+
+    @Test
+    fun `getLearningLibraryItems returns collection with items`() = runTest {
+        val repository = getRepository()
+        val result = repository.getLearningLibraryItems("collection1", false)
+
+        assertEquals("Test Collection", result.name)
+        assertEquals(3, result.items.size)
+        assertEquals("Course 1", result.items[0].canvasCourse?.courseName)
+        coVerify { getLearningLibraryManager.getEnrolledLearningLibraryCollection("collection1", false) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with forceRefresh true calls API with force refresh`() = runTest {
+        val repository = getRepository()
+        repository.getLearningLibraryItems("collection1", true)
+
+        coVerify { getLearningLibraryManager.getEnrolledLearningLibraryCollection("collection1", true) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems returns empty items when collection has no items`() = runTest {
+        val emptyCollection = testCollection.copy(items = emptyList())
+        coEvery { getLearningLibraryManager.getEnrolledLearningLibraryCollection(any(), any()) } returns emptyCollection
+        val repository = getRepository()
+
+        val result = repository.getLearningLibraryItems("collection1", false)
+
+        assertEquals(0, result.items.size)
+    }
+
+    @Test
+    fun `toggleLearningLibraryItemIsBookmarked returns new bookmark state true`() = runTest {
+        coEvery { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+        val repository = getRepository()
+
+        val result = repository.toggleLearningLibraryItemIsBookmarked("item1")
+
+        assertTrue(result)
+        coVerify { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item1") }
+    }
+
+    @Test
+    fun `toggleLearningLibraryItemIsBookmarked returns new bookmark state false`() = runTest {
+        coEvery { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item2") } returns false
+        val repository = getRepository()
+
+        val result = repository.toggleLearningLibraryItemIsBookmarked("item2")
+
+        assertFalse(result)
+        coVerify { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item2") }
+    }
+
+    private fun getRepository(): LearnLearningLibraryDetailsRepository {
+        return LearnLearningLibraryDetailsRepository(getLearningLibraryManager)
+    }
+
+    private fun createTestCollectionItem(
+        id: String,
+        courseName: String,
+        courseId: String,
+        isBookmarked: Boolean,
+        itemType: CollectionItemType,
+        isEnrolledInCanvas: Boolean = false
+    ): LearningLibraryCollectionItem = LearningLibraryCollectionItem(
+        id = id,
+        itemType = itemType,
+        isBookmarked = isBookmarked,
+        completionPercentage = 0.0,
+        isEnrolledInCanvas = isEnrolledInCanvas,
+        canvasCourse = CanvasCourseInfo(
+            courseId = courseId,
+            courseName = courseName,
+            courseImageUrl = "https://example.com/$courseId.png",
+            estimatedDurationMinutes = 60.0,
+            moduleCount = 5.0,
+            moduleItemCount = 10.0,
+            canvasUrl = "https://example.com",
+        ),
+        libraryId = "library1",
+        displayOrder = 1.0,
+        programId = null,
+        programCourseId = null,
+        createdAt = Date(),
+        updatedAt = Date(),
+        moduleInfo = null,
+        canvasEnrollmentId = null
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsViewModelTest.kt
new file mode 100644
index 0000000000..0f0a198ab2
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/details/LearnLearningLibraryDetailsViewModelTest.kt
@@ -0,0 +1,633 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.details
+
+import android.content.res.Resources
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.lifecycle.SavedStateHandle
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryStatusFilter
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.pandautils.utils.ThemePrefs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertNull
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnLearningLibraryDetailsViewModelTest {
+    private val resources: Resources = mockk(relaxed = true)
+    private val repository: LearnLearningLibraryDetailsRepository = mockk(relaxed = true)
+    private val savedStateHandle: SavedStateHandle = mockk(relaxed = true)
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    private val testCollectionId = "testCollection123"
+    private val testCollection = createTestCollection(
+        id = testCollectionId,
+        name = "Software Engineering",
+        items = listOf(
+            createTestCollectionItem(
+                id = "item1",
+                courseName = "Introduction to Programming",
+                courseId = "1",
+                completionPercentage = 0.0,
+                isBookmarked = false,
+                itemType = CollectionItemType.COURSE
+            ),
+            createTestCollectionItem(
+                id = "item2",
+                courseName = "Advanced Algorithms",
+                courseId = "2",
+                completionPercentage = 50.0,
+                isBookmarked = true,
+                itemType = CollectionItemType.ASSIGNMENT
+            ),
+            createTestCollectionItem(
+                id = "item3",
+                courseName = "Data Structures",
+                courseId = "3",
+                completionPercentage = 100.0,
+                isBookmarked = false,
+                itemType = CollectionItemType.PAGE
+            ),
+            createTestCollectionItem(
+                id = "item4",
+                courseName = "Web Development Guide",
+                courseId = "4",
+                completionPercentage = 0.0,
+                isBookmarked = true,
+                itemType = CollectionItemType.FILE
+            ),
+            createTestCollectionItem(
+                id = "item5",
+                courseName = "External Learning Resource",
+                courseId = "5",
+                completionPercentage = 100.0,
+                isBookmarked = false,
+                itemType = CollectionItemType.EXTERNAL_URL
+            ),
+            createTestCollectionItem(
+                id = "item6",
+                courseName = "Tool Integration",
+                courseId = "6",
+                completionPercentage = 0.0,
+                isBookmarked = false,
+                itemType = CollectionItemType.EXTERNAL_TOOL
+            )
+        )
+    )
+
+    @Before
+    fun setup() {
+        mockkObject(ThemePrefs)
+        every { ThemePrefs.brandColor } returns 0xFF0000FF.toInt()
+        every { ThemePrefs.mobileLogoUrl } returns "https://example.com/logo.png"
+        Dispatchers.setMain(testDispatcher)
+
+        every { resources.getString(any()) } returns ""
+        every { resources.getString(any(), *anyVararg()) } returns ""
+        every { resources.getQuantityString(any(), any()) } returns "items"
+        every { resources.getQuantityString(any(), any(), *anyVararg()) } returns "items"
+
+        every { savedStateHandle.get<String>(LearnRoute.LearnLearningLibraryDetailsScreen.collectionIdAttr) } returns testCollectionId
+
+        coEvery { repository.getLearningLibraryItems(any(), any()) } returns testCollection
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `Initial state loads collection successfully`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.loadingState.isLoading)
+        assertFalse(state.loadingState.isError)
+        assertEquals("Software Engineering", state.collectionName)
+        assertEquals(6, state.items.size)
+        coVerify { repository.getLearningLibraryItems(testCollectionId, false) }
+    }
+
+    @Test
+    fun `Initial state has empty search query`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertEquals("", state.searchQuery.text)
+    }
+
+    @Test
+    fun `Initial state sets visible item count to pageSize`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertEquals(10, state.itemsToDisplay)
+    }
+
+    @Test
+    fun `Initial state has default filter values`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertEquals(LearnLearningLibraryStatusFilter.All, state.selectedStatusFilter)
+        assertEquals(LearnLearningLibraryTypeFilter.All, state.selectedTypeFilter)
+    }
+
+    @Test
+    fun `Loading state shows error when repository fails`() = runTest {
+        coEvery { repository.getLearningLibraryItems(any(), any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertTrue(state.loadingState.isError)
+        assertFalse(state.loadingState.isLoading)
+    }
+
+    @Test
+    fun `Empty collection loads successfully`() = runTest {
+        val emptyCollection = testCollection.copy(items = emptyList())
+        coEvery { repository.getLearningLibraryItems(any(), any()) } returns emptyCollection
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.loadingState.isLoading)
+        assertFalse(state.loadingState.isError)
+        assertEquals(0, state.items.size)
+    }
+
+    @Test
+    fun `Search query filters items by name case-insensitive`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("programming"))
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals("Introduction to Programming", state.items[0].name)
+    }
+
+    @Test
+    fun `Search query with partial match filters correctly`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("web"))
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals("Web Development Guide", state.items[0].name)
+    }
+
+    @Test
+    fun `Search query with no match returns empty list`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("NonExistentItem"))
+
+        val state = viewModel.uiState.value
+        assertEquals(0, state.items.size)
+    }
+
+    @Test
+    fun `Search query trims whitespace`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("  algorithms  "))
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals("Advanced Algorithms", state.items[0].name)
+    }
+
+    @Test
+    fun `All status filter shows all items`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSelectedStatusFilter(LearnLearningLibraryStatusFilter.All)
+
+        val state = viewModel.uiState.value
+        assertEquals(6, state.items.size)
+    }
+
+    @Test
+    fun `Bookmarked status filter shows only bookmarked items`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSelectedStatusFilter(LearnLearningLibraryStatusFilter.Bookmarked)
+
+        val state = viewModel.uiState.value
+        assertEquals(2, state.items.size)
+        assertTrue(state.items.all { it.isBookmarked })
+    }
+
+    @Test
+    fun `All type filter shows all items`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.All)
+
+        val state = viewModel.uiState.value
+        assertEquals(6, state.items.size)
+    }
+
+    @Test
+    fun `Assignments type filter shows only assignments`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.Assignments)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals(CollectionItemType.ASSIGNMENT, state.items[0].type)
+    }
+
+    @Test
+    fun `Pages type filter shows only pages`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.Pages)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals(CollectionItemType.PAGE, state.items[0].type)
+    }
+
+    @Test
+    fun `Files type filter shows only files`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.Files)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals(CollectionItemType.FILE, state.items[0].type)
+    }
+
+    @Test
+    fun `ExternalLinks type filter shows only external URLs`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.ExternalLinks)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals(CollectionItemType.EXTERNAL_URL, state.items[0].type)
+    }
+
+    @Test
+    fun `ExternalTools type filter shows only external tools`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.ExternalTools)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals(CollectionItemType.EXTERNAL_TOOL, state.items[0].type)
+    }
+
+    @Test
+    fun `Assessments type filter returns empty list`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.Assessments)
+
+        val state = viewModel.uiState.value
+        assertEquals(0, state.items.size)
+    }
+
+    @Test
+    fun `Search and status filter work together`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("Advanced"))
+        viewModel.uiState.value.updateSelectedStatusFilter(LearnLearningLibraryStatusFilter.Bookmarked)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals("Advanced Algorithms", state.items[0].name)
+        assertTrue(state.items[0].isBookmarked)
+    }
+
+    @Test
+    fun `Search and type filter work together`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("Development"))
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.Files)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals("Web Development Guide", state.items[0].name)
+        assertEquals(CollectionItemType.FILE, state.items[0].type)
+    }
+
+    @Test
+    fun `All three filters work together`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("External"))
+        viewModel.uiState.value.updateSelectedStatusFilter(LearnLearningLibraryStatusFilter.Completed)
+        viewModel.uiState.value.updateTypeFilter(LearnLearningLibraryTypeFilter.ExternalLinks)
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.items.size)
+        assertEquals("External Learning Resource", state.items[0].name)
+        assertEquals(CollectionItemType.EXTERNAL_URL, state.items[0].type)
+    }
+
+    @Test
+    fun `increaseItemsToDisplay increases count by pageSize`() = runTest {
+        val viewModel = getViewModel()
+        val initialCount = viewModel.uiState.value.itemsToDisplay
+
+        viewModel.uiState.value.increaseItemsToDisplay()
+
+        val state = viewModel.uiState.value
+        assertEquals(initialCount + 10, state.itemsToDisplay)
+    }
+
+    @Test
+    fun `Multiple increaseItemsToDisplay calls accumulate`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.increaseItemsToDisplay()
+        viewModel.uiState.value.increaseItemsToDisplay()
+
+        val state = viewModel.uiState.value
+        assertEquals(30, state.itemsToDisplay)
+    }
+
+    @Test
+    fun `Pagination works with filtered items`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSelectedStatusFilter(LearnLearningLibraryStatusFilter.Bookmarked)
+        viewModel.uiState.value.increaseItemsToDisplay()
+
+        val state = viewModel.uiState.value
+        assertEquals(20, state.itemsToDisplay)
+        assertEquals(2, state.items.size)
+    }
+
+    @Test
+    fun `onBookmarkClicked sets loading state and updates bookmark to true`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+
+        viewModel.uiState.value.onBookmarkClicked("item1")
+
+        val state = viewModel.uiState.value
+        val item = state.items.find { it.id == "item1" }
+        assertNotNull(item)
+        assertTrue(item!!.isBookmarked)
+        assertFalse(item.bookmarkLoading)
+        coVerify { repository.toggleLearningLibraryItemIsBookmarked("item1") }
+    }
+
+    @Test
+    fun `onBookmarkClicked updates bookmark to false`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item2") } returns false
+
+        viewModel.uiState.value.onBookmarkClicked("item2")
+
+        val state = viewModel.uiState.value
+        val item = state.items.find { it.id == "item2" }
+        assertNotNull(item)
+        assertFalse(item!!.isBookmarked)
+        assertFalse(item.bookmarkLoading)
+    }
+
+    @Test
+    fun `onBookmarkClicked handles errors and shows error message`() = runTest {
+        val viewModel = getViewModel()
+        every { resources.getString(R.string.learnLearningLibraryFailedToUpdateBookmarkMessage) } returns "Failed to update bookmark"
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } throws Exception("Network error")
+
+        viewModel.uiState.value.onBookmarkClicked("item1")
+
+        val state = viewModel.uiState.value
+        val item = state.items.find { it.id == "item1" }
+        assertNotNull(item)
+        assertFalse(item!!.bookmarkLoading)
+        assertNotNull(state.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `onBookmarkClicked updates only the correct item`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+
+        val initialItem2Bookmark = viewModel.uiState.value.items.find { it.id == "item2" }!!.isBookmarked
+
+        viewModel.uiState.value.onBookmarkClicked("item1")
+
+        val state = viewModel.uiState.value
+        val item1 = state.items.find { it.id == "item1" }
+        val item2 = state.items.find { it.id == "item2" }
+
+        assertTrue(item1!!.isBookmarked)
+        assertEquals(initialItem2Bookmark, item2!!.isBookmarked)
+    }
+
+    @Test
+    fun `Bookmark state persists through filters`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+
+        viewModel.uiState.value.onBookmarkClicked("item1")
+        viewModel.uiState.value.updateSelectedStatusFilter(LearnLearningLibraryStatusFilter.Bookmarked)
+
+        val state = viewModel.uiState.value
+        val item = state.items.find { it.id == "item1" }
+        assertNotNull(item)
+        assertTrue(item!!.isBookmarked)
+    }
+
+    @Test
+    fun `Refresh calls repository with forceRefresh true`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        coVerify { repository.getLearningLibraryItems(testCollectionId, true) }
+    }
+
+    @Test
+    fun `Refresh updates collection data`() = runTest {
+        val viewModel = getViewModel()
+        val updatedCollection = createTestCollection(
+            id = testCollectionId,
+            name = "Updated Collection Name",
+            items = listOf(
+                createTestCollectionItem(
+                    id = "newItem",
+                    courseName = "New Course",
+                    courseId = "999",
+                    completionPercentage = 0.0,
+                    isBookmarked = false,
+                    itemType = CollectionItemType.COURSE
+                )
+            )
+        )
+        coEvery { repository.getLearningLibraryItems(testCollectionId, true) } returns updatedCollection
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.loadingState.isRefreshing)
+        assertEquals("Updated Collection Name", state.collectionName)
+        assertEquals(1, state.items.size)
+        assertEquals("New Course", state.items[0].name)
+    }
+
+    @Test
+    fun `Refresh on error shows snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        every { resources.getString(R.string.learnLearningLibraryFailedToLoadCollectionMessage) } returns "Failed to load"
+        coEvery { repository.getLearningLibraryItems(testCollectionId, true) } throws Exception("Network error")
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.loadingState.isRefreshing)
+        assertNotNull(state.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `Refresh maintains applied filters`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.getLearningLibraryItems(testCollectionId, true) } returns testCollection
+
+        viewModel.uiState.value.updateSelectedStatusFilter(LearnLearningLibraryStatusFilter.Completed)
+        val itemCountBeforeRefresh = viewModel.uiState.value.items.size
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        val state = viewModel.uiState.value
+        assertEquals(LearnLearningLibraryStatusFilter.Completed, state.selectedStatusFilter)
+        assertEquals(itemCountBeforeRefresh, state.items.size)
+    }
+
+    @Test
+    fun `Dismiss snackbar clears snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        every { resources.getString(R.string.learnLearningLibraryFailedToLoadCollectionMessage) } returns "Failed to load"
+        coEvery { repository.getLearningLibraryItems(testCollectionId, true) } throws Exception("Network error")
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        viewModel.uiState.value.loadingState.onSnackbarDismiss()
+
+        val state = viewModel.uiState.value
+        assertNull(state.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `Collection name is mapped correctly`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertEquals("Software Engineering", state.collectionName)
+    }
+
+    @Test
+    fun `Items are mapped correctly to UI state`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        val firstItem = state.items[0]
+        assertEquals("item1", firstItem.id)
+        assertEquals("Introduction to Programming", firstItem.name)
+        assertFalse(firstItem.isBookmarked)
+        assertEquals(CollectionItemType.COURSE, firstItem.type)
+    }
+
+    private fun getViewModel(): LearnLearningLibraryDetailsViewModel {
+        return LearnLearningLibraryDetailsViewModel(savedStateHandle, resources, repository)
+    }
+
+    private fun createTestCollection(
+        id: String,
+        name: String,
+        items: List<LearningLibraryCollectionItem>
+    ): EnrolledLearningLibraryCollection = EnrolledLearningLibraryCollection(
+        id = id,
+        name = name,
+        publicName = name,
+        description = "Test description",
+        createdAt = Date(),
+        updatedAt = Date(),
+        items = items,
+        totalItemCount = items.size
+    )
+
+    private fun createTestCollectionItem(
+        id: String,
+        courseName: String,
+        courseId: String,
+        completionPercentage: Double,
+        isBookmarked: Boolean,
+        itemType: CollectionItemType,
+        isEnrolledInCanvas: Boolean = true
+    ): LearningLibraryCollectionItem = LearningLibraryCollectionItem(
+        id = id,
+        itemType = itemType,
+        isBookmarked = isBookmarked,
+        completionPercentage = completionPercentage,
+        isEnrolledInCanvas = isEnrolledInCanvas,
+        canvasCourse = CanvasCourseInfo(
+            courseId = courseId,
+            courseName = courseName,
+            courseImageUrl = "https://example.com/$courseId.png",
+            estimatedDurationMinutes = 60.0,
+            moduleCount = 5.0,
+            moduleItemCount = 10.0,
+            canvasUrl = "https://example.com",
+        ),
+        libraryId = "library1",
+        displayOrder = 1.0,
+        programId = null,
+        programCourseId = null,
+        createdAt = Date(),
+        updatedAt = Date(),
+        moduleInfo = null,
+        canvasEnrollmentId = null
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollRepositoryTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollRepositoryTest.kt
new file mode 100644
index 0000000000..1d17dc0184
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollRepositoryTest.kt
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.enroll
+
+import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
+import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.canvasapi2.utils.DataResult
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+class LearnLearningLibraryEnrollRepositoryTest {
+    private val getLearningLibraryManager: GetLearningLibraryManager = mockk(relaxed = true)
+    private val getCoursesManager: HorizonGetCoursesManager = mockk(relaxed = true)
+    private val apiPrefs: ApiPrefs = mockk(relaxed = true)
+
+    private val testUser = User(id = 42L)
+    private val testCourse = CourseWithProgress(
+        courseId = 1L,
+        courseName = "Test Course",
+        courseImageUrl = "https://example.com/image.png",
+        courseSyllabus = "Course syllabus content",
+        progress = 0.0
+    )
+    private val testCollectionItem = createTestCollectionItem("item1", "1", "Test Course")
+
+    @Before
+    fun setup() {
+        every { apiPrefs.user } returns testUser
+        coEvery { getLearningLibraryManager.getLearningLibraryItem(any(), any()) } returns testCollectionItem
+        coEvery { getCoursesManager.getCourseWithProgressById(any(), any()) } returns DataResult.Success(testCourse)
+        coEvery { getLearningLibraryManager.enrollLearningLibraryItem(any()) } returns testCollectionItem
+    }
+
+    @Test
+    fun `loadLearningLibraryItem returns collection item`() = runTest {
+        val repository = getRepository()
+
+        val result = repository.loadLearningLibraryItem("item1")
+
+        assertEquals(testCollectionItem, result)
+        coVerify { getLearningLibraryManager.getLearningLibraryItem("item1", false) }
+    }
+
+    @Test
+    fun `loadLearningLibraryItem passes forceNetwork false to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.loadLearningLibraryItem("item1")
+
+        coVerify { getLearningLibraryManager.getLearningLibraryItem("item1", false) }
+    }
+
+    @Test
+    fun `loadCourseDetails returns course with progress`() = runTest {
+        val repository = getRepository()
+
+        val result = repository.loadCourseDetails(1L)
+
+        assertEquals(testCourse, result)
+    }
+
+    @Test
+    fun `loadCourseDetails passes courseId and userId to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.loadCourseDetails(1L)
+
+        coVerify { getCoursesManager.getCourseWithProgressById(1L, 42L) }
+    }
+
+    @Test
+    fun `loadCourseDetails uses -1L as userId when user is null`() = runTest {
+        every { apiPrefs.user } returns null
+        val repository = getRepository()
+
+        repository.loadCourseDetails(1L)
+
+        coVerify { getCoursesManager.getCourseWithProgressById(1L, -1L) }
+    }
+
+    @Test
+    fun `loadCourseDetails throws when manager returns failure`() = runTest {
+        coEvery { getCoursesManager.getCourseWithProgressById(any(), any()) } returns DataResult.Fail()
+        val repository = getRepository()
+
+        var threw = false
+        try {
+            repository.loadCourseDetails(1L)
+        } catch (e: Exception) {
+            threw = true
+        }
+
+        assertEquals(true, threw)
+    }
+
+    @Test
+    fun `enrollLearningLibraryItem returns enrolled item`() = runTest {
+        val enrolledItem = createTestCollectionItem("item1", "1", "Test Course Enrolled")
+        coEvery { getLearningLibraryManager.enrollLearningLibraryItem("item1") } returns enrolledItem
+        val repository = getRepository()
+
+        val result = repository.enrollLearningLibraryItem("item1")
+
+        assertEquals(enrolledItem, result)
+        coVerify { getLearningLibraryManager.enrollLearningLibraryItem("item1") }
+    }
+
+    @Test
+    fun `enrollLearningLibraryItem passes itemId to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.enrollLearningLibraryItem("item-42")
+
+        coVerify { getLearningLibraryManager.enrollLearningLibraryItem("item-42") }
+    }
+
+    private fun getRepository(): LearnLearningLibraryEnrollRepository {
+        return LearnLearningLibraryEnrollRepository(getLearningLibraryManager, getCoursesManager, apiPrefs)
+    }
+
+    private fun createTestCollectionItem(
+        id: String,
+        courseId: String,
+        courseName: String
+    ): LearningLibraryCollectionItem = LearningLibraryCollectionItem(
+        id = id,
+        libraryId = "library1",
+        itemType = CollectionItemType.COURSE,
+        displayOrder = 1.0,
+        canvasCourse = CanvasCourseInfo(
+            courseId = courseId,
+            canvasUrl = "https://example.com",
+            courseName = courseName,
+            courseImageUrl = "https://example.com/image.png",
+            moduleCount = 5.0,
+            moduleItemCount = 20.0,
+            estimatedDurationMinutes = 120.0
+        ),
+        programId = null,
+        programCourseId = null,
+        createdAt = Date(),
+        updatedAt = Date(),
+        isBookmarked = false,
+        completionPercentage = 0.0,
+        isEnrolledInCanvas = false,
+        moduleInfo = null,
+        canvasEnrollmentId = null
+    )
+}
\ No newline at end of file
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollViewModelTest.kt
new file mode 100644
index 0000000000..54e22d0df3
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/enroll/LearnLearningLibraryEnrollViewModelTest.kt
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.enroll
+
+import android.content.res.Resources
+import androidx.lifecycle.SavedStateHandle
+import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithProgress
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertNull
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnLearningLibraryEnrollViewModelTest {
+    private val resources: Resources = mockk(relaxed = true)
+    private val repository: LearnLearningLibraryEnrollRepository = mockk(relaxed = true)
+    private val eventHandler: LearnEventHandler = mockk(relaxed = true)
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    private val testItemId = "item-123"
+    private val testCourseId = "456"
+    private val testSyllabus = "This is the course syllabus"
+    private val testCollectionItem = createTestCollectionItem(testItemId, testCourseId, "Test Course")
+    private val testCourse = CourseWithProgress(
+        courseId = testCourseId.toLong(),
+        courseName = "Test Course",
+        courseImageUrl = null,
+        courseSyllabus = testSyllabus,
+        progress = 0.0
+    )
+
+    @Before
+    fun setup() {
+        Dispatchers.setMain(testDispatcher)
+        every { resources.getString(any()) } returns ""
+        coEvery { repository.loadLearningLibraryItem(any()) } returns testCollectionItem
+        coEvery { repository.loadCourseDetails(any()) } returns testCourse
+        coEvery { repository.enrollLearningLibraryItem(any()) } returns testCollectionItem
+        coEvery { eventHandler.postEvent(any()) } returns Unit
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `Initial state has pull to refresh disabled`() = runTest {
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.state.value.loadingState.isPullToRefreshEnabled)
+    }
+
+    @Test
+    fun `Initial state has no syllabus`() = runTest {
+        val viewModel = getViewModel(itemId = null)
+
+        assertNull(viewModel.state.value.syllabus)
+    }
+
+    @Test
+    fun `Initial state has isEnrollLoading false`() = runTest {
+        val viewModel = getViewModel(itemId = null)
+
+        assertFalse(viewModel.state.value.isEnrollLoading)
+    }
+
+    @Test
+    fun `Initial state has no navigateToCourseId`() = runTest {
+        val viewModel = getViewModel(itemId = null)
+
+        assertNull(viewModel.state.value.navigateToCourseId)
+    }
+
+    @Test
+    fun `loadData is triggered on init when ID is in SavedStateHandle`() = runTest {
+        getViewModel()
+
+        coVerify { repository.loadLearningLibraryItem(testItemId) }
+    }
+
+    @Test
+    fun `loadData is not triggered on init when no ID in SavedStateHandle`() = runTest {
+        getViewModel(itemId = null)
+
+        coVerify(exactly = 0) { repository.loadLearningLibraryItem(any()) }
+    }
+
+    @Test
+    fun `loadData success sets syllabus from course details`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(testSyllabus, viewModel.state.value.syllabus)
+    }
+
+    @Test
+    fun `loadData success clears loading state`() = runTest {
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.state.value.loadingState.isLoading)
+    }
+
+    @Test
+    fun `loadData calls loadCourseDetails with courseId from collection item`() = runTest {
+        getViewModel()
+
+        coVerify { repository.loadCourseDetails(testCourseId.toLong()) }
+    }
+
+    @Test
+    fun `loadData error clears loading state`() = runTest {
+        coEvery { repository.loadLearningLibraryItem(any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.state.value.loadingState.isLoading)
+    }
+
+    @Test
+    fun `loadData error does not set error state`() = runTest {
+        coEvery { repository.loadLearningLibraryItem(any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.state.value.loadingState.isError)
+    }
+
+    @Test
+    fun `loadData can be called manually with a new item id`() = runTest {
+        val viewModel = getViewModel(itemId = null)
+
+        viewModel.loadData("other-item")
+
+        coVerify { repository.loadLearningLibraryItem("other-item") }
+    }
+
+    @Test
+    fun `onEnroll success sets navigateToCourseId`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.state.value.onEnrollClicked()
+
+        assertEquals(testCourseId.toLong(), viewModel.state.value.navigateToCourseId)
+    }
+
+    @Test
+    fun `onEnroll success clears isEnrollLoading`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.state.value.onEnrollClicked()
+
+        assertFalse(viewModel.state.value.isEnrollLoading)
+    }
+
+    @Test
+    fun `onEnroll success posts RefreshLearningLibraryList event`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.state.value.onEnrollClicked()
+
+        coVerify { eventHandler.postEvent(LearnEvent.RefreshLearningLibraryList) }
+    }
+
+    @Test
+    fun `onEnroll calls repository with item id`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.state.value.onEnrollClicked()
+
+        coVerify { repository.enrollLearningLibraryItem(testItemId) }
+    }
+
+    @Test
+    fun `onEnroll error sets error message`() = runTest {
+        every { resources.getString(R.string.learnLearningLibraryEnrollDialogFailedToEnrollMessage) } returns "Failed to enroll"
+        coEvery { repository.enrollLearningLibraryItem(any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        viewModel.state.value.onEnrollClicked()
+
+        assertNotNull(viewModel.state.value.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `onEnroll error clears isEnrollLoading`() = runTest {
+        coEvery { repository.enrollLearningLibraryItem(any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        viewModel.state.value.onEnrollClicked()
+
+        assertFalse(viewModel.state.value.isEnrollLoading)
+    }
+
+    @Test
+    fun `onEnroll error does not set navigateToCourseId`() = runTest {
+        coEvery { repository.enrollLearningLibraryItem(any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        viewModel.state.value.onEnrollClicked()
+
+        assertNull(viewModel.state.value.navigateToCourseId)
+    }
+
+    @Test
+    fun `resetNavigateToCourseId clears navigateToCourseId`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.state.value.onEnrollClicked()
+
+        viewModel.state.value.resetNavigateToCourseId()
+
+        assertNull(viewModel.state.value.navigateToCourseId)
+    }
+
+    private fun getViewModel(itemId: String? = testItemId): LearnLearningLibraryEnrollViewModel {
+        val savedStateHandle = if (itemId != null) {
+            SavedStateHandle(mapOf(LearnRoute.LearnLearningLibraryEnrollScreen.learningLibraryIdAttr to itemId))
+        } else {
+            SavedStateHandle()
+        }
+        return LearnLearningLibraryEnrollViewModel(savedStateHandle, resources, repository, eventHandler)
+    }
+
+    private fun createTestCollectionItem(
+        id: String,
+        courseId: String,
+        courseName: String
+    ): LearningLibraryCollectionItem = LearningLibraryCollectionItem(
+        id = id,
+        libraryId = "library1",
+        itemType = CollectionItemType.COURSE,
+        displayOrder = 1.0,
+        canvasCourse = CanvasCourseInfo(
+            courseId = courseId,
+            canvasUrl = "https://example.com",
+            courseName = courseName,
+            courseImageUrl = "https://example.com/image.png",
+            moduleCount = 5.0,
+            moduleItemCount = 20.0,
+            estimatedDurationMinutes = 120.0
+        ),
+        programId = null,
+        programCourseId = null,
+        createdAt = Date(),
+        updatedAt = Date(),
+        isBookmarked = false,
+        completionPercentage = 0.0,
+        isEnrolledInCanvas = false,
+        moduleInfo = null,
+        canvasEnrollmentId = null
+    )
+}
\ No newline at end of file
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListRepositoryTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListRepositoryTest.kt
new file mode 100644
index 0000000000..627029aee7
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListRepositoryTest.kt
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.list
+
+import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetLearningLibraryManager
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollectionsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItemsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+class LearnLearningLibraryListRepositoryTest {
+    private val getLearningLibraryManager: GetLearningLibraryManager = mockk(relaxed = true)
+
+    private val testCollections = listOf(
+        EnrolledLearningLibraryCollection(
+            id = "collection1",
+            name = "Software Engineering",
+            totalItemCount = 2,
+            items = listOf(
+                createTestCollectionItem(
+                    id = "item1",
+                    courseName = "Intro to Programming",
+                    courseId = "1",
+                    isBookmarked = false,
+                    itemType = CollectionItemType.COURSE
+                ),
+                createTestCollectionItem(
+                    id = "item2",
+                    courseName = "Advanced Algorithms",
+                    courseId = "2",
+                    isBookmarked = true,
+                    itemType = CollectionItemType.PAGE
+                )
+            ),
+            publicName = "",
+            description = "",
+            createdAt = Date(),
+            updatedAt = Date()
+        ),
+        EnrolledLearningLibraryCollection(
+            id = "collection2",
+            name = "Data Science",
+            totalItemCount = 1,
+            items = listOf(
+                createTestCollectionItem(
+                    id = "item3",
+                    courseName = "Machine Learning",
+                    courseId = "3",
+                    isBookmarked = false,
+                    itemType = CollectionItemType.COURSE
+                )
+            ),
+            publicName = "",
+            description = "",
+            createdAt = Date(),
+            updatedAt = Date()
+        )
+    )
+
+    private val emptyPageInfo = LearningLibraryPageInfo(
+        nextCursor = null,
+        previousCursor = null,
+        hasNextPage = false,
+        hasPreviousPage = false,
+        totalCount = 10,
+        pageCursors = null
+    )
+
+    @Before
+    fun setup() {
+        val response = EnrolledLearningLibraryCollectionsResponse(
+            collections = testCollections
+        )
+        coEvery { getLearningLibraryManager.getEnrolledLearningLibraryCollections(any(), any()) } returns response
+        coEvery { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = emptyList(),
+            pageInfo = emptyPageInfo
+        )
+    }
+
+    @Test
+    fun `getEnrolledLearningLibraries returns list of collections`() = runTest {
+        val repository = getRepository()
+        val result = repository.getEnrolledLearningLibraries(false)
+
+        assertEquals(2, result.size)
+        assertEquals(testCollections, result)
+        coVerify { getLearningLibraryManager.getEnrolledLearningLibraryCollections(4, false) }
+    }
+
+    @Test
+    fun `getEnrolledLearningLibraries with forceNetwork true calls API with force network`() = runTest {
+        val repository = getRepository()
+        repository.getEnrolledLearningLibraries(true)
+
+        coVerify { getLearningLibraryManager.getEnrolledLearningLibraryCollections(4, true) }
+    }
+
+    @Test
+    fun `getEnrolledLearningLibraries returns empty list when no collections`() = runTest {
+        val emptyResponse = EnrolledLearningLibraryCollectionsResponse(collections = emptyList())
+        coEvery { getLearningLibraryManager.getEnrolledLearningLibraryCollections(any(), any()) } returns emptyResponse
+        val repository = getRepository()
+        val result = repository.getEnrolledLearningLibraries(false)
+
+        assertEquals(0, result.size)
+    }
+
+    @Test
+    fun `getLearningLibraryItems returns items with no filters`() = runTest {
+        val items = listOf(createTestCollectionItem("item1", "Python", "1", false, CollectionItemType.COURSE))
+        coEvery { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = items,
+            pageInfo = emptyPageInfo
+        )
+        val repository = getRepository()
+
+        val result = repository.getLearningLibraryItems(forceNetwork = false)
+
+        assertEquals(1, result.items.size)
+        assertEquals(items, result.items)
+    }
+
+    @Test
+    fun `getLearningLibraryItems with cursor passes cursor to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(afterCursor = "cursor123", forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(cursor = "cursor123", any(), any(), any(), any(), any(), any(), any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with searchQuery passes searchTerm to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(searchQuery = "python", forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), searchTerm = "python", any(), any(), any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with typeFilter passes types to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(typeFilter = CollectionItemType.COURSE, forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), types = listOf(CollectionItemType.COURSE), any(), any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with null typeFilter passes null types to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(typeFilter = null, forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), types = null, any(), any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with bookmarkedOnly passes bookmarkedOnly to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(bookmarkedOnly = true, forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), bookmarkedOnly = true, any(), any(), any(), any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with completedOnly passes completedOnly to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(completedOnly = true, forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), any(), completedOnly = true, any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with forceNetwork true passes flag to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(forceNetwork = true)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), any(), any(), forceNetwork = true) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems returns pagination info`() = runTest {
+        val pageInfo = LearningLibraryPageInfo(
+            nextCursor = "next_cursor",
+            previousCursor = null,
+            hasNextPage = true,
+            hasPreviousPage = false,
+            totalCount = 10,
+            pageCursors = null
+        )
+        coEvery { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = emptyList(),
+            pageInfo = pageInfo
+        )
+        val repository = getRepository()
+
+        val result = repository.getLearningLibraryItems(forceNetwork = false)
+
+        assertTrue(result.pageInfo.hasNextPage)
+        assertEquals("next_cursor", result.pageInfo.nextCursor)
+    }
+
+    @Test
+    fun `getLearningLibraryItems with limit passes limit to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(limit = 5, forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), limit = 5, any(), any(), any(), any(), any(), any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with sortBy passes sortBy to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(sortBy = CollectionItemSortOption.NAME_A_Z, forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), any(), any(), sortBy = CollectionItemSortOption.NAME_A_Z, any()) }
+    }
+
+    @Test
+    fun `getLearningLibraryItems with null sortBy passes null sortBy to manager`() = runTest {
+        val repository = getRepository()
+
+        repository.getLearningLibraryItems(sortBy = null, forceNetwork = false)
+
+        coVerify { getLearningLibraryManager.getLearningLibraryCollectionItems(any(), any(), any(), any(), any(), any(), any(), sortBy = null, any()) }
+    }
+
+    @Test
+    fun `toggleLearningLibraryItemIsBookmarked returns new bookmark state`() = runTest {
+        coEvery { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+        val repository = getRepository()
+        val result = repository.toggleLearningLibraryItemIsBookmarked("item1")
+
+        assertTrue(result)
+        coVerify { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item1") }
+    }
+
+    @Test
+    fun `toggleLearningLibraryItemIsBookmarked returns false when unbookmarking`() = runTest {
+        coEvery { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item2") } returns false
+        val repository = getRepository()
+        val result = repository.toggleLearningLibraryItemIsBookmarked("item2")
+
+        assertFalse(result)
+        coVerify { getLearningLibraryManager.toggleLearningLibraryItemIsBookmarked("item2") }
+    }
+
+    private fun getRepository(): LearnLearningLibraryListRepository {
+        return LearnLearningLibraryListRepository(getLearningLibraryManager)
+    }
+
+    private fun createTestCollectionItem(
+        id: String,
+        courseName: String,
+        courseId: String,
+        isBookmarked: Boolean,
+        itemType: CollectionItemType,
+        isEnrolledInCanvas: Boolean = false
+    ): LearningLibraryCollectionItem = LearningLibraryCollectionItem(
+        id = id,
+        itemType = itemType,
+        isBookmarked = isBookmarked,
+        completionPercentage = 0.0,
+        isEnrolledInCanvas = isEnrolledInCanvas,
+        canvasCourse = CanvasCourseInfo(
+            courseId = courseId,
+            courseName = courseName,
+            courseImageUrl = "https://example.com/$courseId.png",
+            estimatedDurationMinutes = 60.0,
+            moduleCount = 5.0,
+            moduleItemCount = 5.0,
+            canvasUrl = "",
+        ),
+        libraryId = "",
+        displayOrder = 1.0,
+        programId = "",
+        programCourseId = "",
+        createdAt = Date(),
+        updatedAt = Date(),
+        moduleInfo = null,
+        canvasEnrollmentId = null
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListViewModelTest.kt
new file mode 100644
index 0000000000..9ac3e76f58
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/learninglibrary/list/LearnLearningLibraryListViewModelTest.kt
@@ -0,0 +1,848 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.learninglibrary.list
+
+import android.content.res.Resources
+import androidx.compose.ui.text.input.TextFieldValue
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.EnrolledLearningLibraryCollection
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItemsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.utils.ApiPrefs
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.pandautils.utils.ThemePrefs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkObject
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNull
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.advanceTimeBy
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnLearningLibraryListViewModelTest {
+    private val eventHandler = LearnEventHandler()
+    private val resources: Resources = mockk(relaxed = true)
+    private val repository: LearnLearningLibraryListRepository = mockk(relaxed = true)
+    private val apiPrefs: ApiPrefs = mockk(relaxed = true)
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    private val emptyItemsResponse = LearningLibraryCollectionItemsResponse(
+        items = emptyList(),
+        pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+    )
+
+    private var testCollections: List<EnrolledLearningLibraryCollection> = listOf(
+        createTestCollection(
+            id = "collection1",
+            name = "Introduction to Programming",
+            items = listOf(
+                createTestCollectionItem(
+                    id = "item1",
+                    courseId = "1",
+                    courseName = "Python Basics",
+                    completionPercentage = 0.0,
+                    isBookmarked = false,
+                    isEnrolledInCanvas = true
+                )
+            )
+        ),
+        createTestCollection(
+            id = "collection2",
+            name = "Advanced Web Development",
+            items = listOf(
+                createTestCollectionItem(
+                    id = "item2",
+                    courseId = "2",
+                    courseName = "React Advanced",
+                    completionPercentage = 50.0,
+                    isBookmarked = true,
+                    isEnrolledInCanvas = true
+                )
+            )
+        ),
+        createTestCollection(
+            id = "collection3",
+            name = "Data Science Fundamentals",
+            items = listOf(
+                createTestCollectionItem(
+                    id = "item3",
+                    courseId = "3",
+                    courseName = "Machine Learning",
+                    completionPercentage = 100.0,
+                    isBookmarked = false,
+                    isEnrolledInCanvas = true
+                )
+            )
+        )
+    )
+
+    @Before
+    fun setup() {
+        mockkObject(ThemePrefs)
+        every { ThemePrefs.brandColor } returns 0xFF0000FF.toInt()
+        every { ThemePrefs.mobileLogoUrl } returns "https://example.com/logo.png"
+        Dispatchers.setMain(testDispatcher)
+        every { resources.getString(any()) } returns ""
+        every { resources.getString(any(), *anyVararg()) } returns ""
+        every { resources.getQuantityString(any(), any()) } returns "2 items"
+        every { resources.getQuantityString(any(), any(), *anyVararg()) } returns "2 items"
+
+        coEvery { repository.getEnrolledLearningLibraries(any()) } returns testCollections
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns emptyItemsResponse
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `Initial state loads collections successfully`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.collectionState.loadingState.isLoading)
+        assertFalse(state.collectionState.loadingState.isError)
+        assertEquals(3, state.collectionState.collections.size)
+        coVerify { repository.getEnrolledLearningLibraries(false) }
+    }
+
+    @Test
+    fun `Initial state has empty search query`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertEquals("", state.searchQuery.text)
+    }
+
+    @Test
+    fun `Initial state sets visible item count to pageSize`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertEquals(3, state.collectionState.itemsToDisplay)
+    }
+
+    @Test
+    fun `Initial state has All type filter`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(LearnLearningLibraryTypeFilter.All, viewModel.uiState.value.typeFilter)
+    }
+
+    @Test
+    fun `Initial state has zero active filter count`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `Initial state has MostRecent sort option`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(LearnLearningLibrarySortOption.MostRecent, viewModel.uiState.value.sortOption)
+    }
+
+    @Test
+    fun `Loading state shows error when repository fails`() = runTest {
+        coEvery { repository.getEnrolledLearningLibraries(any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertTrue(state.collectionState.loadingState.isError)
+        assertFalse(state.collectionState.loadingState.isLoading)
+    }
+
+    @Test
+    fun `Empty collections list loads successfully`() = runTest {
+        coEvery { repository.getEnrolledLearningLibraries(any()) } returns emptyList()
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.collectionState.loadingState.isLoading)
+        assertFalse(state.collectionState.loadingState.isError)
+        assertEquals(0, state.collectionState.collections.size)
+    }
+
+    @Test
+    fun `increaseItemsToDisplay increases count by pageSize`() = runTest {
+        val viewModel = getViewModel()
+        val initialCount = viewModel.uiState.value.collectionState.itemsToDisplay
+
+        viewModel.uiState.value.collectionState.increaseItemsToDisplay()
+
+        val state = viewModel.uiState.value
+        assertEquals(initialCount + 3, state.collectionState.itemsToDisplay)
+    }
+
+    @Test
+    fun `Multiple increaseItemsToDisplay calls accumulate`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.collectionState.increaseItemsToDisplay()
+        viewModel.uiState.value.collectionState.increaseItemsToDisplay()
+
+        val state = viewModel.uiState.value
+        assertEquals(9, state.collectionState.itemsToDisplay)
+    }
+
+    @Test
+    fun `Collections are mapped correctly to LearnLearningLibraryCollectionState`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        val firstCollection = state.collectionState.collections[0]
+        assertEquals("collection1", firstCollection.id)
+        assertEquals("Introduction to Programming", firstCollection.name)
+        assertEquals(1, firstCollection.itemCount)
+        assertEquals(1, firstCollection.items.size)
+    }
+
+    @Test
+    fun `Collection items are mapped correctly`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        val firstItem = state.collectionState.collections[0].items[0]
+        assertEquals("item1", firstItem.id)
+        assertEquals("Python Basics", firstItem.name)
+        assertFalse(firstItem.isBookmarked)
+    }
+
+    @Test
+    fun `Course item not enrolled in Canvas can enroll`() = runTest {
+        val collections = listOf(
+            createTestCollection(
+                id = "collection1",
+                name = "Test Collection",
+                items = listOf(
+                    createTestCollectionItem(
+                        id = "item1",
+                        courseId = "1",
+                        courseName = "Test Course",
+                        itemType = CollectionItemType.COURSE,
+                        isEnrolledInCanvas = false
+                    )
+                )
+            )
+        )
+        coEvery { repository.getEnrolledLearningLibraries(any()) } returns collections
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        val firstItem = state.collectionState.collections[0].items[0]
+        assertTrue(firstItem.canEnroll)
+    }
+
+    @Test
+    fun `Course item already enrolled in Canvas cannot enroll`() = runTest {
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        val firstItem = state.collectionState.collections[0].items[0]
+        assertFalse(firstItem.canEnroll)
+    }
+
+    @Test
+    fun `Non-course item cannot enroll`() = runTest {
+        val collections = listOf(
+            createTestCollection(
+                id = "collection1",
+                name = "Test Collection",
+                items = listOf(
+                    createTestCollectionItem(
+                        id = "item1",
+                        courseId = "1",
+                        courseName = "Test Page",
+                        itemType = CollectionItemType.PAGE,
+                        isEnrolledInCanvas = false
+                    )
+                )
+            )
+        )
+        coEvery { repository.getEnrolledLearningLibraries(any()) } returns collections
+        val viewModel = getViewModel()
+
+        val state = viewModel.uiState.value
+        val firstItem = state.collectionState.collections[0].items[0]
+        assertFalse(firstItem.canEnroll)
+    }
+
+    @Test
+    fun `Refresh calls repository with forceNetwork true`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.collectionState.loadingState.onRefresh()
+
+        coVerify { repository.getEnrolledLearningLibraries(true) }
+    }
+
+    @Test
+    fun `Refresh updates collections list`() = runTest {
+        val viewModel = getViewModel()
+        val updatedCollections = listOf(
+            createTestCollection(
+                id = "collection4",
+                name = "New Collection",
+                items = listOf(
+                    createTestCollectionItem(
+                        id = "item4",
+                        courseId = "4",
+                        courseName = "New Course",
+                        completionPercentage = 0.0,
+                        isBookmarked = false,
+                        isEnrolledInCanvas = true
+                    )
+                )
+            )
+        )
+        coEvery { repository.getEnrolledLearningLibraries(true) } returns updatedCollections
+
+        viewModel.uiState.value.collectionState.loadingState.onRefresh()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.collectionState.loadingState.isRefreshing)
+        assertEquals(1, state.collectionState.collections.size)
+        assertEquals("New Collection", state.collectionState.collections[0].name)
+    }
+
+    @Test
+    fun `Refresh on error shows snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.getEnrolledLearningLibraries(true) } throws Exception("Network error")
+
+        viewModel.uiState.value.collectionState.loadingState.onRefresh()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.collectionState.loadingState.isRefreshing)
+        assertTrue(state.collectionState.loadingState.snackbarMessage != null)
+    }
+
+    @Test
+    fun `Dismiss snackbar clears both collection and item snackbar messages`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.getEnrolledLearningLibraries(true) } throws Exception("Network error")
+        viewModel.uiState.value.collectionState.loadingState.onRefresh()
+
+        viewModel.uiState.value.collectionState.loadingState.onSnackbarDismiss()
+
+        val state = viewModel.uiState.value
+        assertNull(state.collectionState.loadingState.snackbarMessage)
+        assertNull(state.itemState.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `onCollectionBookmarkClicked sets loading state and updates bookmark`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+
+        viewModel.uiState.value.collectionState.onBookmarkClicked("item1")
+
+        val state = viewModel.uiState.value
+        val firstItem = state.collectionState.collections[0].items[0]
+        assertTrue(firstItem.isBookmarked)
+        assertFalse(firstItem.bookmarkLoading)
+        coVerify { repository.toggleLearningLibraryItemIsBookmarked("item1") }
+    }
+
+    @Test
+    fun `onCollectionBookmarkClicked handles errors and shows error message`() = runTest {
+        val viewModel = getViewModel()
+        every { resources.getString(R.string.learnLearningLibraryFailedToUpdateBookmarkMessage) } returns "Failed to update bookmark"
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } throws Exception("Network error")
+
+        viewModel.uiState.value.collectionState.onBookmarkClicked("item1")
+
+        val state = viewModel.uiState.value
+        val firstItem = state.collectionState.collections[0].items[0]
+        assertFalse(firstItem.bookmarkLoading)
+        assertTrue(state.collectionState.loadingState.snackbarMessage != null)
+    }
+
+    @Test
+    fun `isEmptyFilter returns true when no filters are applied`() = runTest {
+        val viewModel = getViewModel()
+
+        assertTrue(viewModel.uiState.value.isEmptyFilter())
+    }
+
+    @Test
+    fun `isEmptyFilter returns false when search query is set`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("python"))
+
+        assertFalse(viewModel.uiState.value.isEmptyFilter())
+    }
+
+    @Test
+    fun `isEmptyFilter returns false when activeFilterCount is non-zero`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertFalse(viewModel.uiState.value.isEmptyFilter())
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event updates typeFilter in state`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Courses,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertEquals(LearnLearningLibraryTypeFilter.Courses, viewModel.uiState.value.typeFilter)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event updates sortOption in state`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.All,
+            sortOption = LearnLearningLibrarySortOption.NameAscending
+        ))
+
+        assertEquals(LearnLearningLibrarySortOption.NameAscending, viewModel.uiState.value.sortOption)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event increments activeFilterCount when typeFilter is non-All`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertEquals(1, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event resets activeFilterCount to zero when typeFilter is All`() = runTest {
+        val viewModel = getViewModel()
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.All,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event with MyContent screenType is ignored by Browse VM`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.MyContent,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertEquals(LearnLearningLibraryTypeFilter.All, viewModel.uiState.value.typeFilter)
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event with MyContentSaved screenType is ignored by Browse VM`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.MyContentSaved,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertEquals(LearnLearningLibraryTypeFilter.All, viewModel.uiState.value.typeFilter)
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event passes typeFilter to repository`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        coVerify { repository.getLearningLibraryItems(any(), any(), any(), typeFilter = CollectionItemType.PAGE, any(), any(), any(), any()) }
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter event passes sortOption to repository`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.All,
+            sortOption = LearnLearningLibrarySortOption.NameAscending
+        ))
+
+        coVerify { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), sortBy = CollectionItemSortOption.NAME_A_Z, any()) }
+    }
+
+    @Test
+    fun `Item loading populates items from repository`() = runTest {
+        val testItems = listOf(
+            createTestCollectionItem(id = "item1", courseId = "1", courseName = "Python Basics")
+        )
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = testItems,
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        val state = viewModel.uiState.value
+        assertEquals(1, state.itemState.items.size)
+        assertEquals("Python Basics", state.itemState.items[0].name)
+    }
+
+    @Test
+    fun `Item loading shows error state when repository fails`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } throws Exception("Network error")
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        val state = viewModel.uiState.value
+        assertTrue(state.itemState.loadingState.isError)
+    }
+
+    @Test
+    fun `Search query triggers item loading after debounce`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("python"))
+        advanceTimeBy(350)
+
+        coVerify { repository.getLearningLibraryItems(null, any(), "python", any(), any(), any(), any(), any()) }
+    }
+
+    @Test
+    fun `Search query updates searchQuery in state immediately`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("python"))
+
+        assertEquals("python", viewModel.uiState.value.searchQuery.text)
+    }
+
+    @Test
+    fun `Search query change replaces item list when no cursor`() = runTest {
+        val firstResponse = LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1", courseName = "Python Basics")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns firstResponse
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+        val secondResponse = LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item2", courseName = "React Advanced")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns secondResponse
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Courses,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertEquals(1, viewModel.uiState.value.itemState.items.size)
+        assertEquals("React Advanced", viewModel.uiState.value.itemState.items[0].name)
+    }
+
+    @Test
+    fun `showMoreButton is set when API has next page`() = runTest {
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1")),
+            pageInfo = LearningLibraryPageInfo(nextCursor = "cursor1", previousCursor = null, hasNextPage = true, hasPreviousPage = false, totalCount = null, pageCursors = null)
+        )
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        assertTrue(viewModel.uiState.value.itemState.showMoreButton)
+    }
+
+    @Test
+    fun `onShowMoreClicked fetches next page and appends items`() = runTest {
+        val firstPage = LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1", courseName = "First Course")),
+            pageInfo = LearningLibraryPageInfo(nextCursor = "cursor1", previousCursor = null, hasNextPage = true, hasPreviousPage = false, totalCount = null, pageCursors = null)
+        )
+        val secondPage = LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item2", courseName = "Second Course")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+        coEvery { repository.getLearningLibraryItems(null, any(), any(), any(), any(), any(), any(), any()) } returns firstPage
+        coEvery { repository.getLearningLibraryItems("cursor1", any(), any(), any(), any(), any(), any(), any()) } returns secondPage
+        val viewModel = getViewModel()
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        viewModel.uiState.value.itemState.onShowMoreClicked()
+
+        val items = viewModel.uiState.value.itemState.items
+        assertEquals(2, items.size)
+        assertEquals("First Course", items[0].name)
+        assertEquals("Second Course", items[1].name)
+    }
+
+    @Test
+    fun `onShowMoreClicked sets isMoreButtonLoading during load`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.itemState.onShowMoreClicked()
+
+        assertFalse(viewModel.uiState.value.itemState.isMoreButtonLoading)
+    }
+
+    @Test
+    fun `Items refresh calls repository with forceNetwork true`() = runTest {
+        val viewModel = getViewModel()
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        viewModel.uiState.value.itemState.loadingState.onRefresh()
+
+        coVerify { repository.getLearningLibraryItems(null, any(), any(), any(), any(), any(), any(), true) }
+    }
+
+    @Test
+    fun `Items refresh updates items list`() = runTest {
+        val viewModel = getViewModel()
+        val refreshedItems = listOf(
+            createTestCollectionItem(id = "item1", courseName = "Refreshed Course")
+        )
+        coEvery { repository.getLearningLibraryItems(null, any(), any(), any(), any(), any(), any(), true) } returns LearningLibraryCollectionItemsResponse(
+            items = refreshedItems,
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+
+        viewModel.uiState.value.itemState.loadingState.onRefresh()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.itemState.loadingState.isRefreshing)
+        assertEquals(1, state.itemState.items.size)
+        assertEquals("Refreshed Course", state.itemState.items[0].name)
+    }
+
+    @Test
+    fun `Items refresh on error shows snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        coEvery { repository.getLearningLibraryItems(null, any(), any(), any(), any(), any(), any(), true) } throws Exception("Network error")
+
+        viewModel.uiState.value.itemState.loadingState.onRefresh()
+
+        val state = viewModel.uiState.value
+        assertFalse(state.itemState.loadingState.isRefreshing)
+        assertTrue(state.itemState.loadingState.snackbarMessage != null)
+    }
+
+    @Test
+    fun `onItemBookmarkClicked updates bookmark in item state`() = runTest {
+        val testItems = listOf(
+            createTestCollectionItem(id = "item1", courseName = "Python Basics", isBookmarked = false)
+        )
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = testItems,
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+        val viewModel = getViewModel()
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        viewModel.uiState.value.itemState.onBookmarkClicked("item1")
+
+        val updatedItem = viewModel.uiState.value.itemState.items.find { it.id == "item1" }
+        assertTrue(updatedItem!!.isBookmarked)
+        assertFalse(updatedItem.bookmarkLoading)
+    }
+
+    @Test
+    fun `onItemBookmarkClicked also updates collection state bookmark`() = runTest {
+        val testItems = listOf(
+            createTestCollectionItem(id = "item1", courseName = "Python Basics", isBookmarked = false)
+        )
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = testItems,
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } returns true
+        val viewModel = getViewModel()
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        viewModel.uiState.value.itemState.onBookmarkClicked("item1")
+
+        val collectionItem = viewModel.uiState.value.collectionState.collections
+            .flatMap { it.items }
+            .find { it.id == "item1" }
+        assertTrue(collectionItem!!.isBookmarked)
+    }
+
+    @Test
+    fun `onItemBookmarkClicked error shows error in item state`() = runTest {
+        val testItems = listOf(
+            createTestCollectionItem(id = "item1", courseName = "Python Basics", isBookmarked = false)
+        )
+        coEvery { repository.getLearningLibraryItems(any(), any(), any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = testItems,
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+        )
+        every { resources.getString(R.string.learnLearningLibraryFailedToUpdateBookmarkMessage) } returns "Failed to update bookmark"
+        coEvery { repository.toggleLearningLibraryItemIsBookmarked("item1") } throws Exception("Network error")
+        val viewModel = getViewModel()
+        eventHandler.postEvent(LearnEvent.UpdateLearningLibraryFilter(
+            screenType = LearnLearningLibraryFilterScreenType.Browse,
+            typeFilter = LearnLearningLibraryTypeFilter.Pages,
+            sortOption = LearnLearningLibrarySortOption.MostRecent
+        ))
+
+        viewModel.uiState.value.itemState.onBookmarkClicked("item1")
+
+        val state = viewModel.uiState.value
+        assertFalse(state.itemState.items.find { it.id == "item1" }!!.bookmarkLoading)
+        assertTrue(state.itemState.loadingState.snackbarMessage != null)
+    }
+
+    private fun getViewModel(): LearnLearningLibraryListViewModel {
+        return LearnLearningLibraryListViewModel(resources, repository, eventHandler, apiPrefs)
+    }
+
+    private fun createTestCollection(
+        id: String = "testCollection",
+        name: String = "Test Collection",
+        items: List<LearningLibraryCollectionItem> = emptyList()
+    ): EnrolledLearningLibraryCollection = EnrolledLearningLibraryCollection(
+        id = id,
+        name = name,
+        publicName = name,
+        description = "Test description",
+        createdAt = Date(),
+        updatedAt = Date(),
+        items = items,
+        totalItemCount = items.size
+    )
+
+    private fun createTestCollectionItem(
+        id: String = "testItem",
+        courseId: String = "1",
+        courseName: String = "Test Course",
+        completionPercentage: Double? = 0.0,
+        isBookmarked: Boolean = false,
+        isEnrolledInCanvas: Boolean? = true,
+        itemType: CollectionItemType = CollectionItemType.COURSE
+    ): LearningLibraryCollectionItem = LearningLibraryCollectionItem(
+        id = id,
+        libraryId = "library1",
+        itemType = itemType,
+        displayOrder = 1.0,
+        canvasCourse = CanvasCourseInfo(
+            courseId = courseId,
+            canvasUrl = "https://example.com",
+            courseName = courseName,
+            courseImageUrl = "https://example.com/image.png",
+            moduleCount = 5.0,
+            moduleItemCount = 20.0,
+            estimatedDurationMinutes = 120.0
+        ),
+        programId = null,
+        programCourseId = null,
+        createdAt = Date(),
+        updatedAt = Date(),
+        isBookmarked = isBookmarked,
+        completionPercentage = completionPercentage,
+        isEnrolledInCanvas = isEnrolledInCanvas,
+        moduleInfo = null,
+        canvasEnrollmentId = null
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentViewModelTest.kt
new file mode 100644
index 0000000000..1ada75b9ae
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/LearnMyContentViewModelTest.kt
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent
+
+import androidx.compose.ui.text.input.TextFieldValue
+import com.instructure.horizon.features.learn.LearnEvent
+import com.instructure.horizon.features.learn.LearnEventHandler
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryFilterScreenType
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import junit.framework.TestCase.assertEquals
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnMyContentViewModelTest {
+
+    private val eventHandler = LearnEventHandler()
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    @Before
+    fun setup() {
+        Dispatchers.setMain(testDispatcher)
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `Initial state has InProgress selected tab`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(LearnMyContentTab.InProgress, viewModel.uiState.value.selectedTab)
+    }
+
+    @Test
+    fun `Initial state has MostRecent sort option`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(LearnLearningLibrarySortOption.MostRecent, viewModel.uiState.value.sortByOption)
+    }
+
+    @Test
+    fun `Initial state has All type filter`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(LearnLearningLibraryTypeFilter.All, viewModel.uiState.value.typeFilter)
+    }
+
+    @Test
+    fun `Initial state has zero active filter count`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `Initial state has empty search query`() = runTest {
+        val viewModel = getViewModel()
+
+        assertEquals("", viewModel.uiState.value.searchQuery.text)
+    }
+
+    @Test
+    fun `updateSearchQuery updates searchQuery in state`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.updateSearchQuery(TextFieldValue("kotlin"))
+
+        assertEquals("kotlin", viewModel.uiState.value.searchQuery.text)
+    }
+
+    @Test
+    fun `onTabSelected updates selected tab`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.uiState.value.onTabSelected(LearnMyContentTab.Completed)
+
+        assertEquals(LearnMyContentTab.Completed, viewModel.uiState.value.selectedTab)
+    }
+
+    @Test
+    fun `onTabSelected resets sortByOption to MostRecent`() = runTest {
+        val viewModel = getViewModel()
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.All,
+                sortOption = LearnLearningLibrarySortOption.NameAscending,
+            )
+        )
+
+        viewModel.uiState.value.onTabSelected(LearnMyContentTab.Saved)
+
+        assertEquals(LearnLearningLibrarySortOption.MostRecent, viewModel.uiState.value.sortByOption)
+    }
+
+    @Test
+    fun `onTabSelected resets typeFilter to All`() = runTest {
+        val viewModel = getViewModel()
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.Programs,
+                sortOption = LearnLearningLibrarySortOption.MostRecent,
+            )
+        )
+
+        viewModel.uiState.value.onTabSelected(LearnMyContentTab.Completed)
+
+        assertEquals(LearnLearningLibraryTypeFilter.All, viewModel.uiState.value.typeFilter)
+    }
+
+    @Test
+    fun `onTabSelected resets activeFilterCount to zero`() = runTest {
+        val viewModel = getViewModel()
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.Courses,
+                sortOption = LearnLearningLibrarySortOption.MostRecent,
+            )
+        )
+
+        viewModel.uiState.value.onTabSelected(LearnMyContentTab.InProgress)
+
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter with MyContent screenType updates sortByOption`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.All,
+                sortOption = LearnLearningLibrarySortOption.NameDescending,
+            )
+        )
+
+        assertEquals(LearnLearningLibrarySortOption.NameDescending, viewModel.uiState.value.sortByOption)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter with MyContent screenType updates typeFilter`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.Programs,
+                sortOption = LearnLearningLibrarySortOption.MostRecent,
+            )
+        )
+
+        assertEquals(LearnLearningLibraryTypeFilter.Programs, viewModel.uiState.value.typeFilter)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter with MyContent screenType increments activeFilterCount for non-All filter`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.Courses,
+                sortOption = LearnLearningLibrarySortOption.MostRecent,
+            )
+        )
+
+        assertEquals(1, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter with MyContent screenType resets activeFilterCount for All filter`() = runTest {
+        val viewModel = getViewModel()
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.Programs,
+                sortOption = LearnLearningLibrarySortOption.MostRecent,
+            )
+        )
+
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContent,
+                typeFilter = LearnLearningLibraryTypeFilter.All,
+                sortOption = LearnLearningLibrarySortOption.MostRecent,
+            )
+        )
+
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter with MyContentSaved screenType updates state`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.MyContentSaved,
+                typeFilter = LearnLearningLibraryTypeFilter.Courses,
+                sortOption = LearnLearningLibrarySortOption.LeastRecent,
+            )
+        )
+
+        assertEquals(LearnLearningLibraryTypeFilter.Courses, viewModel.uiState.value.typeFilter)
+        assertEquals(LearnLearningLibrarySortOption.LeastRecent, viewModel.uiState.value.sortByOption)
+    }
+
+    @Test
+    fun `UpdateLearningLibraryFilter with Browse screenType is ignored`() = runTest {
+        val viewModel = getViewModel()
+
+        eventHandler.postEvent(
+            LearnEvent.UpdateLearningLibraryFilter(
+                screenType = LearnLearningLibraryFilterScreenType.Browse,
+                typeFilter = LearnLearningLibraryTypeFilter.Programs,
+                sortOption = LearnLearningLibrarySortOption.NameAscending,
+            )
+        )
+
+        assertEquals(LearnLearningLibraryTypeFilter.All, viewModel.uiState.value.typeFilter)
+        assertEquals(LearnLearningLibrarySortOption.MostRecent, viewModel.uiState.value.sortByOption)
+        assertEquals(0, viewModel.uiState.value.activeFilterCount)
+    }
+
+    private fun getViewModel() = LearnMyContentViewModel(eventHandler)
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentExtensionsTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentExtensionsTest.kt
new file mode 100644
index 0000000000..d3dbd304ae
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/common/LearnMyContentExtensionsTest.kt
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.common
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.journey.mycontent.CourseEnrollmentItem
+import com.instructure.canvasapi2.models.journey.mycontent.ProgramEnrollmentItem
+import com.instructure.canvasapi2.utils.ContextKeeper
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.navigation.LearnRoute
+import com.instructure.horizon.navigation.MainNavigationRoute
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertNull
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+class LearnMyContentExtensionsTest {
+
+    private val resources: Resources = mockk(relaxed = true)
+    private val context: Context = mockk(relaxed = true)
+
+    @Before
+    fun setup() {
+        val sharedPrefs: SharedPreferences = mockk(relaxed = true)
+        every { context.getSharedPreferences(any(), any()) } returns sharedPrefs
+        every { sharedPrefs.getInt(any(), any()) } returns 0
+        ContextKeeper.appContext = context
+
+        every { resources.getString(R.string.learnMyContentProgramLabel) } returns "Program"
+        every { resources.getString(R.string.learnMyContentCourseLabel) } returns "Course"
+        every { resources.getString(R.string.learnMyContentStartLearning) } returns "Start learning"
+        every { resources.getString(R.string.learnMyContentResumeLearning) } returns "Resume learning"
+        every { resources.getString(R.string.learnMyContentDurationHrsMin, any(), any()) } answers {
+            val arr = args[1] as Array<*>
+            "${arr[0]}h ${arr[1]}m"
+        }
+        every { resources.getString(R.string.learnMyContentDurationHrs, any()) } answers {
+            val arr = args[1] as Array<*>
+            "${arr[0]}h"
+        }
+        every { resources.getString(R.string.learnMyContentDurationMin, any()) } answers {
+            val arr = args[1] as Array<*>
+            "${arr[0]}m"
+        }
+        every { resources.getString(R.string.programTag_DateRange, any(), any()) } answers {
+            val arr = args[1] as Array<*>
+            "${arr[0]} - ${arr[1]}"
+        }
+        every { resources.getQuantityString(R.plurals.learnMyContentProgramCourseCount, any(), any()) } answers {
+            "${secondArg<Int>()} courses"
+        }
+    }
+
+    // --- ProgramEnrollmentItem tests ---
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState has no imageUrl`() = runTest {
+        val state = createTestProgramItem().toCardState(resources) { null }
+
+        assertNull(state.imageUrl)
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState sets correct name`() = runTest {
+        val state = createTestProgramItem(name = "My Program").toCardState(resources) { null }
+
+        assertEquals("My Program", state.name)
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState sets correct progress`() = runTest {
+        val state = createTestProgramItem(completionPercentage = 75.0).toCardState(resources) { null }
+
+        assertEquals(75.0, state.progress)
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState has no buttonState`() = runTest {
+        val state = createTestProgramItem().toCardState(resources) { null }
+
+        assertNull(state.buttonState)
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState route points to program details screen`() = runTest {
+        val state = createTestProgramItem(id = "prog123").toCardState(resources) { null }
+
+        assertEquals(LearnRoute.LearnProgramDetailsScreen.route("prog123"), state.route)
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState includes program type chip`() = runTest {
+        val state = createTestProgramItem().toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.label == "Program" })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState includes course count chip`() = runTest {
+        val state = createTestProgramItem(courseCount = 3).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.label == "3 courses" })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState includes hours and minutes duration chip`() = runTest {
+        val state = createTestProgramItem(estimatedDurationMinutes = 90).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.label == "1h 30m" })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState includes hours-only duration chip`() = runTest {
+        val state = createTestProgramItem(estimatedDurationMinutes = 120).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.label == "2h" })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState includes minutes-only duration chip`() = runTest {
+        val state = createTestProgramItem(estimatedDurationMinutes = 45).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.label == "45m" })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState excludes duration chip when estimatedDurationMinutes is null`() = runTest {
+        val state = createTestProgramItem(estimatedDurationMinutes = null).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.none { it.label.matches(Regex("\\d.*[mh]")) })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState excludes duration chip when estimatedDurationMinutes is zero`() = runTest {
+        val state = createTestProgramItem(estimatedDurationMinutes = 0).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.none { it.label.matches(Regex("\\d.*[mh]")) })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState includes date range chip when both start and end dates present`() = runTest {
+        val state = createTestProgramItem(startDate = Date(0), endDate = Date(86400000L)).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.iconRes == R.drawable.calendar_today })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState excludes date range chip when startDate is null`() = runTest {
+        val state = createTestProgramItem(startDate = null, endDate = Date()).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.none { it.iconRes == R.drawable.calendar_today })
+    }
+
+    @Test
+    fun `ProgramEnrollmentItem toCardState excludes date range chip when endDate is null`() = runTest {
+        val state = createTestProgramItem(startDate = Date(), endDate = null).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.none { it.iconRes == R.drawable.calendar_today })
+    }
+
+    // --- CourseEnrollmentItem tests ---
+
+    @Test
+    fun `CourseEnrollmentItem toCardState route points to course details screen`() = runTest {
+        val state = createTestCourseItem(id = "42").toCardState(resources) { null }
+
+        assertEquals(LearnRoute.LearnCourseDetailsScreen.route(42L), state.route)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState includes course type chip`() = runTest {
+        val state = createTestCourseItem().toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.label == "Course" })
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState with null completionPercentage has Start learning button`() = runTest {
+        val moduleRoute = MainNavigationRoute.ModuleItemSequence(courseId = 42L, moduleItemId = 1L)
+
+        val state = createTestCourseItem(completionPercentage = null).toCardState(resources) { moduleRoute }
+
+        assertEquals("Start learning", state.buttonState?.label)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState with zero completionPercentage has Start learning button`() = runTest {
+        val moduleRoute = MainNavigationRoute.ModuleItemSequence(courseId = 42L, moduleItemId = 1L)
+
+        val state = createTestCourseItem(completionPercentage = 0.0).toCardState(resources) { moduleRoute }
+
+        assertEquals("Start learning", state.buttonState?.label)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState with partial progress has Resume learning button`() = runTest {
+        val moduleRoute = MainNavigationRoute.ModuleItemSequence(courseId = 42L, moduleItemId = 1L)
+
+        val state = createTestCourseItem(completionPercentage = 55.0).toCardState(resources) { moduleRoute }
+
+        assertEquals("Resume learning", state.buttonState?.label)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState with 100 percent completion has no button`() = runTest {
+        val state = createTestCourseItem(completionPercentage = 100.0).toCardState(resources) { null }
+
+        assertNull(state.buttonState)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState button route is the returned ModuleItemSequence route`() = runTest {
+        val moduleRoute = MainNavigationRoute.ModuleItemSequence(courseId = 123L, moduleItemId = 456L)
+
+        val state = createTestCourseItem(id = "123", completionPercentage = 50.0).toCardState(resources) { moduleRoute }
+
+        assertNotNull(state.buttonState)
+        assertTrue(state.buttonState!!.route is MainNavigationRoute.ModuleItemSequence)
+        val route = state.buttonState!!.route as MainNavigationRoute.ModuleItemSequence
+        assertEquals(456L, route.moduleItemId)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState without moduleItem has no button despite incomplete progress`() = runTest {
+        val state = createTestCourseItem(completionPercentage = 50.0).toCardState(resources) { null }
+
+        assertNull(state.buttonState)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState sets imageUrl from item`() = runTest {
+        val state = createTestCourseItem(imageUrl = "https://example.com/img.jpg").toCardState(resources) { null }
+
+        assertEquals("https://example.com/img.jpg", state.imageUrl)
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState includes date range chip when both dates present`() = runTest {
+        val state = createTestCourseItem(startAt = Date(0), endAt = Date(86400000L)).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.any { it.iconRes == R.drawable.calendar_today })
+    }
+
+    @Test
+    fun `CourseEnrollmentItem toCardState excludes date range chip when only startAt is set`() = runTest {
+        val state = createTestCourseItem(startAt = Date(), endAt = null).toCardState(resources) { null }
+
+        assertTrue(state.cardChips.none { it.iconRes == R.drawable.calendar_today })
+    }
+
+    private fun createTestProgramItem(
+        id: String = "program1",
+        name: String = "Test Program",
+        completionPercentage: Double? = 50.0,
+        startDate: Date? = null,
+        endDate: Date? = null,
+        estimatedDurationMinutes: Int? = null,
+        courseCount: Int = 2,
+    ) = ProgramEnrollmentItem(
+        id = id,
+        name = name,
+        position = 1,
+        enrolledAt = Date(),
+        completionPercentage = completionPercentage,
+        startDate = startDate,
+        endDate = endDate,
+        status = "active",
+        description = null,
+        variant = "standard",
+        estimatedDurationMinutes = estimatedDurationMinutes,
+        courseCount = courseCount,
+    )
+
+    private fun createTestCourseItem(
+        id: String = "42",
+        name: String = "Test Course",
+        completionPercentage: Double? = 50.0,
+        imageUrl: String? = null,
+        startAt: Date? = null,
+        endAt: Date? = null,
+    ) = CourseEnrollmentItem(
+        id = id,
+        name = name,
+        position = 1,
+        enrolledAt = Date(),
+        completionPercentage = completionPercentage,
+        startAt = startAt,
+        endAt = endAt,
+        requirementCount = 10,
+        requirementCompletedCount = 5,
+        completedAt = null,
+        grade = null,
+        imageUrl = imageUrl,
+        workflowState = "available",
+        lastActivityAt = null,
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedViewModelTest.kt
new file mode 100644
index 0000000000..af64d41ba6
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/completed/LearnMyContentCompletedViewModelTest.kt
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.completed
+
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.mycontent.CourseEnrollmentItem
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemStatus
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemType
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemsResponse
+import com.instructure.canvasapi2.models.journey.mycontent.ProgramEnrollmentItem
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentRepository
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnMyContentCompletedViewModelTest {
+
+    private val resources: Resources = mockk(relaxed = true)
+    private val repository: LearnMyContentRepository = mockk(relaxed = true)
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    private val emptyResponse = LearnItemsResponse(
+        items = emptyList(),
+        pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+    )
+
+    @Before
+    fun setup() {
+        Dispatchers.setMain(testDispatcher)
+        every { resources.getString(any()) } returns ""
+        every { resources.getString(any(), *anyVararg()) } returns ""
+        every { resources.getQuantityString(any(), any(), *anyVararg()) } returns ""
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns emptyResponse
+        coEvery { repository.getFirstPageModulesWithItems(any(), any()) } returns emptyList()
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `onFiltersChanged triggers load with COMPLETED status only`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = CollectionItemSortOption.MOST_RECENT,
+                status = listOf(LearnItemStatus.COMPLETED),
+                itemTypes = null,
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged does NOT pass IN_PROGRESS or NOT_STARTED status`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify(exactly = 0) {
+            repository.getLearnItems(
+                status = match { it.contains(LearnItemStatus.IN_PROGRESS) || it.contains(LearnItemStatus.NOT_STARTED) },
+                cursor = any(),
+                searchQuery = any(),
+                sortBy = any(),
+                itemTypes = any(),
+                forceNetwork = any(),
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged with Programs typeFilter passes PROGRAM item type`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.Programs)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                status = listOf(LearnItemStatus.COMPLETED),
+                itemTypes = listOf(LearnItemType.PROGRAM),
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged with Courses typeFilter passes COURSE item type`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.Courses)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                status = listOf(LearnItemStatus.COMPLETED),
+                itemTypes = listOf(LearnItemType.COURSE),
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `Successful load populates contentCards`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem(name = "Completed Program")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertEquals(1, viewModel.uiState.value.contentCards.size)
+        assertEquals("Completed Program", viewModel.uiState.value.contentCards[0].name)
+    }
+
+    @Test
+    fun `Load error sets isError true`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertTrue(viewModel.uiState.value.loadingState.isError)
+    }
+
+    @Test
+    fun `showMoreButton is true when pageInfo has next page`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem()),
+            pageInfo = LearningLibraryPageInfo("cursor1", null, true, false, 10, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertTrue(viewModel.uiState.value.showMoreButton)
+    }
+
+    @Test
+    fun `Refresh calls repository with forceNetwork true`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                status = listOf(LearnItemStatus.COMPLETED),
+                itemTypes = null,
+                forceNetwork = true,
+            )
+        }
+    }
+
+    @Test
+    fun `Refresh error shows snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), true) } throws Exception("Network error")
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        assertFalse(viewModel.uiState.value.loadingState.isRefreshing)
+        assertNotNull(viewModel.uiState.value.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `loadMore fetches with nextCursor and appends items`() = runTest {
+        val firstPage = LearnItemsResponse(
+            items = listOf(createTestProgramItem(id = "p1", name = "First")),
+            pageInfo = LearningLibraryPageInfo("cursor1", null, true, false, 2, null)
+        )
+        val secondPage = LearnItemsResponse(
+            items = listOf(createTestProgramItem(id = "p2", name = "Second")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 2, null)
+        )
+        coEvery { repository.getLearnItems(null, any(), any(), any(), any(), any()) } returns firstPage
+        coEvery { repository.getLearnItems("cursor1", any(), any(), any(), any(), any()) } returns secondPage
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.uiState.value.increaseTotalItemCount()
+
+        assertEquals(2, viewModel.uiState.value.contentCards.size)
+        assertEquals("First", viewModel.uiState.value.contentCards[0].name)
+        assertEquals("Second", viewModel.uiState.value.contentCards[1].name)
+    }
+
+    private fun getViewModel() = LearnMyContentCompletedViewModel(resources, repository)
+
+    private fun createTestProgramItem(
+        id: String = "program1",
+        name: String = "Test Program",
+    ) = ProgramEnrollmentItem(
+        id = id,
+        name = name,
+        position = 1,
+        enrolledAt = Date(),
+        completionPercentage = 100.0,
+        startDate = null,
+        endDate = null,
+        status = "completed",
+        description = null,
+        variant = "standard",
+        estimatedDurationMinutes = null,
+        courseCount = 2,
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressViewModelTest.kt
new file mode 100644
index 0000000000..16a561479a
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/inprogress/LearnMyContentInProgressViewModelTest.kt
@@ -0,0 +1,465 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.inprogress
+
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.ModuleItem
+import com.instructure.canvasapi2.models.ModuleObject
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.canvasapi2.models.journey.mycontent.CourseEnrollmentItem
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemStatus
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemType
+import com.instructure.canvasapi2.models.journey.mycontent.LearnItemsResponse
+import com.instructure.canvasapi2.models.journey.mycontent.ProgramEnrollmentItem
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentRepository
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertNull
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.advanceTimeBy
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnMyContentInProgressViewModelTest {
+
+    private val resources: Resources = mockk(relaxed = true)
+    private val repository: LearnMyContentRepository = mockk(relaxed = true)
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    private val emptyResponse = LearnItemsResponse(
+        items = emptyList(),
+        pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+    )
+
+    @Before
+    fun setup() {
+        Dispatchers.setMain(testDispatcher)
+        every { resources.getString(any()) } returns ""
+        every { resources.getString(any(), *anyVararg()) } returns ""
+        every { resources.getQuantityString(any(), any(), *anyVararg()) } returns ""
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns emptyResponse
+        coEvery { repository.getFirstPageModulesWithItems(any(), any()) } returns emptyList()
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `Initial state has empty content cards`() = runTest {
+        val viewModel = getViewModel()
+
+        assertTrue(viewModel.uiState.value.contentCards.isEmpty())
+    }
+
+    @Test
+    fun `Initial state is not loading`() = runTest {
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.uiState.value.loadingState.isLoading)
+    }
+
+    @Test
+    fun `Initial state has no error`() = runTest {
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.uiState.value.loadingState.isError)
+    }
+
+    @Test
+    fun `Initial state showMoreButton is false`() = runTest {
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.uiState.value.showMoreButton)
+    }
+
+    @Test
+    fun `Initial state isMoreLoading is false`() = runTest {
+        val viewModel = getViewModel()
+
+        assertFalse(viewModel.uiState.value.isMoreLoading)
+    }
+
+    @Test
+    fun `onFiltersChanged triggers load with IN_PROGRESS and NOT_STARTED status`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = CollectionItemSortOption.MOST_RECENT,
+                status = listOf(LearnItemStatus.IN_PROGRESS, LearnItemStatus.NOT_STARTED),
+                itemTypes = null,
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged with Programs typeFilter passes PROGRAM item type`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.Programs)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = CollectionItemSortOption.MOST_RECENT,
+                status = listOf(LearnItemStatus.IN_PROGRESS, LearnItemStatus.NOT_STARTED),
+                itemTypes = listOf(LearnItemType.PROGRAM),
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged with Courses typeFilter passes COURSE item type`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.Courses)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = CollectionItemSortOption.MOST_RECENT,
+                status = listOf(LearnItemStatus.IN_PROGRESS, LearnItemStatus.NOT_STARTED),
+                itemTypes = listOf(LearnItemType.COURSE),
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged with All typeFilter passes null item types`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                status = any(),
+                itemTypes = null,
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged with NameAscending sort passes NAME_A_Z sort option`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.NameAscending, LearnLearningLibraryTypeFilter.All)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = CollectionItemSortOption.NAME_A_Z,
+                status = any(),
+                itemTypes = null,
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `Successful load populates contentCards`() = runTest {
+        val programs = listOf(createTestProgramItem(id = "p1", name = "Program A"))
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = programs,
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertEquals(1, viewModel.uiState.value.contentCards.size)
+        assertEquals("Program A", viewModel.uiState.value.contentCards[0].name)
+    }
+
+    @Test
+    fun `Successful load sets totalItemCount from pageInfo`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem()),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 42, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertEquals(42, viewModel.uiState.value.totalItemCount)
+    }
+
+    @Test
+    fun `showMoreButton is true when pageInfo has next page`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem()),
+            pageInfo = LearningLibraryPageInfo("cursor1", null, true, false, 10, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertTrue(viewModel.uiState.value.showMoreButton)
+    }
+
+    @Test
+    fun `showMoreButton is false when pageInfo has no next page`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem()),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertFalse(viewModel.uiState.value.showMoreButton)
+    }
+
+    @Test
+    fun `Load error sets isError true`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertTrue(viewModel.uiState.value.loadingState.isError)
+        assertFalse(viewModel.uiState.value.loadingState.isLoading)
+    }
+
+    @Test
+    fun `Filter change replaces existing items`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem(name = "First")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem(name = "Second")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.Programs)
+
+        assertEquals(1, viewModel.uiState.value.contentCards.size)
+        assertEquals("Second", viewModel.uiState.value.contentCards[0].name)
+    }
+
+    @Test
+    fun `Refresh calls repository with forceNetwork true`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                status = any(),
+                itemTypes = null,
+                forceNetwork = true,
+            )
+        }
+    }
+
+    @Test
+    fun `Refresh success clears error and updates content`() = runTest {
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), false) } throws Exception("Error")
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), true) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem(name = "Refreshed")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        assertFalse(viewModel.uiState.value.loadingState.isError)
+        assertFalse(viewModel.uiState.value.loadingState.isRefreshing)
+        assertEquals("Refreshed", viewModel.uiState.value.contentCards[0].name)
+    }
+
+    @Test
+    fun `Refresh error shows snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), true) } throws Exception("Network error")
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        assertFalse(viewModel.uiState.value.loadingState.isRefreshing)
+        assertNotNull(viewModel.uiState.value.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `Dismiss snackbar clears snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+        coEvery { repository.getLearnItems(any(), any(), any(), any(), any(), true) } throws Exception("Network error")
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        viewModel.uiState.value.loadingState.onSnackbarDismiss()
+
+        assertNull(viewModel.uiState.value.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `loadMore fetches with nextCursor and appends items`() = runTest {
+        val firstPage = LearnItemsResponse(
+            items = listOf(createTestProgramItem(id = "p1", name = "First")),
+            pageInfo = LearningLibraryPageInfo("cursor1", null, true, false, 2, null)
+        )
+        val secondPage = LearnItemsResponse(
+            items = listOf(createTestProgramItem(id = "p2", name = "Second")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 2, null)
+        )
+        coEvery { repository.getLearnItems(null, any(), any(), any(), any(), any()) } returns firstPage
+        coEvery { repository.getLearnItems("cursor1", any(), any(), any(), any(), any()) } returns secondPage
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.uiState.value.increaseTotalItemCount()
+
+        assertEquals(2, viewModel.uiState.value.contentCards.size)
+        assertEquals("First", viewModel.uiState.value.contentCards[0].name)
+        assertEquals("Second", viewModel.uiState.value.contentCards[1].name)
+    }
+
+    @Test
+    fun `loadMore error shows snackbar and clears isMoreLoading`() = runTest {
+        coEvery { repository.getLearnItems(null, any(), any(), any(), any(), any()) } returns LearnItemsResponse(
+            items = listOf(createTestProgramItem()),
+            pageInfo = LearningLibraryPageInfo("cursor1", null, true, false, 2, null)
+        )
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+        coEvery { repository.getLearnItems("cursor1", any(), any(), any(), any(), any()) } throws Exception("Network error")
+
+        viewModel.uiState.value.increaseTotalItemCount()
+
+        assertFalse(viewModel.uiState.value.isMoreLoading)
+        assertNotNull(viewModel.uiState.value.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `Search query triggers load with searchQuery after debounce`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("kotlin", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+        advanceTimeBy(350)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = "kotlin",
+                sortBy = any(),
+                status = any(),
+                itemTypes = any(),
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `Empty search query passes null searchQuery to repository`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify {
+            repository.getLearnItems(
+                cursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                status = any(),
+                itemTypes = any(),
+                forceNetwork = false,
+            )
+        }
+    }
+
+    private fun getViewModel() = LearnMyContentInProgressViewModel(resources, repository)
+
+    private fun createTestProgramItem(
+        id: String = "program1",
+        name: String = "Test Program",
+    ) = ProgramEnrollmentItem(
+        id = id,
+        name = name,
+        position = 1,
+        enrolledAt = Date(),
+        completionPercentage = 50.0,
+        startDate = null,
+        endDate = null,
+        status = "active",
+        description = null,
+        variant = "standard",
+        estimatedDurationMinutes = null,
+        courseCount = 2,
+    )
+
+    private fun createTestCourseItem(
+        id: String = "course1",
+        name: String = "Test Course",
+        completionPercentage: Double? = 50.0,
+    ) = CourseEnrollmentItem(
+        id = id,
+        name = name,
+        position = 1,
+        enrolledAt = Date(),
+        completionPercentage = completionPercentage,
+        startAt = null,
+        endAt = null,
+        requirementCount = 10,
+        requirementCompletedCount = 5,
+        completedAt = null,
+        grade = null,
+        imageUrl = null,
+        workflowState = "available",
+        lastActivityAt = null,
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedViewModelTest.kt
new file mode 100644
index 0000000000..4c620cdaca
--- /dev/null
+++ b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/mycontent/saved/LearnMyContentSavedViewModelTest.kt
@@ -0,0 +1,348 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, version 3 of the License.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.instructure.horizon.features.learn.mycontent.saved
+
+import android.content.res.Resources
+import com.instructure.canvasapi2.models.journey.learninglibrary.CanvasCourseInfo
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemSortOption
+import com.instructure.canvasapi2.models.journey.learninglibrary.CollectionItemType
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItem
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryCollectionItemsResponse
+import com.instructure.canvasapi2.models.journey.learninglibrary.LearningLibraryPageInfo
+import com.instructure.horizon.R
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibrarySortOption
+import com.instructure.horizon.features.learn.learninglibrary.common.LearnLearningLibraryTypeFilter
+import com.instructure.horizon.features.learn.mycontent.common.LearnMyContentRepository
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNotNull
+import junit.framework.TestCase.assertNull
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.Date
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class LearnMyContentSavedViewModelTest {
+
+    private val resources: Resources = mockk(relaxed = true)
+    private val myContentRepository: LearnMyContentRepository = mockk(relaxed = true)
+    private val savedContentRepository: LearnMyContentSavedRepository = mockk(relaxed = true)
+    private val testDispatcher = UnconfinedTestDispatcher()
+
+    private val emptyResponse = LearningLibraryCollectionItemsResponse(
+        items = emptyList(),
+        pageInfo = LearningLibraryPageInfo(null, null, false, false, null, null)
+    )
+
+    @Before
+    fun setup() {
+        Dispatchers.setMain(testDispatcher)
+        every { resources.getString(any()) } returns ""
+        every { resources.getString(any(), *anyVararg()) } returns ""
+        every { resources.getQuantityString(any(), any(), *anyVararg()) } returns ""
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } returns emptyResponse
+        coEvery { myContentRepository.getFirstPageModulesWithItems(any(), any()) } returns emptyList()
+        coEvery { savedContentRepository.getLearningLibraryRecommendedItems(any()) } returns emptyList()
+        coEvery { savedContentRepository.toggleLearningLibraryItemIsBookmarked(any()) } returns false
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `Initial state has empty content cards`() = runTest {
+        val viewModel = getViewModel()
+
+        assertTrue(viewModel.uiState.value.contentCards.isEmpty())
+    }
+
+    @Test
+    fun `onFiltersChanged calls getBookmarkedLearningLibraryItems`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify {
+            myContentRepository.getBookmarkedLearningLibraryItems(
+                afterCursor = null,
+                searchQuery = null,
+                sortBy = CollectionItemSortOption.MOST_RECENT,
+                types = null,
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged also fetches recommendations`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify { savedContentRepository.getLearningLibraryRecommendedItems(false) }
+    }
+
+    @Test
+    fun `onFiltersChanged with Courses typeFilter passes COURSE collection type`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.Courses)
+
+        coVerify {
+            myContentRepository.getBookmarkedLearningLibraryItems(
+                afterCursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                types = listOf(CollectionItemType.COURSE),
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `onFiltersChanged with All typeFilter passes null types`() = runTest {
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        coVerify {
+            myContentRepository.getBookmarkedLearningLibraryItems(
+                afterCursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                types = null,
+                forceNetwork = false,
+            )
+        }
+    }
+
+    @Test
+    fun `Successful load populates contentCards`() = runTest {
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1", name = "Saved Course")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertEquals(1, viewModel.uiState.value.contentCards.size)
+        assertEquals("item1", viewModel.uiState.value.contentCards[0].id)
+    }
+
+    @Test
+    fun `Load error sets isError true`() = runTest {
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } throws Exception("Network error")
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertTrue(viewModel.uiState.value.loadingState.isError)
+    }
+
+    @Test
+    fun `showMoreButton is true when pageInfo has next page`() = runTest {
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem()),
+            pageInfo = LearningLibraryPageInfo("cursor1", null, true, false, 10, null)
+        )
+        val viewModel = getViewModel()
+
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        assertTrue(viewModel.uiState.value.showMoreButton)
+    }
+
+    @Test
+    fun `Refresh fetches recommendations with forceNetwork true`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        coVerify { savedContentRepository.getLearningLibraryRecommendedItems(true) }
+    }
+
+    @Test
+    fun `Refresh calls getBookmarkedLearningLibraryItems with forceNetwork true`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        coVerify {
+            myContentRepository.getBookmarkedLearningLibraryItems(
+                afterCursor = null,
+                searchQuery = null,
+                sortBy = any(),
+                types = null,
+                forceNetwork = true,
+            )
+        }
+    }
+
+    @Test
+    fun `loadMore fetches with cursor and appends items`() = runTest {
+        val firstPage = LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1")),
+            pageInfo = LearningLibraryPageInfo("cursor1", null, true, false, 2, null)
+        )
+        val secondPage = LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item2")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 2, null)
+        )
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(null, any(), any(), any(), any(), any()) } returns firstPage
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems("cursor1", any(), any(), any(), any(), any()) } returns secondPage
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.uiState.value.increaseTotalItemCount()
+
+        assertEquals(2, viewModel.uiState.value.contentCards.size)
+    }
+
+    @Test
+    fun `onBookmarkItem sets bookmarkLoading true then removes item on success`() = runTest {
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.onBookmarkItem("item1")
+
+        assertTrue(viewModel.uiState.value.contentCards.none { it.id == "item1" })
+    }
+
+    @Test
+    fun `onBookmarkItem calls toggleLearningLibraryItemIsBookmarked`() = runTest {
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.onBookmarkItem("item1")
+
+        coVerify { savedContentRepository.toggleLearningLibraryItemIsBookmarked("item1") }
+    }
+
+    @Test
+    fun `onBookmarkItem error keeps item in list with bookmarkLoading false`() = runTest {
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        coEvery { savedContentRepository.toggleLearningLibraryItemIsBookmarked("item1") } throws Exception("Network error")
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.onBookmarkItem("item1")
+
+        val item = viewModel.uiState.value.contentCards.find { it.id == "item1" }
+        assertNotNull(item)
+        assertFalse(item!!.bookmarkLoading)
+    }
+
+    @Test
+    fun `onBookmarkItem error shows snackbar message`() = runTest {
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), any()) } returns LearningLibraryCollectionItemsResponse(
+            items = listOf(createTestCollectionItem(id = "item1")),
+            pageInfo = LearningLibraryPageInfo(null, null, false, false, 1, null)
+        )
+        every { resources.getString(R.string.learnMyContentSavedFailedToBookmarkErrorMessage) } returns "Failed to save"
+        coEvery { savedContentRepository.toggleLearningLibraryItemIsBookmarked("item1") } throws Exception("Network error")
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+
+        viewModel.onBookmarkItem("item1")
+
+        assertNotNull(viewModel.uiState.value.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `Refresh error shows snackbar`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), true) } throws Exception("Network error")
+
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        assertFalse(viewModel.uiState.value.loadingState.isRefreshing)
+        assertNotNull(viewModel.uiState.value.loadingState.snackbarMessage)
+    }
+
+    @Test
+    fun `Dismiss snackbar clears snackbar message`() = runTest {
+        val viewModel = getViewModel()
+        viewModel.onFiltersChanged("", LearnLearningLibrarySortOption.MostRecent, LearnLearningLibraryTypeFilter.All)
+        coEvery { myContentRepository.getBookmarkedLearningLibraryItems(any(), any(), any(), any(), any(), true) } throws Exception("Error")
+        viewModel.uiState.value.loadingState.onRefresh()
+
+        viewModel.uiState.value.loadingState.onSnackbarDismiss()
+
+        assertNull(viewModel.uiState.value.loadingState.snackbarMessage)
+    }
+
+    private fun getViewModel() = LearnMyContentSavedViewModel(resources, myContentRepository, savedContentRepository)
+
+    private fun createTestCollectionItem(
+        id: String = "testItem",
+        name: String = "Test Item",
+        isBookmarked: Boolean = true,
+        itemType: CollectionItemType = CollectionItemType.COURSE,
+    ) = LearningLibraryCollectionItem(
+        id = id,
+        libraryId = "library1",
+        itemType = itemType,
+        displayOrder = 1.0,
+        canvasCourse = CanvasCourseInfo(
+            courseId = "1",
+            canvasUrl = "https://example.com",
+            courseName = name,
+            courseImageUrl = null,
+            moduleCount = 5.0,
+            moduleItemCount = 20.0,
+            estimatedDurationMinutes = 60.0,
+        ),
+        programId = null,
+        programCourseId = null,
+        createdAt = Date(),
+        updatedAt = Date(),
+        isBookmarked = isBookmarked,
+        completionPercentage = 0.0,
+        isEnrolledInCanvas = true,
+        moduleInfo = null,
+        canvasEnrollmentId = null,
+    )
+}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/program/list/LearnProgramListRepositoryTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/program/list/LearnProgramListRepositoryTest.kt
deleted file mode 100644
index dec2a5ca54..0000000000
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/program/list/LearnProgramListRepositoryTest.kt
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.program.list
-
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithModuleItemDurations
-import com.instructure.canvasapi2.managers.graphql.horizon.HorizonGetCoursesManager
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.GetProgramsManager
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.Program
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.ProgramRequirement
-import com.instructure.canvasapi2.utils.DataResult
-import com.instructure.journey.type.ProgramVariantType
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.mockk
-import junit.framework.TestCase.assertEquals
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Test
-
-class LearnProgramListRepositoryTest {
-    private val getProgramsManager: GetProgramsManager = mockk(relaxed = true)
-    private val getCoursesManager: HorizonGetCoursesManager = mockk(relaxed = true)
-
-    private val testPrograms = listOf(
-        createTestProgram(
-            id = "program1",
-            name = "Software Engineering",
-            requirements = listOf(
-                createTestProgramRequirement(courseId = 1L, progress = 0.0),
-                createTestProgramRequirement(courseId = 2L, progress = 50.0)
-            )
-        ),
-        createTestProgram(
-            id = "program2",
-            name = "Data Science",
-            requirements = listOf(
-                createTestProgramRequirement(courseId = 3L, progress = 100.0)
-            )
-        )
-    )
-
-    private val testCourses = listOf(
-        createTestCourse(courseId = 1L, courseName = "Intro to Programming"),
-        createTestCourse(courseId = 2L, courseName = "Advanced Algorithms"),
-        createTestCourse(courseId = 3L, courseName = "Machine Learning")
-    )
-
-    @Before
-    fun setup() {
-        coEvery { getProgramsManager.getPrograms(any()) } returns testPrograms
-        coEvery { getCoursesManager.getProgramCourses(any(), any()) } returns DataResult.Success(testCourses[0])
-    }
-
-    @Test
-    fun `getPrograms returns list of programs`() = runTest {
-        val repository = getRepository()
-        val result = repository.getPrograms(false)
-
-        assertEquals(2, result.size)
-        assertEquals(testPrograms, result)
-        coVerify { getProgramsManager.getPrograms(false) }
-    }
-
-    @Test
-    fun `getPrograms with forceRefresh true calls API with force network`() = runTest {
-        val repository = getRepository()
-        repository.getPrograms(true)
-
-        coVerify { getProgramsManager.getPrograms(true) }
-    }
-
-    @Test
-    fun `getPrograms returns empty list when no programs`() = runTest {
-        coEvery { getProgramsManager.getPrograms(any()) } returns emptyList()
-        val repository = getRepository()
-        val result = repository.getPrograms(false)
-
-        assertEquals(0, result.size)
-    }
-
-    @Test
-    fun `getCoursesById fetches courses for all provided IDs`() = runTest {
-        coEvery { getCoursesManager.getProgramCourses(1L, false) } returns DataResult.Success(testCourses[0])
-        coEvery { getCoursesManager.getProgramCourses(2L, false) } returns DataResult.Success(testCourses[1])
-        coEvery { getCoursesManager.getProgramCourses(3L, false) } returns DataResult.Success(testCourses[2])
-
-        val repository = getRepository()
-        val result = repository.getCoursesById(listOf(1L, 2L, 3L), false)
-
-        assertEquals(3, result.size)
-        assertEquals("Intro to Programming", result[0].courseName)
-        assertEquals("Advanced Algorithms", result[1].courseName)
-        assertEquals("Machine Learning", result[2].courseName)
-        coVerify { getCoursesManager.getProgramCourses(1L, false) }
-        coVerify { getCoursesManager.getProgramCourses(2L, false) }
-        coVerify { getCoursesManager.getProgramCourses(3L, false) }
-    }
-
-    @Test
-    fun `getCoursesById with forceNetwork true calls API with force network`() = runTest {
-        coEvery { getCoursesManager.getProgramCourses(1L, true) } returns DataResult.Success(testCourses[0])
-
-        val repository = getRepository()
-        repository.getCoursesById(listOf(1L), true)
-
-        coVerify { getCoursesManager.getProgramCourses(1L, true) }
-    }
-
-    private fun getRepository(): LearnProgramListRepository {
-        return LearnProgramListRepository(getProgramsManager, getCoursesManager)
-    }
-
-    private fun createTestProgram(
-        id: String = "testProgram",
-        name: String = "Test Program",
-        requirements: List<ProgramRequirement> = emptyList()
-    ): Program = Program(
-        id = id,
-        name = name,
-        description = "Test description",
-        startDate = null,
-        endDate = null,
-        variant = ProgramVariantType.LINEAR,
-        courseCompletionCount = null,
-        sortedRequirements = requirements
-    )
-
-    private fun createTestProgramRequirement(
-        courseId: Long = 1L,
-        progress: Double = 0.0
-    ): ProgramRequirement = ProgramRequirement(
-        id = "requirement$courseId",
-        progressId = "progress$courseId",
-        courseId = courseId,
-        required = true,
-        progress = progress,
-        enrollmentStatus = null
-    )
-
-    private fun createTestCourse(
-        courseId: Long = 1L,
-        courseName: String = "Test Course"
-    ): CourseWithModuleItemDurations = CourseWithModuleItemDurations(
-        courseId = courseId,
-        courseName = courseName,
-        moduleItemsDuration = listOf("PT1H"),
-        startDate = null,
-        endDate = null
-    )
-}
diff --git a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/program/list/LearnProgramListViewModelTest.kt b/libs/horizon/src/test/java/com/instructure/horizon/features/learn/program/list/LearnProgramListViewModelTest.kt
deleted file mode 100644
index c21406a9f9..0000000000
--- a/libs/horizon/src/test/java/com/instructure/horizon/features/learn/program/list/LearnProgramListViewModelTest.kt
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright (C) 2026 - present Instructure, Inc.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, version 3 of the License.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.instructure.horizon.features.learn.program.list
-
-import android.content.Context
-import android.content.res.Resources
-import androidx.compose.ui.text.input.TextFieldValue
-import com.instructure.canvasapi2.managers.graphql.horizon.CourseWithModuleItemDurations
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.Program
-import com.instructure.canvasapi2.managers.graphql.horizon.journey.ProgramRequirement
-import com.instructure.horizon.R
-import com.instructure.journey.type.ProgramVariantType
-import io.mockk.coEvery
-import io.mockk.coVerify
-import io.mockk.every
-import io.mockk.mockk
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertFalse
-import junit.framework.TestCase.assertNull
-import junit.framework.TestCase.assertTrue
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.UnconfinedTestDispatcher
-import kotlinx.coroutines.test.resetMain
-import kotlinx.coroutines.test.setMain
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class LearnProgramListViewModelTest {
-    private val context: Context = mockk(relaxed = true)
-    private val resources: Resources = mockk(relaxed = true)
-    private val repository: LearnProgramListRepository = mockk(relaxed = true)
-    private val testDispatcher = UnconfinedTestDispatcher()
-
-    private val testPrograms = listOf(
-        createTestProgram(
-            id = "program1",
-            name = "Software Engineering",
-            requirements = listOf(
-                createTestProgramRequirement(courseId = 1L, progress = 0.0)
-            )
-        ),
-        createTestProgram(
-            id = "program2",
-            name = "Data Science",
-            requirements = listOf(
-                createTestProgramRequirement(courseId = 2L, progress = 50.0)
-            )
-        ),
-        createTestProgram(
-            id = "program3",
-            name = "Web Development",
-            requirements = listOf(
-                createTestProgramRequirement(courseId = 3L, progress = 100.0)
-            )
-        ),
-        createTestProgram(
-            id = "program4",
-            name = "Machine Learning",
-            requirements = listOf(
-                createTestProgramRequirement(courseId = 4L, progress = 25.0)
-            )
-        )
-    )
-
-    private val testCourses = listOf(
-        createTestCourse(courseId = 1L, courseName = "Intro to Programming"),
-        createTestCourse(courseId = 2L, courseName = "Data Analysis"),
-        createTestCourse(courseId = 3L, courseName = "React Development"),
-        createTestCourse(courseId = 4L, courseName = "Neural Networks")
-    )
-
-    @Before
-    fun setup() {
-        Dispatchers.setMain(testDispatcher)
-        every { context.getString(any()) } returns ""
-        every { context.getString(any(), any()) } returns ""
-        every { context.getString(any(), any(), any()) } returns ""
-        every { resources.getQuantityString(any(), any(), any()) } returns "2 courses"
-        every { resources.getString(any()) } returns ""
-        every { resources.getString(any(), any()) } returns ""
-        coEvery { repository.getPrograms(any()) } returns testPrograms
-        coEvery { repository.getCoursesById(any(), any()) } returns testCourses
-    }
-
-    @After
-    fun tearDown() {
-        Dispatchers.resetMain()
-    }
-
-    @Test
-    fun `Initial state loads programs successfully`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        assertFalse(state.loadingState.isLoading)
-        assertFalse(state.loadingState.isError)
-        assertEquals(4, state.filteredPrograms.size)
-        coVerify { repository.getPrograms(false) }
-    }
-
-    @Test
-    fun `Initial state sets default filter to All`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        assertEquals(LearnProgramFilterOption.All, state.selectedFilterValue)
-    }
-
-    @Test
-    fun `Initial state sets visible item count to 10`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        assertEquals(10, state.visibleItemCount)
-    }
-
-    @Test
-    fun `Initial state has empty search query`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        assertEquals("", state.searchQuery.text)
-    }
-
-    @Test
-    fun `Loading state shows error when repository fails`() {
-        coEvery { repository.getPrograms(any()) } throws Exception("Network error")
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        assertTrue(state.loadingState.isError)
-        assertFalse(state.loadingState.isLoading)
-    }
-
-    @Test
-    fun `Empty programs list loads successfully`() {
-        coEvery { repository.getPrograms(any()) } returns emptyList()
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        assertFalse(state.loadingState.isLoading)
-        assertFalse(state.loadingState.isError)
-        assertEquals(0, state.filteredPrograms.size)
-    }
-
-    @Test
-    fun `Filter by NotStarted shows only programs with 0 progress`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.NotStarted)
-
-        val state = viewModel.uiState.value
-        assertEquals(1, state.filteredPrograms.size)
-        assertEquals("Software Engineering", state.filteredPrograms[0].programName)
-        assertEquals(0.0, state.filteredPrograms[0].programProgress)
-    }
-
-    @Test
-    fun `Filter by InProgress shows only programs with 0-100 progress`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.InProgress)
-
-        val state = viewModel.uiState.value
-        assertEquals(2, state.filteredPrograms.size)
-        assertTrue(state.filteredPrograms.any { it.programName == "Data Science" })
-        assertTrue(state.filteredPrograms.any { it.programName == "Machine Learning" })
-    }
-
-    @Test
-    fun `Filter by Completed shows only programs with 100 progress`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.Completed)
-
-        val state = viewModel.uiState.value
-        assertEquals(1, state.filteredPrograms.size)
-        assertEquals("Web Development", state.filteredPrograms[0].programName)
-        assertEquals(100.0, state.filteredPrograms[0].programProgress)
-    }
-
-    @Test
-    fun `Filter by All shows all programs`() {
-        val viewModel = getViewModel()
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.NotStarted)
-
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.All)
-
-        val state = viewModel.uiState.value
-        assertEquals(4, state.filteredPrograms.size)
-    }
-
-    @Test
-    fun `Search query filters programs by name case-insensitive`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateSearchQuery(TextFieldValue("engineering"))
-
-        val state = viewModel.uiState.value
-        assertEquals(1, state.filteredPrograms.size)
-        assertEquals("Software Engineering", state.filteredPrograms[0].programName)
-    }
-
-    @Test
-    fun `Search query with partial match filters correctly`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateSearchQuery(TextFieldValue("dev"))
-
-        val state = viewModel.uiState.value
-        assertEquals(1, state.filteredPrograms.size)
-        assertEquals("Web Development", state.filteredPrograms[0].programName)
-    }
-
-    @Test
-    fun `Search query with no match returns empty list`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateSearchQuery(TextFieldValue("NonExistentProgram"))
-
-        val state = viewModel.uiState.value
-        assertEquals(0, state.filteredPrograms.size)
-    }
-
-    @Test
-    fun `Search query trims whitespace`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateSearchQuery(TextFieldValue("  data science  "))
-
-        val state = viewModel.uiState.value
-        assertEquals(1, state.filteredPrograms.size)
-        assertEquals("Data Science", state.filteredPrograms[0].programName)
-    }
-
-    @Test
-    fun `Combined filter and search works correctly`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.InProgress)
-        viewModel.uiState.value.updateSearchQuery(TextFieldValue("data"))
-
-        val state = viewModel.uiState.value
-        assertEquals(1, state.filteredPrograms.size)
-        assertEquals("Data Science", state.filteredPrograms[0].programName)
-    }
-
-    @Test
-    fun `Combined filter and search with no match returns empty list`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.Completed)
-        viewModel.uiState.value.updateSearchQuery(TextFieldValue("engineering"))
-
-        val state = viewModel.uiState.value
-        assertEquals(0, state.filteredPrograms.size)
-    }
-
-    @Test
-    fun `increaseVisibleItemCount increases count by 10`() {
-        val viewModel = getViewModel()
-        val initialCount = viewModel.uiState.value.visibleItemCount
-
-        viewModel.uiState.value.increaseVisibleItemCount()
-
-        val state = viewModel.uiState.value
-        assertEquals(initialCount + 10, state.visibleItemCount)
-    }
-
-    @Test
-    fun `Multiple increaseVisibleItemCount calls accumulate`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.increaseVisibleItemCount()
-        viewModel.uiState.value.increaseVisibleItemCount()
-
-        val state = viewModel.uiState.value
-        assertEquals(30, state.visibleItemCount)
-    }
-
-    @Test
-    fun `Refresh calls repository with forceNetwork true`() {
-        val viewModel = getViewModel()
-
-        viewModel.uiState.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        coVerify { repository.getPrograms(true) }
-    }
-
-    @Test
-    fun `Refresh updates programs list`() {
-        val viewModel = getViewModel()
-        val updatedPrograms = listOf(
-            createTestProgram(
-                id = "program5",
-                name = "New Program",
-                requirements = listOf(
-                    createTestProgramRequirement(courseId = 5L, progress = 0.0)
-                )
-            )
-        )
-        coEvery { repository.getPrograms(true) } returns updatedPrograms
-        coEvery { repository.getCoursesById(any(), any()) } returns listOf(
-            createTestCourse(courseId = 5L, courseName = "New Course")
-        )
-
-        viewModel.uiState.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        val state = viewModel.uiState.value
-        assertFalse(state.loadingState.isRefreshing)
-        assertEquals(1, state.filteredPrograms.size)
-        assertEquals("New Program", state.filteredPrograms[0].programName)
-    }
-
-    @Test
-    fun `Refresh on error shows snackbar message`() {
-        val viewModel = getViewModel()
-        every { context.getString(R.string.learnProgramListFailedToLoadMessage) } returns "Failed to load"
-        coEvery { repository.getPrograms(true) } throws Exception("Network error")
-
-        viewModel.uiState.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        val state = viewModel.uiState.value
-        assertFalse(state.loadingState.isRefreshing)
-        assertTrue(state.loadingState.snackbarMessage != null)
-    }
-
-    @Test
-    fun `Dismiss snackbar clears snackbar message`() {
-        val viewModel = getViewModel()
-        every { context.getString(R.string.learnProgramListFailedToLoadMessage) } returns "Failed to load"
-        coEvery { repository.getPrograms(true) } throws Exception("Network error")
-        viewModel.uiState.value.loadingState.onRefresh()
-        testDispatcher.scheduler.advanceUntilIdle()
-
-        viewModel.uiState.value.loadingState.onSnackbarDismiss()
-
-        val state = viewModel.uiState.value
-        assertNull(state.loadingState.snackbarMessage)
-    }
-
-    @Test
-    fun `Programs are mapped correctly to LearnProgramState`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        val firstProgram = state.filteredPrograms[0]
-        assertEquals("program1", firstProgram.programId)
-        assertEquals("Software Engineering", firstProgram.programName)
-        assertEquals(0.0, firstProgram.programProgress)
-    }
-
-    @Test
-    fun `Program chips are created with correct course count and duration`() {
-        val viewModel = getViewModel()
-
-        val state = viewModel.uiState.value
-        val firstProgram = state.filteredPrograms[0]
-        assertTrue(firstProgram.programChips.isNotEmpty())
-    }
-
-    @Test
-    fun `Changing filter resets to filtered view of all loaded programs`() {
-        val viewModel = getViewModel()
-        viewModel.uiState.value.updateSearchQuery(TextFieldValue("engineering"))
-
-        viewModel.uiState.value.updateFilterValue(LearnProgramFilterOption.InProgress)
-
-        val state = viewModel.uiState.value
-        assertEquals(0, state.filteredPrograms.size)
-    }
-
-    private fun getViewModel(): LearnProgramListViewModel {
-        return LearnProgramListViewModel(context, resources, repository)
-    }
-
-    private fun createTestProgram(
-        id: String = "testProgram",
-        name: String = "Test Program",
-        requirements: List<ProgramRequirement> = emptyList()
-    ): Program = Program(
-        id = id,
-        name = name,
-        description = "Test description",
-        startDate = null,
-        endDate = null,
-        variant = ProgramVariantType.LINEAR,
-        courseCompletionCount = null,
-        sortedRequirements = requirements
-    )
-
-    private fun createTestProgramRequirement(
-        courseId: Long = 1L,
-        progress: Double = 0.0
-    ): ProgramRequirement = ProgramRequirement(
-        id = "requirement$courseId",
-        progressId = "progress$courseId",
-        courseId = courseId,
-        required = true,
-        progress = progress,
-        enrollmentStatus = null
-    )
-
-    private fun createTestCourse(
-        courseId: Long = 1L,
-        courseName: String = "Test Course"
-    ): CourseWithModuleItemDurations = CourseWithModuleItemDurations(
-        courseId = courseId,
-        courseName = courseName,
-        moduleItemsDuration = listOf("PT1H"),
-        startDate = null,
-        endDate = null
-    )
-}
diff --git a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginFindSchoolActivity.kt b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginFindSchoolActivity.kt
index e3e2bc7cbf..214a8b1d51 100644
--- a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginFindSchoolActivity.kt
+++ b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginFindSchoolActivity.kt
@@ -16,17 +16,14 @@
  */
 package com.instructure.loginapi.login.activities
 
-import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
-import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
 import android.view.LayoutInflater
-import android.view.View
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityManager
 import android.widget.ImageView
@@ -35,15 +32,15 @@ import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.instructure.canvasapi2.StatusCallback
-import com.instructure.canvasapi2.managers.AccountDomainManager
 import com.instructure.canvasapi2.models.AccountDomain
 import com.instructure.canvasapi2.utils.APIHelper
-import com.instructure.canvasapi2.utils.ApiType
-import com.instructure.canvasapi2.utils.LinkHeaders
 import com.instructure.loginapi.login.R
 import com.instructure.loginapi.login.adapter.DomainAdapter
 import com.instructure.loginapi.login.databinding.ActivityFindSchoolBinding
@@ -51,53 +48,57 @@ import com.instructure.loginapi.login.dialog.NoInternetConnectionDialog
 import com.instructure.loginapi.login.util.Const
 import com.instructure.pandautils.base.BaseCanvasActivity
 import com.instructure.pandautils.binding.viewBinding
+import com.instructure.pandautils.domain.usecase.accountdomain.SearchAccountDomainUseCase
 import com.instructure.pandautils.utils.ColorUtils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
-import retrofit2.Response
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
 import java.util.Locale
 import java.util.regex.Pattern
+import javax.inject.Inject
 
+@AndroidEntryPoint
 abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
 
+    @Inject
+    lateinit var searchAccountDomainUseCase: SearchAccountDomainUseCase
+
     private val binding by viewBinding(ActivityFindSchoolBinding::inflate)
 
-    private var mDomainAdapter: DomainAdapter? = null
-    private var mNextActionButton: TextView? = null
-    private val mDelayFetchAccountHandler = Handler()
-    protected var mWhatsYourSchoolName: TextView? = null
-    private var mLoginFlowLogout: TextView? = null
+    private var domainAdapter: DomainAdapter? = null
+    private var nextActionButton: TextView? = null
+    private val delayFetchAccountHandler = Handler()
+    protected var whatsYourSchoolName: TextView? = null
+    private var loginFlowLogout: TextView? = null
 
     /**
      * Worker thread for fetching account domains.
      */
-    private val mFetchAccountsWorker = Runnable {
+    private val fetchAccountsWorker = Runnable {
         val query = binding.domainInput.text.toString()
-        AccountDomainManager.searchAccounts(query, mAccountDomainCallback)
-    }
-
-    private val mAccountDomainCallback = object : StatusCallback<List<AccountDomain>>() {
-
-        override fun onResponse(response: Response<List<AccountDomain>>, linkHeaders: LinkHeaders, type: ApiType) {
-            if (type.isCache) return
-
-            val domains = response.body()?.toMutableList() ?: mutableListOf()
-
-            val isDebuggable = 0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE
-
-            if (isDebuggable) {
-                // Put these domains first
-                domains.add(0, createAccountForDebugging("mobiledev.instructure.com"))
-                domains.add(1, createAccountForDebugging("mobiledev.beta.instructure.com"))
-                domains.add(2, createAccountForDebugging("mobileqa.instructure.com"))
-                domains.add(3, createAccountForDebugging("mobileqat.instructure.com"))
-                domains.add(4, createAccountForDebugging("clare.instructure.com"))
-                domains.add(5, createAccountForDebugging("mobileqa.beta.instructure.com"))
-            }
+        lifecycleScope.launch {
+            searchAccountDomainUseCase(SearchAccountDomainUseCase.Params(query)).let { result ->
+                val domains = result.toMutableList()
+
+                val isDebuggable = 0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE
+
+                if (isDebuggable) {
+                    // Put these domains first
+                    domains.add(0, createAccountForDebugging("mobiledev.instructure.com"))
+                    domains.add(1, createAccountForDebugging("mobiledev.beta.instructure.com"))
+                    domains.add(2, createAccountForDebugging("mobileqa.instructure.com"))
+                    domains.add(3, createAccountForDebugging("mobileqat.instructure.com"))
+                    domains.add(4, createAccountForDebugging("clare.instructure.com"))
+                    domains.add(5, createAccountForDebugging("mobileqa.beta.instructure.com"))
+                }
 
-            if (mDomainAdapter != null) {
-                mDomainAdapter!!.setItems(domains)
-                mDomainAdapter!!.filter.filter(binding.domainInput!!.text.toString())
+                if (domainAdapter != null) {
+                    domainAdapter!!.setItems(domains)
+                    domainAdapter!!.filter.filter(binding.domainInput.text.toString())
+                }
             }
         }
     }
@@ -110,14 +111,31 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+        setupWindowInsets()
         bindViews()
         applyTheme()
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            view.setPadding(
+                insets.left,
+                0,
+                insets.right,
+                0
+            )
+            windowInsets
+        }
+    }
+
     private fun bindViews() = with(binding) {
-        mWhatsYourSchoolName = findViewById(R.id.whatsYourSchoolName)
-        mLoginFlowLogout = findViewById(R.id.loginFlowLogout)
+        this@BaseLoginFindSchoolActivity.whatsYourSchoolName = findViewById(R.id.whatsYourSchoolName)
+        this@BaseLoginFindSchoolActivity.loginFlowLogout = findViewById(R.id.loginFlowLogout)
         toolbar.apply {
+            applyTopSystemBarInsets()
             navigationIcon?.isAutoMirrored = true
             setupAsBackButton { finish() }
             inflateMenu(R.menu.menu_next)
@@ -135,8 +153,8 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
             })
         }
 
-        val a11yManager = getSystemService(Context.ACCESSIBILITY_SERVICE) as AccessibilityManager
-        if (a11yManager != null && (a11yManager.isEnabled || a11yManager.isTouchExplorationEnabled)) {
+        val a11yManager = getSystemService(ACCESSIBILITY_SERVICE) as AccessibilityManager
+        if (a11yManager.isEnabled || a11yManager.isTouchExplorationEnabled) {
             toolbar.isFocusable = true
             toolbar.isFocusableInTouchMode = true
             toolbar.postDelayed({
@@ -145,9 +163,14 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
             }, 500)
         }
 
-        mNextActionButton = findViewById(R.id.next)
-        mNextActionButton!!.isEnabled = false
-        mNextActionButton!!.setTextColor(ContextCompat.getColor(this@BaseLoginFindSchoolActivity, R.color.backgroundMedium))
+        nextActionButton = findViewById(R.id.next)
+        nextActionButton!!.isEnabled = false
+        nextActionButton!!.setTextColor(
+            ContextCompat.getColor(
+                this@BaseLoginFindSchoolActivity,
+                R.color.backgroundMedium
+            )
+        )
 
         domainInput.requestFocus()
         domainInput.setOnEditorActionListener { _, _, _ ->
@@ -161,26 +184,32 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
 
             override fun afterTextChanged(s: Editable) {
-                if (mDomainAdapter != null) {
-                    mDomainAdapter!!.filter.filter(s)
+                if (domainAdapter != null) {
+                    domainAdapter!!.filter.filter(s)
                     fetchAccountDomains()
                 }
 
-                if (mNextActionButton != null) {
+                if (nextActionButton != null) {
                     if (TextUtils.isEmpty(s.toString())) {
-                        mNextActionButton!!.isEnabled = false
-                        mNextActionButton!!.setTextColor(ContextCompat.getColor(
-                                this@BaseLoginFindSchoolActivity, R.color.backgroundMedium))
+                        nextActionButton!!.isEnabled = false
+                        nextActionButton!!.setTextColor(
+                            ContextCompat.getColor(
+                                this@BaseLoginFindSchoolActivity, R.color.backgroundMedium
+                            )
+                        )
                     } else {
-                        mNextActionButton!!.isEnabled = true
-                        mNextActionButton!!.setTextColor(ContextCompat.getColor(
-                                this@BaseLoginFindSchoolActivity, R.color.textInfo))
+                        nextActionButton!!.isEnabled = true
+                        nextActionButton!!.setTextColor(
+                            ContextCompat.getColor(
+                                this@BaseLoginFindSchoolActivity, R.color.textInfo
+                            )
+                        )
                     }
                 }
             }
         })
 
-        mDomainAdapter = DomainAdapter(object : DomainAdapter.DomainEvents {
+        domainAdapter = DomainAdapter(object : DomainAdapter.DomainEvents {
             override fun onDomainClick(account: AccountDomain) {
                 domainInput.setText(account.domain)
                 domainInput.setSelection(domainInput.text.length)
@@ -188,15 +217,23 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
             }
 
             override fun onHelpClick() {
-                val webHelpIntent = Intent(Intent.ACTION_VIEW, Uri.parse(Const.FIND_SCHOOL_HELP_URL))
+                val webHelpIntent =
+                    Intent(Intent.ACTION_VIEW, Const.FIND_SCHOOL_HELP_URL.toUri())
                 startActivity(webHelpIntent)
             }
         })
 
         val recyclerView = findViewById<RecyclerView>(R.id.findSchoolRecyclerView)
-        recyclerView.addItemDecoration(DividerItemDecoration(this@BaseLoginFindSchoolActivity, RecyclerView.VERTICAL))
-        recyclerView.layoutManager = LinearLayoutManager(this@BaseLoginFindSchoolActivity, RecyclerView.VERTICAL, false)
-        recyclerView.adapter = mDomainAdapter
+        recyclerView.addItemDecoration(
+            DividerItemDecoration(
+                this@BaseLoginFindSchoolActivity,
+                RecyclerView.VERTICAL
+            )
+        )
+        recyclerView.layoutManager =
+            LinearLayoutManager(this@BaseLoginFindSchoolActivity, RecyclerView.VERTICAL, false)
+        recyclerView.adapter = domainAdapter
+        recyclerView.applyBottomSystemBarInsets()
     }
 
     /**
@@ -204,17 +241,6 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
      */
     protected fun logout() {}
 
-    /**
-     * Shows a logout button. Calls from click return to a logout()
-     * @param show a value to indicate if the logout button should be shown.
-     */
-    protected fun showLogout(show: Boolean) {
-        mLoginFlowLogout!!.visibility = if (show) View.VISIBLE else View.GONE
-        if (show) {
-            mLoginFlowLogout!!.setOnClickListener { logout() }
-        }
-    }
-
     private fun validateDomain(accountDomain: AccountDomain) {
         var url: String? = accountDomain.domain!!.lowercase(Locale.getDefault()).replace(" ", "")
 
@@ -224,7 +250,7 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
         }
 
         //remove invalid characters at the end of the domain
-        val pattern = Pattern.compile("(.*)([a-zA-Z0-9]){1}")
+        val pattern = Pattern.compile("(.*)([a-zA-Z0-9])")
         val matcher = pattern.matcher(url)
         if (matcher.find()) {
             url = matcher.group()
@@ -241,7 +267,7 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
         }
 
         //Get just the host.
-        val uri = Uri.parse(url)
+        val uri = url.toUri()
         url = uri.host
 
         //Strip off www. if they typed it.
@@ -272,8 +298,8 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
      * Handles fetching account domains. Uses a worker runnable and handler to cancel fetching too often.
      */
     private fun fetchAccountDomains() {
-        mDelayFetchAccountHandler.removeCallbacks(mFetchAccountsWorker)
-        mDelayFetchAccountHandler.postDelayed(mFetchAccountsWorker, 500)
+        delayFetchAccountHandler.removeCallbacks(fetchAccountsWorker)
+        delayFetchAccountHandler.postDelayed(fetchAccountsWorker, 500)
     }
 
     private fun createAccountForDebugging(domain: String): AccountDomain {
@@ -285,9 +311,7 @@ abstract class BaseLoginFindSchoolActivity : BaseCanvasActivity() {
     }
 
     override fun onDestroy() {
-        if (mDelayFetchAccountHandler != null && mFetchAccountsWorker != null) {
-            mDelayFetchAccountHandler.removeCallbacks(mFetchAccountsWorker)
-        }
+        delayFetchAccountHandler.removeCallbacks(fetchAccountsWorker)
         super.onDestroy()
     }
 
diff --git a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt
index 5d5fb8989a..a543fc9180 100644
--- a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt
+++ b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginLandingPageActivity.kt
@@ -60,6 +60,9 @@ import com.instructure.loginapi.login.viewmodel.LoginViewModel
 import com.instructure.pandautils.base.BaseCanvasActivity
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import java.util.*
 import javax.inject.Inject
 
@@ -107,6 +110,19 @@ abstract class BaseLoginLandingPageActivity : BaseCanvasActivity() {
     }
 
     private fun bindViews() = with(binding) {
+        ViewCompat.setOnApplyWindowInsetsListener(rootView) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            view.updatePadding(
+                left = insets.left,
+                top = insets.top,
+                right = insets.right,
+                bottom = insets.bottom
+            )
+            WindowInsetsCompat.CONSUMED
+        }
+
         canvasNetwork.onClick {
             if (APIHelper.hasNetworkConnection()) {
                 val intent = beginCanvasNetworkFlow(URL_CANVAS_NETWORK)
diff --git a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginSignInActivity.kt b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginSignInActivity.kt
index d083a2811c..4a5fb694f7 100644
--- a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginSignInActivity.kt
+++ b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/BaseLoginSignInActivity.kt
@@ -41,6 +41,8 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.instructure.canvasapi2.RequestInterceptor.Companion.acceptedLanguageString
 import com.instructure.canvasapi2.StatusCallback
 import com.instructure.canvasapi2.TokenRefreshState
@@ -87,8 +89,10 @@ import com.instructure.loginapi.login.util.SavedLoginInfo
 import com.instructure.loginapi.login.viewmodel.LoginViewModel
 import com.instructure.pandautils.base.BaseCanvasActivity
 import com.instructure.pandautils.binding.viewBinding
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.Utils
 import com.instructure.pandautils.utils.ViewStyler.themeStatusBar
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setGone
 import com.instructure.pandautils.utils.setVisible
 import com.instructure.pandautils.utils.setupAsBackButton
@@ -135,7 +139,9 @@ abstract class BaseLoginSignInActivity : BaseCanvasActivity(), OnAuthenticationS
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         setContentView(binding.root)
+        setupWindowInsets()
         canvasLogin = intent!!.extras!!.getInt(Const.CANVAS_LOGIN, 0)
         setupViews()
         applyTheme()
@@ -163,9 +169,25 @@ abstract class BaseLoginSignInActivity : BaseCanvasActivity(), OnAuthenticationS
         }
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            view.setPadding(
+                insets.left,
+                0,
+                insets.right,
+                insets.bottom
+            )
+            windowInsets
+        }
+    }
+
     @SuppressLint("SetJavaScriptEnabled")
     private fun setupViews() {
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
+        toolbar.applyTopSystemBarInsets()
         toolbar.title = accountDomain.domain
         toolbar.navigationIcon?.isAutoMirrored = true
         toolbar.setupAsBackButton {
diff --git a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/LoginWithQRActivity.kt b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/LoginWithQRActivity.kt
index 5d69a26991..0e487687e1 100644
--- a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/LoginWithQRActivity.kt
+++ b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/activities/LoginWithQRActivity.kt
@@ -31,8 +31,13 @@ import com.instructure.loginapi.login.dialog.NoInternetConnectionDialog
 import com.instructure.loginapi.login.util.QRLogin
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setupAsBackButton
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 
 abstract class LoginWithQRActivity : BaseCanvasActivity() {
 
@@ -42,18 +47,34 @@ abstract class LoginWithQRActivity : BaseCanvasActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         setContentView(binding.root)
 
+        setupWindowInsets()
         bindViews()
     }
 
+    private fun setupWindowInsets() {
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+            view.updatePadding(
+                left = insets.left,
+                right = insets.right
+            )
+            windowInsets
+        }
+    }
+
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         val result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data)
 
         // Capture the results from the QR scanner
         if (result?.contents != null) {
             val loginUri = Uri.parse(result.contents)
-            if(QRLogin.verifySSOLoginUri(loginUri)) {
+            if (QRLogin.verifySSOLoginUri(loginUri)) {
                 // Valid link, let's launch it
                 launchApplicationWithQRLogin(loginUri)
             } else {
@@ -66,6 +87,7 @@ abstract class LoginWithQRActivity : BaseCanvasActivity() {
 
     private fun bindViews() = with(binding) {
         toolbar.apply {
+            applyTopSystemBarInsets()
             title = getString(R.string.locateQRCode)
             setupAsBackButton { finish() }
             navigationIcon?.isAutoMirrored = true
@@ -89,5 +111,12 @@ abstract class LoginWithQRActivity : BaseCanvasActivity() {
 
         val nextText: TextView = findViewById(R.id.next)
         nextText.setTextColor(ContextCompat.getColor(this@LoginWithQRActivity, R.color.textInfo))
+
+        // Apply bottom insets to the image (last element in scrollable content)
+        ViewCompat.setOnApplyWindowInsetsListener(image) { view, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(bottom = insets.bottom)
+            windowInsets
+        }
     }
 }
\ No newline at end of file
diff --git a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/features/acceptableusepolicy/AcceptableUsePolicyActivity.kt b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/features/acceptableusepolicy/AcceptableUsePolicyActivity.kt
index bb6643d739..79f38c08d3 100644
--- a/libs/login-api-2/src/main/java/com/instructure/loginapi/login/features/acceptableusepolicy/AcceptableUsePolicyActivity.kt
+++ b/libs/login-api-2/src/main/java/com/instructure/loginapi/login/features/acceptableusepolicy/AcceptableUsePolicyActivity.kt
@@ -22,8 +22,11 @@ import com.google.android.material.snackbar.Snackbar
 import com.instructure.loginapi.login.R
 import com.instructure.loginapi.login.databinding.ActivityAcceptableUsePolicyBinding
 import com.instructure.pandautils.base.BaseCanvasActivity
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.ToolbarColorizeHelper
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applySystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setupAsCloseButton
 import com.instructure.pandautils.utils.withRequireNetwork
@@ -42,11 +45,14 @@ class AcceptableUsePolicyActivity : BaseCanvasActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         binding = ActivityAcceptableUsePolicyBinding.inflate(layoutInflater)
         binding.viewModel = viewModel
         binding.lifecycleOwner = this
         setContentView(binding.root)
 
+        binding.root.applySystemBarInsets()
+        binding.toolbar.applyTopSystemBarInsets()
         binding.toolbar.setTitle(R.string.acceptableUsePolicyTitle)
         binding.toolbar.setupAsCloseButton {
             router.logout()
diff --git a/libs/login-api-2/src/main/res/layout-w720dp/activity_find_school.xml b/libs/login-api-2/src/main/res/layout-w720dp/activity_find_school.xml
index aaa337efa2..559035b615 100644
--- a/libs/login-api-2/src/main/res/layout-w720dp/activity_find_school.xml
+++ b/libs/login-api-2/src/main/res/layout-w720dp/activity_find_school.xml
@@ -25,7 +25,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightest"
         android:elevation="2dp"
         app:theme="@style/ToolBarStyleDark"
diff --git a/libs/login-api-2/src/main/res/layout/activity_acceptable_use_policy.xml b/libs/login-api-2/src/main/res/layout/activity_acceptable_use_policy.xml
index aa83061cbf..ea5a3ef7f0 100644
--- a/libs/login-api-2/src/main/res/layout/activity_acceptable_use_policy.xml
+++ b/libs/login-api-2/src/main/res/layout/activity_acceptable_use_policy.xml
@@ -39,7 +39,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/actionBarSize"
                 android:background="@color/backgroundLightestElevated"
                 android:elevation="6dp"
                 app:theme="@style/ToolBarStyleDark" />
diff --git a/libs/login-api-2/src/main/res/layout/activity_find_school.xml b/libs/login-api-2/src/main/res/layout/activity_find_school.xml
index 6560828757..f4593af659 100644
--- a/libs/login-api-2/src/main/res/layout/activity_find_school.xml
+++ b/libs/login-api-2/src/main/res/layout/activity_find_school.xml
@@ -27,7 +27,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightestElevated"
         android:elevation="6dp"
         app:theme="@style/ToolBarStyleDark"
@@ -81,7 +82,8 @@
         android:contentDescription="@string/matchingSchools"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"/>
+        android:layout_weight="1"
+        android:clipToPadding="false"/>
 
     <TextView
         android:id="@+id/loginFlowLogout"
diff --git a/libs/login-api-2/src/main/res/layout/activity_login_with_qr.xml b/libs/login-api-2/src/main/res/layout/activity_login_with_qr.xml
index 982cf9ba15..b7e2261a63 100644
--- a/libs/login-api-2/src/main/res/layout/activity_login_with_qr.xml
+++ b/libs/login-api-2/src/main/res/layout/activity_login_with_qr.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightestElevated"
         android:elevation="6dp"
         app:theme="@style/ToolBarStyleDark"
diff --git a/libs/login-api-2/src/main/res/layout/activity_sign_in.xml b/libs/login-api-2/src/main/res/layout/activity_sign_in.xml
index e6ea2b69cc..14f34365d3 100644
--- a/libs/login-api-2/src/main/res/layout/activity_sign_in.xml
+++ b/libs/login-api-2/src/main/res/layout/activity_sign_in.xml
@@ -27,7 +27,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/backgroundLightestElevated"
         android:elevation="6dp"
         app:theme="@style/ToolBarStyleDark"
diff --git a/libs/login-api-2/src/main/res/values/styles.xml b/libs/login-api-2/src/main/res/values/styles.xml
index f2c91ccac6..6cf5284527 100644
--- a/libs/login-api-2/src/main/res/values/styles.xml
+++ b/libs/login-api-2/src/main/res/values/styles.xml
@@ -32,22 +32,18 @@
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@color/darkStatusBarColor</item>
         <item name="android:fontFamily">@font/lato_font_family</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="LoginFlowTheme.Splash_Student" parent="@style/LoginFlowTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/splash_background_student</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="LoginFlowTheme.Splash_Teacher" parent="@style/LoginFlowTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/splash_background_teacher</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="LoginFlowTheme.Splash_Parent" parent="@style/LoginFlowTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/splash_background_parent</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="ToolBarStyle" parent="Theme.AppCompat.DayNight.DarkActionBar">
diff --git a/libs/pandares/src/main/res/values-ar/strings.xml b/libs/pandares/src/main/res/values-ar/strings.xml
index a32944ab71..93489d2f94 100644
--- a/libs/pandares/src/main/res/values-ar/strings.xml
+++ b/libs/pandares/src/main/res/values-ar/strings.xml
@@ -49,6 +49,7 @@
     <string name="submissionStatusFailedTitle">فشل الإرسال</string>
     <string name="submissionStatusFailedSubtitle">اضغط لعرض التفاصيل</string>
     <string name="submissionAndRubric">الإرسال ومقياس التقييم</string>
+    <string name="submissionAndFeedback">الإرسال والملاحظات</string>
     <string name="commentsAndRubric">التعليقات ونماذج التقييم (الروبرك)</string>
     <string name="errorLoadingAssignment">حدثت مشكلة أثناء تحميل هذه المهمة. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
     <string name="submitted">تم الإرسال</string>
@@ -238,6 +239,7 @@
 
     <!-- Date strings -->
     <string name="today">اليوم</string>
+    <string name="tomorrow">غدًا</string>
     <string name="past">الماضي</string>
     <string name="noDate">بلا تاريخ</string>
     <string name="future">المستقبل</string>
@@ -310,6 +312,7 @@
     <string name="monologue">مونولوج</string>
     <string name="noItemsToDisplayShort">لا توجد عناصر للعرض</string>
     <string name="Todo">قائمة مهام</string>
+    <string name="TodoNew">المهمة</string>
     <string name="todoFilter">تصفية المساقات</string>
     <string name="filterByEllipsis">التصفية حسب...</string>
     <string name="favoriteCoursesLabel">المساقات المفضلة</string>
@@ -517,6 +520,7 @@
     <string name="groups">المجموعات</string>
     <string name="groupMembers">أعضاء المجموعة</string>
 
+    <string name="messageGroup">إرسال رسالة إلى المجموعة</string>
     <string name="loading">جارٍ التحميل&#8230;</string>
     <string name="select_item_to_display">الاختيار من القائمة</string>
 
@@ -733,9 +737,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">قائمة مهام</string>
+    <string name="todoWidgetTitleNew">المهمة</string>
     <string name="gradesWidgetTitle">الدرجات</string>
     <string name="notificationWidgetTitle">الإعلامات</string>
     <string name="todoWidgetTitleLong">Canvas - قائمة المهام</string>
+    <string name="todoWidgetTitleLongNew">Canvas - المهمة</string>
     <string name="gradesWidgetTitleLong">Canvas - الدرجات</string>
     <string name="gradeWidgetTitleLong">Canvas - الدرجة</string>
     <string name="notificationWidgetTitleLong">Canvas - الإعلامات</string>
@@ -771,6 +777,8 @@
     <!-- Tablet Strings -->
     <string name="courses">المساقات</string>
     <string name="toDoList">قائمة المهام</string>
+    <string name="toDoListNew">قائمة المهام</string>
+
     <string name="notifications">الإعلامات</string>
     <string name="pushNotifications">الإعلامات الفورية</string>
     <string name="pushNotificationsError">لم يتم تسجيل الإعلامات لهذا الجهاز.</string>
@@ -785,7 +793,6 @@
 
     <string name="launchSpeedgrader">فتح SpeedGrader</string>
 
-    <string name="search_todo">قائمة ما يجب القيام به</string>
     <string name="search_course">مساق مساقات صف صفوف</string>
     <string name="search_grades">درجة درجات</string>
 
@@ -1148,6 +1155,13 @@
     <string name="pageTitleMustBeSet">يجب تعيين عنوان الصفحة.</string>
     <string name="pageDetails">تفاصيل الصفحة</string>
     <string name="saving">جارٍ الحفظ</string>
+    <string name="speedGraderSaving">جارٍ الحفظ</string>
+    <string name="speedGraderSaved">تم الحفظ</string>
+    <string name="speedGraderFailed">فشل</string>
+    <string name="speedGraderSaveErrorTitle">عذرًا حدث خطأ ما</string>
+    <string name="speedGraderSaveErrorMessage">حدث خطأ أثناء حفظ تعديل درجتك. يمكنك إعادة المحاولة الآن أو لاحقًا.</string>
+    <string name="speedGraderSaveErrorContentDescription">فشل حفظ الدرجة. اضغط لمعرفة التفاصيل.</string>
+
     <string name="confirmDeleteEvent">هل ترغب بالتأكيد في حذف هذا الحدث؟</string>
     <string name="conferencesNotSupported">لم يتم بعد دعم المؤتمرات على الأجهزة المحمولة.</string>
     <string name="filePreviewContentDescription">صورة معاينة الملف</string>
@@ -1308,6 +1322,10 @@
     <string name="recordings">التسجيلات</string>
     <string name="conferenceInProgress">المؤتمر قيد التقدم</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">مؤتمرات (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">المؤتمر قيد التقدم</string>
+    <string name="conferencesWidgetDismissed">تم إبعاد المؤتمر</string>
     <string name="a11y_criterion_content_description">تصنيف المعيار %s</string>
     <string name="a11y_criterion_description_content_description">%s، %s</string>
     <string name="a11y_criterion_button_click_description">معلومات إضافية</string>
@@ -1470,6 +1488,14 @@
         <item quantity="many">%s من عناصر قائمة المهام</item>
         <item quantity="other">%s من عناصر قائمة المهام</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="zero">%s من عناصر المهام</item>
+        <item quantity="one">%s عنصر مهمة</item>
+        <item quantity="two">%s من عناصر المهام</item>
+        <item quantity="few">%s من عناصر المهام</item>
+        <item quantity="many">%s من عناصر المهام</item>
+        <item quantity="other">%s من عناصر المهام</item>
+    </plurals>
     <string name="noAnnotationSelected">لم يتم تحديد تعليق توضيحي</string>
     <string name="emailNotifications">إعلامات البريد الإلكتروني</string>
     <string name="emailNotificationsImmediately">فورًا</string>
@@ -1776,7 +1802,9 @@
     <string name="calendarNoEvents">لا توجد أحداث اليوم!</string>
     <string name="calendarNoEventsDescription">يبدو أنه يوم رائع للراحة والاسترخاء وتجديد النشاط.</string>
     <string name="userCalendarToDo">قائمة المهام</string>
+    <string name="userCalendarToDoNew">المهمة</string>
     <string name="courseToDo">قائمة مهام %s</string>
+    <string name="courseToDoNew">%s مهمة</string>
     <string name="calendarEventExcused">معفى</string>
     <string name="calendarEventMissing">مفقود</string>
     <string name="calendarEventGraded">تم تقييم الدرجة</string>
@@ -1801,21 +1829,30 @@
     <string name="a11y_eventCreatedAnnouncement">تم إنشاء الحدث %s بنجاح.</string>
     <string name="a11y_eventUpdatedAnnouncement">تم تحديث الحدث %s بنجاح.</string>
     <string name="a11y_toDoCreatedAnnouncement">تم إنشاء قائمة المهام %s بنجاح.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">تم إنشاء %s مهمة بنجاح.</string>
     <string name="a11y_toDoUpdatedAnnouncement">تم تحديث قائمة المهام %s بنجاح.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">تم تحديث %s مهام بنجاح.</string>
     <string name="todoScreenTitle">قائمة المهام</string>
+    <string name="todoScreenTitleNew">المهمة</string>
     <string name="todoDateLabel">التاريخ</string>
     <string name="todoDescriptionLabel">الوصف</string>
     <string name="todoDeleteConfirmationTitle">هل تريد حذف قائمة المهام؟</string>
+    <string name="todoDeleteConfirmationTitleNew">هل تريد حذف المهمة؟</string>
     <string name="todoDeleteConfirmationText">سيؤدي هذا إلى حذف عنصر قائمة المهام الخاص بك بشكل دائم.</string>
+    <string name="todoDeleteConfirmationTextNew">سيؤدي هذا إلى حذف عنصر المهمة لديك بشكل نهائي.</string>
     <string name="todoDeleteErrorMessage">حدث خطأ أثناء حذف قائمة المهام هذه. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
+    <string name="todoDeleteErrorMessageNew">حدث خطأ أثناء حذف هذه المهمة. يُرجى التحقق من اتصالك وإعادة المحاولة مرة أخرى.</string>
     <string name="createTodoScreenTitle">قائمة مهام جديدة</string>
+    <string name="createTodoScreenTitleNew">مهمة جديدة</string>
     <string name="editTodoScreenTitle">تحرير قائم مهام</string>
+    <string name="editTodoScreenTitleNew">تحرير المهمة</string>
     <string name="createToDoTitleHint">إضافة عنوان</string>
     <string name="createToDoDateLabel">التاريخ</string>
     <string name="createToDoTimeLabel">الوقت</string>
     <string name="createToDoCalendarLabel">التقويم</string>
     <string name="createToDoDetailsLabel">التفاصيل</string>
     <string name="todoSaveErrorMessage">حدث خطأ أثناء حفظ قائمة المهام هذه. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
+    <string name="todoSaveErrorMessageNew">حدث خطأ أثناء حفظ هذه المهمة. يُرجى التحقق من اتصالك وإعادة المحاولة مرة أخرى.</string>
     <string name="selectCalendarScreenTitle">حدد تقويمًا</string>
     <string name="errorContentRetryButton">إعادة المحاولة</string>
     <string name="eventLocationLabel">الموقع</string>
@@ -1823,6 +1860,7 @@
     <string name="eventDetailsLabel">التفاصيل</string>
     <string name="errorLoadingEvent">حدثت مشكلة أثناء تحميل هذا الحدث. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
     <string name="errorLoadingTodo">حدثت مشكلة أثناء تحميل قائمة المهام هذه. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
+    <string name="errorLoadingTodoNew">حدثت مشكلة أثناء تحميل هذه المهمة. يُرجى التحقق من اتصالك وإعادة المحاولة مرة أخرى.</string>
     <string name="eventDeleteConfirmationTitle">هل تريد الحذف؟</string>
     <string name="eventDeleteConfirmationText">سيؤدي هذا إلى حذف الحدث الخاص بك بشكل دائم.</string>
     <string name="eventDeleteErrorMessage">حدث خطأ أثناء حذف هذا الحدث. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
@@ -1843,6 +1881,7 @@
     <string name="eventDeleteScopeAll">جميع الأحداث</string>
     <string name="eventDeleteScopeFollowing">هذا وكل الأحداث التالية</string>
     <string name="calendarAddToDo">إضافة قائمة مهام</string>
+    <string name="calendarAddToDoNew">إضافة مهمة</string>
     <string name="calendarAddEvent">إضافة حدث</string>
     <string name="createEventScreenTitle">حدث جديد</string>
     <string name="editEventScreenTitle">تحرير الحدث</string>
@@ -2245,7 +2284,9 @@
     <string name="widgetNotLoggedInTitle">فلنساعدك في تسجيل الدخول!</string>
     <string name="widgetToDoNotLoggedInSubtitle">لتر قائمة مهامك، يُرجى تسجيل الدخول في حسابك في التطبيق. سيستغرق الأمر ثانية فحسب!</string>
     <string name="a11y_widgetToDoOpenToDoList">فتح شاشة قائمة المهام</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">فتح شاشة قائمة المهام</string>
     <string name="a11y_widgetToDoCreateNewToDo">إنشاء مهمة جديدة</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">إنشاء مهمة جديدة</string>
     <string name="widgetGradesErrorSubtitle">نواجه مشكلة في عرض التقديرات الخاصة بك في الوقت الحالي. يُرجى إعادة المحاولة بعد فترة وجيزة أو توجه إلى التطبيق.</string>
     <string name="widgetGradesNotLoggedInSubtitle">لتر التقديرات الخاصة بك، يُرجى تسجيل الدخول في حسابك في التطبيق. سيستغرق الأمر ثانية فحسب!</string>
     <string name="widgetSingleGradeErrorSubtitle">نواجه مشكلة في عرض التقديرات الخاصة بك في الوقت الحالي.</string>
@@ -2253,6 +2294,19 @@
     <string name="widgetSingleGradeSelectCourse">فلنختر مساقًا</string>
     <string name="widgetGradesErrorLoadingCourses">حدث خطأ أثناء تحميل المساقات.</string>
     <string name="settingsSwitchExperience">تبديل إلى Canvas Career</string>
+    <string name="forecastWidgetTitle">الموجز الأسبوعي</string>
+    <string name="forecastWidgetWeekPeriod">الأسبوع %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">مفقود</string>
+    <string name="forecastWidgetDue">الاستحقاق</string>
+    <string name="forecastWidgetRecentGrades">درجات جديدة</string>
+    <string name="forecastWidgetGradeWeight">%d%% من الدرجة النهائية</string>
+    <string name="forecastWidgetErrorMessage">نواجه مشكلة في تحميل مهامك يرجى التحقق من الاتصال وإعادة المحاولة.</string>
+    <string name="forecastWidgetEmptyMissing">لا توجد مهام فائتة. لقد اطلعت عليها جميعًا!</string>
+    <string name="forecastWidgetEmptyDue">لا توجد مهام مستحقة لهذا الأسبوع.</string>
+    <string name="forecastWidgetEmptyRecentGrades">لا توجد درجات جديدة في هذا الأسبوع.</string>
+    <string name="a11y_contentDescription_previousWeek">الأسبوع السابق</string>
+    <string name="a11y_contentDescription_nextWeek">الأسبوع القادم</string>
+
     <string name="speedGraderGradeTabTitle">الصف الدراسي ومقياس التقييم روبرك</string>
     <string name="speedGraderDetailsTabTitle">التفاصيل</string>
     <string name="a11y_contentDescription_expandPanel">توسعة اللوحة</string>
@@ -2339,6 +2393,7 @@
     <string name="errorLoadingToDos">وقع خطأ أثناء تحميل عناصر قائم المهام الخاصة بك. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
     <string name="errorUpdatingToDo">وقع خطأ أثناء تحدث عنصر قائم المهام الخاص بك. يرجى التحقق من الاتصال وإعادة المحاولة.</string>
     <string name="noToDosForNow">لا توجد قوائم مهام في الوقت الحالي!</string>
+    <string name="noToDosForNowNew">لا توجد مهام في الوقت الحالي!</string>
     <string name="noToDosForNowSubtext">يبدو أننا في وقت رائع للراحة والاسترخاء والاستعداد للعمل من جديد.</string>
     <string name="todoSwipeDone">تم</string>
     <string name="todoSwipeUndo">تراجع</string>
@@ -2349,8 +2404,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">تفضيلات قائمة المهام</string>
+    <string name="todoFilterPreferencesNew">تفضيلات قائمة المهام</string>
     <string name="todoFilterVisibleItems">عناصر ظاهرة</string>
     <string name="todoFilterShowPersonalToDos">إظهار قوائم المهام الشخصية</string>
+    <string name="todoFilterShowPersonalToDosNew">إظهار المهام الشخصية</string>
     <string name="todoFilterShowCalendarEvents">إظهار أحداث التقويم</string>
     <string name="todoFilterShowCompleted">إظهار المكتمل</string>
     <string name="todoFilterFavoriteCoursesOnly">تفضيل الدورات التدريبية فقط</string>
@@ -2377,6 +2434,9 @@
     <string name="courseInvitationDeclineConfirmTitle">رفض الدعوة</string>
     <string name="courseInvitationDeclineConfirmMessage">هل أنت متأكد من أنك تريد رفض الدعوة إلى %s؟</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">التقدم</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">صباح الخير يا %s!</string>
@@ -2499,6 +2559,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">مرحبًا يا %s</string>
 
+    <string name="courses_and_groups">المساقات والمجموعات</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">تخصيص لوحة المعلومات</string>
     <string name="dashboard_widgets">عناصر واجهة المستخدم</string>
@@ -2508,16 +2569,44 @@
     <string name="changing_dashboard_layout">جارٍ تغيير تخطيط لوحة المعلومات</string>
     <string name="changing_dashboard_layout_message">لتغيير تخطيط لوحة المعلومات، عليك أن تعيد تشغيل التطبيق</string>
     <string name="restart_now">إعادة التشغيل الآن</string>
+    <string name="turn_on_new_dashboard">قم بتشغيل لوحة المعلومات الجديدة.</string>
     <string name="switched_back">هل تريد التبديل إلى الشكل القديم؟</string>
     <string name="switched_back_message">شكرًا لك على تجربة لوحة المعلومات الجديدة! هل من الممكن أن تخبرنا لماذا قمت بالرجوع إلى الشكل القديم؟</string>
+    <string name="survey_option_hard_to_find">من الصعب العثور على الأشياء</string>
+    <string name="survey_option_prefer_old_layout">أفضل التخطيط القديم</string>
+    <string name="survey_option_something_broken">هناك شيء ما لا يعمل كما يجب</string>
     <string name="what_could_we_improve">ما الذي يمكننا أن نحسنه؟</string>
+    <string name="what_do_you_think_of_new_dashboard">ما رأيك في لوحة المعلومات الجديدة؟</string>
+    <string name="let_us_know">دعنا نعرف!</string>
+    <string name="no_app_to_handle_link">لا يتوفر تطبيق لفتح هذا الارتباط</string>
     <string name="skip">تخطي</string>
     <string name="widget_setting_show_greeting">إظهار شاشة الترحيب</string>
     <string name="background_color">لون الخلفية</string>
+    <string name="widget_setting_show_grades">درجات المساق</string>
+    <string name="widget_setting_show_color_overlay">تراكب لون المساق</string>
     <string name="offline_content_available">يتوفر محتوى بدون اتصال</string>
     <string name="a11y_contentDescription_moreOptions">المزيد من الخيارات</string>
     <string name="customizeCourse">تخصيص مساق</string>
     <string name="favoriteCoursesAndGroups">تفضيل المساقات والمجموعات</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">الأدوات الخارجية غير متوفرة بدون اتصال.</string>
+    <string name="widget_weekly_summary">الموجز الأسبوعي</string>
+
+    <string name="dashboardCourseNickname">اللقب</string>
+    <string name="dashboardCourseNicknameHint">اكتب لقب المساق هنا</string>
+    <string name="dashboardCourseColor">لون المساق</string>
+    <string name="widget_toDo">قائمة المهام اليومية</string>
+    <string name="dailyToDoWidgetTitle">قائمة المهام اليومية</string>
+    <string name="todoWidget_showCompleted">إظهار المكتمل</string>
+    <string name="todoWidget_emptyTitle">أنت جاهز تمامًا في الوقت الحالي!</string>
+    <string name="todoWidget_emptyMessage">يبدو أنك لست متفرغًا لهذا اليوم.\nهل تريد إضافة بعض قوائم المهام؟</string>
+    <string name="todoWidget_addTodo">إضافة مهمة</string>
+    <string name="todoWidget_errorTitle">عذرًا، حدث خطأ ما</string>
+    <string name="todoWidget_errorMessage">لم نتمكن من تحميل قوائم المهام.\nأعد المحاولة، أو عد لاحقًا.</string>
+    <string name="todoWidget_refresh">تحديث</string>
+    <string name="todoWidget_today">اليوم</string>
+    <string name="a11y_todoWidget_jumpToToday">الانتقال إلى اليوم</string>
+    <string name="widgetSettings_widgetsColor">اللون الرئيسي للوحة المعلومات</string>
+    <string name="dashboard_globalAnnouncement">الإعلان العام</string>
+    <string name="forecastWidget_currentWeek">الأسبوع الحالي</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml b/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml
index 5b1f5a1d6a..ce8f831c8e 100644
--- a/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml
+++ b/libs/pandares/src/main/res/values-b+da+DK+instk12/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Aflevering mislykkedes</string>
     <string name="submissionStatusFailedSubtitle">Tryk for at se detaljer</string>
     <string name="submissionAndRubric">Aflevering og vurderingskriterie</string>
+    <string name="submissionAndFeedback">Indsendelse og feedback</string>
     <string name="commentsAndRubric">Kommentarer og vurderingskriterie</string>
     <string name="errorLoadingAssignment">Der opstod et problem med at indlæse denne opgave. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="submitted">Afleveret</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">I dag</string>
+    <string name="tomorrow">I morgen</string>
     <string name="past">Tidligere</string>
     <string name="noDate">Ingen dato</string>
     <string name="future">Fremtid</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Ingen elementer for visning</string>
     <string name="Todo">Opgaveliste</string>
+    <string name="TodoNew">At gøre</string>
     <string name="todoFilter">Filtrer fag</string>
     <string name="filterByEllipsis">Sorter efter &#8230;</string>
     <string name="favoriteCoursesLabel">Favoritfag</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupper</string>
     <string name="groupMembers">Gruppemedlemmer</string>
 
+    <string name="messageGroup">Send besked til gruppe</string>
     <string name="loading">Indlæser&#8230;</string>
     <string name="select_item_to_display">Vælg fra listen</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Opgaveliste</string>
+    <string name="todoWidgetTitleNew">At gøre</string>
     <string name="gradesWidgetTitle">Vurderinger</string>
     <string name="notificationWidgetTitle">Notifikationer</string>
     <string name="todoWidgetTitleLong">Canvas - Opgaveliste</string>
+    <string name="todoWidgetTitleLongNew">Canvas – Opgaveliste</string>
     <string name="gradesWidgetTitleLong">Canvas - Vurderinger</string>
     <string name="gradeWidgetTitleLong">Canvas – Vurdering</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifikationer</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Fag</string>
     <string name="toDoList">Opgaveliste</string>
+    <string name="toDoListNew">Opgaveliste</string>
+
     <string name="notifications">Notifikationer</string>
     <string name="pushNotifications">Push notifikationer</string>
     <string name="pushNotificationsError">Push-meddelelser er ikke blevet registreret for denne enhed.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Åbn SpeedGrader</string>
 
-    <string name="search_todo">at gøre at gøre at gøre at gøre liste</string>
     <string name="search_course">fag fag klasse klasser</string>
     <string name="search_grades">vurdering vurderinger</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Sidens titel skal indstilles.</string>
     <string name="pageDetails">Sidedetaljer</string>
     <string name="saving">Gemmer</string>
+    <string name="speedGraderSaving">Gemmer</string>
+    <string name="speedGraderSaved">Gemt</string>
+    <string name="speedGraderFailed">Mislykkedes</string>
+    <string name="speedGraderSaveErrorTitle">Ups, noget gik galt</string>
+    <string name="speedGraderSaveErrorMessage">Der opstod en fejl under lagring af vurderingsændringen. Du kan prøve igen nu eller senere.</string>
+    <string name="speedGraderSaveErrorContentDescription">Vurderingen kunne ikke gemmes. Tryk for at få nærmere oplysninger.</string>
+
     <string name="confirmDeleteEvent">Er du sikker på, du vil slette denne begivenhed?</string>
     <string name="conferencesNotSupported">Konferencer understøttes endnu ikke på mobil.</string>
     <string name="filePreviewContentDescription">Forhåndsvisning af fil-billede</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Optagelser</string>
     <string name="conferenceInProgress">Konference i gang</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferencer (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Konference i gang</string>
+    <string name="conferencesWidgetDismissed">Konferencen afvist</string>
     <string name="a11y_criterion_content_description">Kriteriebedømmelse %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">yderligere oplysninger</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s element på opgavelisten</item>
         <item quantity="other">%s elementer på opgavelisten</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s element på opgavelisten</item>
+        <item quantity="other">%s elementer på opgavelisten</item>
+    </plurals>
     <string name="noAnnotationSelected">Der er ikke valgt nogen anmærkning</string>
     <string name="emailNotifications">E-mail-meddelelser</string>
     <string name="emailNotificationsImmediately">Straks</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Ingen begivenheder i dag!</string>
     <string name="calendarNoEventsDescription">Det er en alle tiders dag til at tage den med ro og slappe af.</string>
     <string name="userCalendarToDo">Opgaveliste</string>
+    <string name="userCalendarToDoNew">At gøre</string>
     <string name="courseToDo">%s Opgaveliste</string>
+    <string name="courseToDoNew">%s opgaveliste</string>
     <string name="calendarEventExcused">Undskyldt</string>
     <string name="calendarEventMissing">Mangler</string>
     <string name="calendarEventGraded">Bedømt</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Begivenhed %s blev oprettet.</string>
     <string name="a11y_eventUpdatedAnnouncement">Begivenhed %s blev opdateret.</string>
     <string name="a11y_toDoCreatedAnnouncement">Opgaveliste %s blev oprettet.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Element på opgaveliste %s blev oprettet.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Opgaveliste %s blev opdateret.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Opgaveliste %s blev opdateret.</string>
     <string name="todoScreenTitle">Opgaveliste</string>
+    <string name="todoScreenTitleNew">At gøre</string>
     <string name="todoDateLabel">Dato</string>
     <string name="todoDescriptionLabel">Beskrivelse</string>
     <string name="todoDeleteConfirmationTitle">Slet opgave?</string>
+    <string name="todoDeleteConfirmationTitleNew">Slet opgave?</string>
     <string name="todoDeleteConfirmationText">Du sletter din opgave permanent.</string>
+    <string name="todoDeleteConfirmationTextNew">Dette vil slette dit element på opgavelisten permanent.</string>
     <string name="todoDeleteErrorMessage">Der opstod en fejl under sletning af denne opgaveliste. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="todoDeleteErrorMessageNew">Der opstod en fejl under sletning af dette element på opgavelisten. Tjek din forbindelse, og prøv igen.</string>
     <string name="createTodoScreenTitle">Nyt på opgavelisten</string>
+    <string name="createTodoScreenTitleNew">Ny opgave</string>
     <string name="editTodoScreenTitle">Rediger opgavelisten</string>
+    <string name="editTodoScreenTitleNew">Rediger opgave</string>
     <string name="createToDoTitleHint">Tilføj titel</string>
     <string name="createToDoDateLabel">Dato</string>
     <string name="createToDoTimeLabel">Tidspunkt</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Nærmere oplysninger</string>
     <string name="todoSaveErrorMessage">Der opstod en fejl ved lagring af denne opgaveliste. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="todoSaveErrorMessageNew">Der opstod en fejl under lagring af dette element på opgavelisten. Tjek din forbindelse, og prøv igen.</string>
     <string name="selectCalendarScreenTitle">Vælg kalender</string>
     <string name="errorContentRetryButton">Prøv igen</string>
     <string name="eventLocationLabel">Placering</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Nærmere oplysninger</string>
     <string name="errorLoadingEvent">Der opstod et problem under indlæsning af denne begivenhed. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="errorLoadingTodo">Der opstod et problem med at indlæse denne opgave. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="errorLoadingTodoNew">Der opstod en fejl under indlæsning af dette element på opgavelisten. Tjek din forbindelse, og prøv igen.</string>
     <string name="eventDeleteConfirmationTitle">Slet begivenhed?</string>
     <string name="eventDeleteConfirmationText">Dette sletter din begivenhed permanent.</string>
     <string name="eventDeleteErrorMessage">Der opstod en fejl under sletning af denne begivenhed. Kontrollér forbindelsen, og prøv igen.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Alle begivenheder</string>
     <string name="eventDeleteScopeFollowing">Denne og alle efterfølgende begivenheder</string>
     <string name="calendarAddToDo">Tilføj til opgaveliste</string>
+    <string name="calendarAddToDoNew">Tilføj opgave</string>
     <string name="calendarAddEvent">Tilføj begivenhed</string>
     <string name="createEventScreenTitle">Ny begivenhed</string>
     <string name="editEventScreenTitle">Rediger begivenhed</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Lad os få dig logget ind!</string>
     <string name="widgetToDoNotLoggedInSubtitle">For at se din opgaveliste skal du logge ind på din konto i appen. Det tager kun et øjeblik!</string>
     <string name="a11y_widgetToDoOpenToDoList">Åbn skærmen med opgavelisten</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Åbn skærmen med opgavelisten</string>
     <string name="a11y_widgetToDoCreateNewToDo">Opret ny opgave</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Opret nyt element på opgavelisten</string>
     <string name="widgetGradesErrorSubtitle">Vi har problemer med at vise dine vurderinger lige nu. Prøv igen om lidt, eller brug appen.</string>
     <string name="widgetGradesNotLoggedInSubtitle">For at se dine vurderinger skal du logge ind på din konto i appen. Det tager kun et øjeblik!</string>
     <string name="widgetSingleGradeErrorSubtitle">Vi har problemer med at vise dine vurderinger lige nu.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Lad os vælge et fag</string>
     <string name="widgetGradesErrorLoadingCourses">Der opstod en fejl under indlæsning af fag.</string>
     <string name="settingsSwitchExperience">Skift til Canvas Career</string>
+    <string name="forecastWidgetTitle">Ugentlig oversigt</string>
+    <string name="forecastWidgetWeekPeriod">Uge %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Mangler</string>
+    <string name="forecastWidgetDue">Forfalder</string>
+    <string name="forecastWidgetRecentGrades">Nye vurderinger</string>
+    <string name="forecastWidgetGradeWeight">%d%% af den endelige vurdering</string>
+    <string name="forecastWidgetErrorMessage">Vi har problemer med at indlæse dine opgaver. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="forecastWidgetEmptyMissing">Ingen manglende opgaver. Du har set det hele!</string>
+    <string name="forecastWidgetEmptyDue">Ingen opgaver skal afleveres i denne uge</string>
+    <string name="forecastWidgetEmptyRecentGrades">Ingen nye vurderinger i denne uge.</string>
+    <string name="a11y_contentDescription_previousWeek">Forrige uge</string>
+    <string name="a11y_contentDescription_nextWeek">Næste uge</string>
+
     <string name="speedGraderGradeTabTitle">Vurdering og vurderingskriterie</string>
     <string name="speedGraderDetailsTabTitle">Nærmere oplysninger</string>
     <string name="a11y_contentDescription_expandPanel">Udvid panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Der opstod en fejl under indlæsning af dine elementer på opgavelisten. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="errorUpdatingToDo">Der opstod en fejl under indlæsning af dit element på opgavelisten. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="noToDosForNow">Ingen elementer på opgavelisten indtil videre!</string>
+    <string name="noToDosForNowNew">Ingen elementer på opgavelisten for nu!</string>
     <string name="noToDosForNowSubtext">Det ser ud til at være et godt tidspunkt til at hvile sig og slappe af.</string>
     <string name="todoSwipeDone">Udført</string>
     <string name="todoSwipeUndo">Fortryd</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Præferencer for opgavelister</string>
+    <string name="todoFilterPreferencesNew">Præferencer for opgaveliste</string>
     <string name="todoFilterVisibleItems">Synlige elementer</string>
     <string name="todoFilterShowPersonalToDos">Vis personlig opgaveliste</string>
+    <string name="todoFilterShowPersonalToDosNew">Vis personlig opgaveliste</string>
     <string name="todoFilterShowCalendarEvents">Vis kalenderbegivenheder</string>
     <string name="todoFilterShowCompleted">Vis afsluttet</string>
     <string name="todoFilterFavoriteCoursesOnly">Kun favoritfag</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Afvis invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Er du sikker på, at du vil afvise invitationen til %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">I gang</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Godmorgen %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hej %s</string>
 
+    <string name="courses_and_groups">Fag og grupper</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Tilpas oversigt</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Skift oversigtens layout</string>
     <string name="changing_dashboard_layout_message">For at skifte oversigtens layout skal du genstarte applikationen.</string>
     <string name="restart_now">Genstart nu</string>
+    <string name="turn_on_new_dashboard">Aktiver den nye oversigt til</string>
     <string name="switched_back">Skiftede tilbage?</string>
     <string name="switched_back_message">Tak, fordi du prøvede den nye oversigt! Kan du fortælle os, hvorfor du skiftede tilbage?</string>
+    <string name="survey_option_hard_to_find">Svært at finde ting</string>
+    <string name="survey_option_prefer_old_layout">Foretrækker det gamle layout</string>
+    <string name="survey_option_something_broken">Noget fungerede ikke rigtigt</string>
     <string name="what_could_we_improve">Hvad kunne vi forbedre?</string>
+    <string name="what_do_you_think_of_new_dashboard">Hvad synes du om den nye oversigt?</string>
+    <string name="let_us_know">Fortæl os det!</string>
+    <string name="no_app_to_handle_link">Ingen app tilgængelig til at åbne dette link</string>
     <string name="skip">Spring over</string>
     <string name="widget_setting_show_greeting">Vis hilsen</string>
     <string name="background_color">Baggrundsfarve</string>
+    <string name="widget_setting_show_grades">Fagets vurderinger</string>
+    <string name="widget_setting_show_color_overlay">Farveoverlejring for faget</string>
     <string name="offline_content_available">Offlineindhold tilgængeligt</string>
     <string name="a11y_contentDescription_moreOptions">Flere indstillinger:</string>
     <string name="customizeCourse">Tilpas fag</string>
     <string name="favoriteCoursesAndGroups">Favoritfag og -grupper</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Eksterne værktøjer er ikke tilgængelige offline.</string>
+    <string name="widget_weekly_summary">Ugentlig oversigt</string>
+
+    <string name="dashboardCourseNickname">Alias</string>
+    <string name="dashboardCourseNicknameHint">Skriv fagets navn her</string>
+    <string name="dashboardCourseColor">Fagets farve</string>
+    <string name="widget_toDo">Daglig opgaveliste</string>
+    <string name="dailyToDoWidgetTitle">Daglig opgaveliste</string>
+    <string name="todoWidget_showCompleted">Vis afsluttet</string>
+    <string name="todoWidget_emptyTitle">Du er færdig for nu!</string>
+    <string name="todoWidget_emptyMessage">Det ser ud til, at du har fri denne dag.\nVil du tilføje noget til opgavelisten?</string>
+    <string name="todoWidget_addTodo">Tilføj opgave</string>
+    <string name="todoWidget_errorTitle">Ups, noget gik galt</string>
+    <string name="todoWidget_errorMessage">Vi kunne ikke indlæse din opgaveliste.\nPrøv igen, eller kom tilbage senere.</string>
+    <string name="todoWidget_refresh">Opdater</string>
+    <string name="todoWidget_today">I dag</string>
+    <string name="a11y_todoWidget_jumpToToday">Spring til i dag</string>
+    <string name="widgetSettings_widgetsColor">Oversigtens hovedfarve</string>
+    <string name="dashboard_globalAnnouncement">Generel besked</string>
+    <string name="forecastWidget_currentWeek">Aktuel uge</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml b/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml
index 590a7f1e2b..3b8a38c2ba 100644
--- a/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml
+++ b/libs/pandares/src/main/res/values-b+en+AU+unimelb/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Submission Failed</string>
     <string name="submissionStatusFailedSubtitle">Tap to view details</string>
     <string name="submissionAndRubric">Submission &amp; Rubric</string>
+    <string name="submissionAndFeedback">Submission &amp; Feedback</string>
     <string name="commentsAndRubric">Comments &amp; Rubric</string>
     <string name="errorLoadingAssignment">There was a problem loading this assignment. Please check your connection and try again.</string>
     <string name="submitted">Submitted</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Today</string>
+    <string name="tomorrow">Tomorrow</string>
     <string name="past">Past</string>
     <string name="noDate">No Date</string>
     <string name="future">Future</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">No items to display</string>
     <string name="Todo">To Do</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Subjects</string>
     <string name="filterByEllipsis">Filter by&#8230;</string>
     <string name="favoriteCoursesLabel">Favourite Subjects</string>
@@ -474,6 +477,7 @@
     <string name="groups">Groups</string>
     <string name="groupMembers">Group Members</string>
 
+    <string name="messageGroup">Message group</string>
     <string name="loading">Loading&#8230;</string>
     <string name="select_item_to_display">Select from the list</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To Do</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Grades</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas - To Do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Grades</string>
     <string name="gradeWidgetTitleLong">Canvas - Grade</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Subjects</string>
     <string name="toDoList">To Do List</string>
+    <string name="toDoListNew">To-do List</string>
+
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Push Notifications</string>
     <string name="pushNotificationsError">Push Notifications have not been registered for this device.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Open Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">subject subjects class classes</string>
     <string name="search_grades">grade grades</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Page title must be set.</string>
     <string name="pageDetails">Page Details</string>
     <string name="saving">Saving</string>
+    <string name="speedGraderSaving">Saving</string>
+    <string name="speedGraderSaved">Saved</string>
+    <string name="speedGraderFailed">Failed</string>
+    <string name="speedGraderSaveErrorTitle">Oops something went wrong</string>
+    <string name="speedGraderSaveErrorMessage">There was an error while saving your grade modification. You can retry, or try again later.</string>
+    <string name="speedGraderSaveErrorContentDescription">Grade save failed. Tap for details.</string>
+
     <string name="confirmDeleteEvent">Are you sure you wish to delete this event?</string>
     <string name="conferencesNotSupported">Conferences are not yet supported on mobile.</string>
     <string name="filePreviewContentDescription">File preview image</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Recordings</string>
     <string name="conferenceInProgress">Conference in progress</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Exam Support chats (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Exam Support chat in progress</string>
+    <string name="conferencesWidgetDismissed">Exam Support chat dismissed</string>
     <string name="a11y_criterion_content_description">Criterion rating %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">more information</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s to do item</item>
         <item quantity="other">%s to do items</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s to-do item</item>
+        <item quantity="other">%s to-do items</item>
+    </plurals>
     <string name="noAnnotationSelected">No annotation selected</string>
     <string name="emailNotifications">Email Notifications</string>
     <string name="emailNotificationsImmediately">Immediately</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">No Events Today!</string>
     <string name="calendarNoEventsDescription">It looks like a great day to rest, relax, and recharge.</string>
     <string name="userCalendarToDo">To Do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">%s To Do</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Excused</string>
     <string name="calendarEventMissing">Missing</string>
     <string name="calendarEventGraded">Graded</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Event %s successfully created.</string>
     <string name="a11y_eventUpdatedAnnouncement">Event %s successfully updated.</string>
     <string name="a11y_toDoCreatedAnnouncement">To do %s successfully created.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-do %s successfully created.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To do %s successfully updated.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-do %s successfully updated.</string>
     <string name="todoScreenTitle">To Do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Delete To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Delete To-do?</string>
     <string name="todoDeleteConfirmationText">This will permanently delete your To Do item.</string>
+    <string name="todoDeleteConfirmationTextNew">This will permanently delete your To-do item.</string>
     <string name="todoDeleteErrorMessage">There was an error deleting this To Do. Please check your connection and try again.</string>
+    <string name="todoDeleteErrorMessageNew">There was an error deleting this To-do. Please check your connection and try again.</string>
     <string name="createTodoScreenTitle">New To Do</string>
+    <string name="createTodoScreenTitleNew">New To-do</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Add title</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Time</string>
     <string name="createToDoCalendarLabel">Calendar</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">There was an error saving this To Do. Please check your connection and try again.</string>
+    <string name="todoSaveErrorMessageNew">There was an error saving this To-do. Please check your connection and try again.</string>
     <string name="selectCalendarScreenTitle">Select Calendar</string>
     <string name="errorContentRetryButton">Retry</string>
     <string name="eventLocationLabel">Location</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">There was a problem loading this event. Please check your connection and try again.</string>
     <string name="errorLoadingTodo">There was a problem loading this to-do. Please check your connection and try again.</string>
+    <string name="errorLoadingTodoNew">There was a problem loading this To-do. Please check your connection and try again.</string>
     <string name="eventDeleteConfirmationTitle">Delete Event?</string>
     <string name="eventDeleteConfirmationText">This will permanently delete your event.</string>
     <string name="eventDeleteErrorMessage">There was an error deleting this event. Please check your connection and try again.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">All events</string>
     <string name="eventDeleteScopeFollowing">This and all following events</string>
     <string name="calendarAddToDo">Add To Do</string>
+    <string name="calendarAddToDoNew">Add To-do</string>
     <string name="calendarAddEvent">Add Event</string>
     <string name="createEventScreenTitle">New Event</string>
     <string name="editEventScreenTitle">Edit Event</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Let\'s Get You Logged In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">To see your to-dos, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open To Do list screen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Open To-do list screen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Create new To Do</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Create new To-do</string>
     <string name="widgetGradesErrorSubtitle">We\'re having trouble showing your grades right now. Please try again in a bit or head to the app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">To see your grades, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="widgetSingleGradeErrorSubtitle">We\'re having trouble showing your grades right now.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Let’s choose a subject</string>
     <string name="widgetGradesErrorLoadingCourses">An error occurred while loading subjects.</string>
     <string name="settingsSwitchExperience">Switch to Canvas Career</string>
+    <string name="forecastWidgetTitle">Weekly Summary</string>
+    <string name="forecastWidgetWeekPeriod">Week %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Missing</string>
+    <string name="forecastWidgetDue">Due</string>
+    <string name="forecastWidgetRecentGrades">New Grades</string>
+    <string name="forecastWidgetGradeWeight">%d%% of final grade</string>
+    <string name="forecastWidgetErrorMessage">We\'re having trouble loading your assignments. Please check your connection and try again.</string>
+    <string name="forecastWidgetEmptyMissing">No missing assignments. You\'re all caught up!</string>
+    <string name="forecastWidgetEmptyDue">No assignments due this week.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No new grades in this week.</string>
+    <string name="a11y_contentDescription_previousWeek">Previous week</string>
+    <string name="a11y_contentDescription_nextWeek">Next week</string>
+
     <string name="speedGraderGradeTabTitle">Grade &amp; Rubric</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Expand panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">There was an error loading your to-do items. Please check your connection and try again.</string>
     <string name="errorUpdatingToDo">There was an error updating the to-do item. Please check your connection and try again.</string>
     <string name="noToDosForNow">No To Dos for now!</string>
+    <string name="noToDosForNowNew">No To-dos for now!</string>
     <string name="noToDosForNowSubtext">It looks like a great time to rest, relax, and recharge.</string>
     <string name="todoSwipeDone">Done</string>
     <string name="todoSwipeUndo">Undo</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">To Do list Preferences</string>
+    <string name="todoFilterPreferencesNew">To-do list Preferences</string>
     <string name="todoFilterVisibleItems">Visible Items</string>
     <string name="todoFilterShowPersonalToDos">Show Personal To Dos</string>
+    <string name="todoFilterShowPersonalToDosNew">Show Personal To-dos</string>
     <string name="todoFilterShowCalendarEvents">Show Calendar Events</string>
     <string name="todoFilterShowCompleted">Show Completed</string>
     <string name="todoFilterFavoriteCoursesOnly">Favourite Subjects Only</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Decline Invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Are you sure you want to decline the invitation to %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progress</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Good morning, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hello, %s</string>
 
+    <string name="courses_and_groups">Subjects &amp; Groups</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Customise Dashboard</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Changing dashboard layout</string>
     <string name="changing_dashboard_layout_message">To change the dashboard layout restart the application</string>
     <string name="restart_now">Restart now</string>
+    <string name="turn_on_new_dashboard">Turn on the new dashboard</string>
     <string name="switched_back">Switched back?</string>
     <string name="switched_back_message">Thanks for trying the new dashboard! Could you tell us why you switched back?</string>
+    <string name="survey_option_hard_to_find">Hard to find things</string>
+    <string name="survey_option_prefer_old_layout">Prefer the old layout</string>
+    <string name="survey_option_something_broken">Something didn\'t work right</string>
     <string name="what_could_we_improve">What could we improve?</string>
+    <string name="what_do_you_think_of_new_dashboard">What do you think of the new dashboard?</string>
+    <string name="let_us_know">Let us know!</string>
+    <string name="no_app_to_handle_link">No app available to open this link</string>
     <string name="skip">Skip</string>
     <string name="widget_setting_show_greeting">Show greeting</string>
     <string name="background_color">Background colour</string>
+    <string name="widget_setting_show_grades">Subject Grades</string>
+    <string name="widget_setting_show_color_overlay">Subject Colour Overlay</string>
     <string name="offline_content_available">Offline content available</string>
     <string name="a11y_contentDescription_moreOptions">More options</string>
     <string name="customizeCourse">Customise Subject</string>
     <string name="favoriteCoursesAndGroups">Favourite Subjects and Groups</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">External Tools are not available offline.</string>
+    <string name="widget_weekly_summary">Weekly Summary</string>
+
+    <string name="dashboardCourseNickname">Nickname</string>
+    <string name="dashboardCourseNicknameHint">Write subject nickname here</string>
+    <string name="dashboardCourseColor">Subject Colour</string>
+    <string name="widget_toDo">Daily To-do</string>
+    <string name="dailyToDoWidgetTitle">Daily To-do</string>
+    <string name="todoWidget_showCompleted">Show Completed</string>
+    <string name="todoWidget_emptyTitle">You\'re all done for now!</string>
+    <string name="todoWidget_emptyMessage">Looks like you\'re free for this day.\nDo you want to add some To-dos?</string>
+    <string name="todoWidget_addTodo">Add To-do</string>
+    <string name="todoWidget_errorTitle">Oops, Something went wrong</string>
+    <string name="todoWidget_errorMessage">We weren\'t able to load your To-dos.\nTry again, or come back later.</string>
+    <string name="todoWidget_refresh">Refresh</string>
+    <string name="todoWidget_today">Today</string>
+    <string name="a11y_todoWidget_jumpToToday">Jump to today</string>
+    <string name="widgetSettings_widgetsColor">Dashboard Main Color</string>
+    <string name="dashboard_globalAnnouncement">Global Announcement</string>
+    <string name="forecastWidget_currentWeek">Current week</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml b/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml
index d93c5a4552..2c2f706310 100644
--- a/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml
+++ b/libs/pandares/src/main/res/values-b+en+GB+instukhe/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Submission failed</string>
     <string name="submissionStatusFailedSubtitle">Tap to view details</string>
     <string name="submissionAndRubric">Submission &amp; Rubric</string>
+    <string name="submissionAndFeedback">Submission &amp; Feedback</string>
     <string name="commentsAndRubric">Comments &amp; Rubric</string>
     <string name="errorLoadingAssignment">There was a problem loading this assignment. Please check your connection and try again.</string>
     <string name="submitted">Submitted</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Today</string>
+    <string name="tomorrow">Tomorrow</string>
     <string name="past">Past</string>
     <string name="noDate">No date</string>
     <string name="future">Future</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">No items to display</string>
     <string name="Todo">To-do</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Modules</string>
     <string name="filterByEllipsis">Filter by&#8230;</string>
     <string name="favoriteCoursesLabel">Favourite modules</string>
@@ -474,6 +477,7 @@
     <string name="groups">Groups</string>
     <string name="groupMembers">Group members</string>
 
+    <string name="messageGroup">Message group</string>
     <string name="loading">Loading&#8230;</string>
     <string name="select_item_to_display">Select from the list</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To-do</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Grades</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas - to do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Marks</string>
     <string name="gradeWidgetTitleLong">Canvas - Grade</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Modules</string>
     <string name="toDoList">To do list</string>
+    <string name="toDoListNew">To-do List</string>
+
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Push notifications</string>
     <string name="pushNotificationsError">Push notifications have not been registered for this device.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Open Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">module modules class classes</string>
     <string name="search_grades">mark marks</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Page title must be set.</string>
     <string name="pageDetails">Page details</string>
     <string name="saving">Saving</string>
+    <string name="speedGraderSaving">Saving</string>
+    <string name="speedGraderSaved">Saved</string>
+    <string name="speedGraderFailed">Failed</string>
+    <string name="speedGraderSaveErrorTitle">Oops something went wrong</string>
+    <string name="speedGraderSaveErrorMessage">There was an error while saving your grade modification. You can retry or try again later.</string>
+    <string name="speedGraderSaveErrorContentDescription">Grade save failed. Tap for details.</string>
+
     <string name="confirmDeleteEvent">Are you sure you wish to delete this event?</string>
     <string name="conferencesNotSupported">Conferences are not yet supported on mobile.</string>
     <string name="filePreviewContentDescription">File preview image</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Recordings</string>
     <string name="conferenceInProgress">Conference in progress</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferences (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conference in progress</string>
+    <string name="conferencesWidgetDismissed">Conference dismissed</string>
     <string name="a11y_criterion_content_description">Criterion rating %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">more information</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s to do item</item>
         <item quantity="other">%s to do items</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s to-do item</item>
+        <item quantity="other">%s to-do items</item>
+    </plurals>
     <string name="noAnnotationSelected">No annotation selected</string>
     <string name="emailNotifications">Email Notifications</string>
     <string name="emailNotificationsImmediately">Immediately</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">No Events Today!</string>
     <string name="calendarNoEventsDescription">It looks like a great day to rest, relax, and recharge.</string>
     <string name="userCalendarToDo">To-do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">%s To Do</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Excused</string>
     <string name="calendarEventMissing">Missing</string>
     <string name="calendarEventGraded">Graded</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Event %s successfully created.</string>
     <string name="a11y_eventUpdatedAnnouncement">Event %s successfully updated.</string>
     <string name="a11y_toDoCreatedAnnouncement">To do %s successfully created.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-do %s successfully created.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To do %s successfully updated.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-do %s successfully updated.</string>
     <string name="todoScreenTitle">To-do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Delete To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Delete To-do?</string>
     <string name="todoDeleteConfirmationText">This will permanently delete your To Do item.</string>
+    <string name="todoDeleteConfirmationTextNew">This will permanently delete your To-do item.</string>
     <string name="todoDeleteErrorMessage">There was an error deleting this To Do. Please check your connection and try again.</string>
+    <string name="todoDeleteErrorMessageNew">There was an error deleting this To-do. Please check your connection and try again.</string>
     <string name="createTodoScreenTitle">New To Do</string>
+    <string name="createTodoScreenTitleNew">New To-do</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Add title</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Time</string>
     <string name="createToDoCalendarLabel">Calendar</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">There was an error saving this To Do. Please check your connection and try again.</string>
+    <string name="todoSaveErrorMessageNew">There was an error saving this To-do. Please check your connection and try again.</string>
     <string name="selectCalendarScreenTitle">Select Calendar</string>
     <string name="errorContentRetryButton">Retry</string>
     <string name="eventLocationLabel">Location</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">There was a problem loading this event. Please check your connection and try again.</string>
     <string name="errorLoadingTodo">There was a problem loading this to-do. Please check your connection and try again.</string>
+    <string name="errorLoadingTodoNew">There was a problem loading this to-do. Please check your connection and try again.</string>
     <string name="eventDeleteConfirmationTitle">Delete Event?</string>
     <string name="eventDeleteConfirmationText">This will permanently delete your event.</string>
     <string name="eventDeleteErrorMessage">There was an error deleting this event. Please check your connection and try again.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">All events</string>
     <string name="eventDeleteScopeFollowing">This and all following events</string>
     <string name="calendarAddToDo">Add ‘to-do’</string>
+    <string name="calendarAddToDoNew">Add To-do</string>
     <string name="calendarAddEvent">Add Event</string>
     <string name="createEventScreenTitle">New Event</string>
     <string name="editEventScreenTitle">Edit event</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Let\'s Get You Logged In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">To see your to-dos, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open To Do list screen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Open To-do list screen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Create new To Do</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Create new To-do</string>
     <string name="widgetGradesErrorSubtitle">We\'re having trouble showing your grades right now. Please try again in a bit or head to the app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">To see your grades, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="widgetSingleGradeErrorSubtitle">We\'re having trouble showing your grades right now.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Let’s choose a module</string>
     <string name="widgetGradesErrorLoadingCourses">An error occurred while loading modules.</string>
     <string name="settingsSwitchExperience">Switch to Canvas Career</string>
+    <string name="forecastWidgetTitle">Weekly Summary</string>
+    <string name="forecastWidgetWeekPeriod">Week %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Missing</string>
+    <string name="forecastWidgetDue">Due</string>
+    <string name="forecastWidgetRecentGrades">New Grades</string>
+    <string name="forecastWidgetGradeWeight">%d%% of final grade</string>
+    <string name="forecastWidgetErrorMessage">We\'re having trouble loading your assignments. Please check your connection and try again.</string>
+    <string name="forecastWidgetEmptyMissing">No missing assignments. You\'re all caught up!</string>
+    <string name="forecastWidgetEmptyDue">No assignments due this week.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No new grades in this week.</string>
+    <string name="a11y_contentDescription_previousWeek">Previous week</string>
+    <string name="a11y_contentDescription_nextWeek">Next week</string>
+
     <string name="speedGraderGradeTabTitle">Grade &amp; Rubric</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Expand panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">There was an error loading your to-do items. Please check your connection and try again.</string>
     <string name="errorUpdatingToDo">There was an error updating the to-do item. Please check your connection and try again.</string>
     <string name="noToDosForNow">No To Dos for now!</string>
+    <string name="noToDosForNowNew">No To-dos for now!</string>
     <string name="noToDosForNowSubtext">It looks like a great time to rest, relax, and recharge.</string>
     <string name="todoSwipeDone">Done</string>
     <string name="todoSwipeUndo">Undo</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">To Do list Preferences</string>
+    <string name="todoFilterPreferencesNew">To-do list Preferences</string>
     <string name="todoFilterVisibleItems">Visible Items</string>
     <string name="todoFilterShowPersonalToDos">Show Personal To Dos</string>
+    <string name="todoFilterShowPersonalToDosNew">Show Personal To-dos</string>
     <string name="todoFilterShowCalendarEvents">Show Calendar Events</string>
     <string name="todoFilterShowCompleted">Show Completed</string>
     <string name="todoFilterFavoriteCoursesOnly">Favourite Modules Only</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Decline Invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Are you sure you want to decline the invitation to %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progress</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Good morning, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hello, %s</string>
 
+    <string name="courses_and_groups">Modules &amp; Groups</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Customise Dashboard</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Changing dashboard layout</string>
     <string name="changing_dashboard_layout_message">To change the dashboard layout you have to restart the application</string>
     <string name="restart_now">Restart now</string>
+    <string name="turn_on_new_dashboard">Turn on the new dashboard</string>
     <string name="switched_back">Switched back?</string>
     <string name="switched_back_message">Thanks for trying the new dashboard! Could you tell us why you switched back?</string>
+    <string name="survey_option_hard_to_find">Hard to find things</string>
+    <string name="survey_option_prefer_old_layout">Prefer the old layout</string>
+    <string name="survey_option_something_broken">Something didn\'t work right</string>
     <string name="what_could_we_improve">What could we improve?</string>
+    <string name="what_do_you_think_of_new_dashboard">What do you think of the new dashboard?</string>
+    <string name="let_us_know">Let us know!</string>
+    <string name="no_app_to_handle_link">No app available to open this link</string>
     <string name="skip">Skip</string>
     <string name="widget_setting_show_greeting">Show greeting</string>
     <string name="background_color">Background colour</string>
+    <string name="widget_setting_show_grades">Module grades</string>
+    <string name="widget_setting_show_color_overlay">Module Colour Overlay</string>
     <string name="offline_content_available">Offline content available</string>
     <string name="a11y_contentDescription_moreOptions">More options</string>
     <string name="customizeCourse">Customise module</string>
     <string name="favoriteCoursesAndGroups">Favourite Modules and Groups</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">External Tools are not available offline.</string>
+    <string name="widget_weekly_summary">Weekly Summary</string>
+
+    <string name="dashboardCourseNickname">Nickname</string>
+    <string name="dashboardCourseNicknameHint">Write module nickname here</string>
+    <string name="dashboardCourseColor">Module Colour</string>
+    <string name="widget_toDo">Daily To-do</string>
+    <string name="dailyToDoWidgetTitle">Daily To-do</string>
+    <string name="todoWidget_showCompleted">Show Completed</string>
+    <string name="todoWidget_emptyTitle">You\'re all done for now!</string>
+    <string name="todoWidget_emptyMessage">Looks like you\'re free for this day.\nDo you want to add some To-dos?</string>
+    <string name="todoWidget_addTodo">Add To-do</string>
+    <string name="todoWidget_errorTitle">Oops, something went wrong</string>
+    <string name="todoWidget_errorMessage">We weren\'t able to load your To-dos.\nTry again or come back later.</string>
+    <string name="todoWidget_refresh">Refresh</string>
+    <string name="todoWidget_today">Today</string>
+    <string name="a11y_todoWidget_jumpToToday">Jump to today</string>
+    <string name="widgetSettings_widgetsColor">Dashboard Main Colour</string>
+    <string name="dashboard_globalAnnouncement">Global Announcement</string>
+    <string name="forecastWidget_currentWeek">Current week</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml b/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml
index 15994260a4..792058151b 100644
--- a/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml
+++ b/libs/pandares/src/main/res/values-b+nb+NO+instk12/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Innlevering feilet</string>
     <string name="submissionStatusFailedSubtitle">Trykk for å vise detaljer</string>
     <string name="submissionAndRubric">Innlevering &amp; Vurderingskriterier</string>
+    <string name="submissionAndFeedback">Innlevering og tilbakemelding</string>
     <string name="commentsAndRubric">Kommentarer &amp; vurderingskriterier</string>
     <string name="errorLoadingAssignment">Det var et problem med lasting av denne oppgaven. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="submitted">Innlevert</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">I dag</string>
+    <string name="tomorrow">I morgen</string>
     <string name="past">Tidligere</string>
     <string name="noDate">Ingen dato</string>
     <string name="future">Fremtidige</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Ingenting å vise</string>
     <string name="Todo">Å gjøre</string>
+    <string name="TodoNew">Gjøremål</string>
     <string name="todoFilter">Filtrer fag</string>
     <string name="filterByEllipsis">Filtrer etter &#8230;</string>
     <string name="favoriteCoursesLabel">Favorittfag</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupper</string>
     <string name="groupMembers">Gruppemedlemmer</string>
 
+    <string name="messageGroup">Send melding til gruppe</string>
     <string name="loading">Laster inn&#8230;</string>
     <string name="select_item_to_display">Velg fra listen</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Å gjøre</string>
+    <string name="todoWidgetTitleNew">Gjøremål</string>
     <string name="gradesWidgetTitle">Vurderinger</string>
     <string name="notificationWidgetTitle">Varslinger</string>
     <string name="todoWidgetTitleLong">Canvas - Gjøremål</string>
+    <string name="todoWidgetTitleLongNew">Canvas – Gjøremål</string>
     <string name="gradesWidgetTitleLong">Canvas - klasser</string>
     <string name="gradeWidgetTitleLong">Canvas – vurdering</string>
     <string name="notificationWidgetTitleLong">Canvas - varsler</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Fag</string>
     <string name="toDoList">Gjøremålsliste</string>
+    <string name="toDoListNew">Gjøremålsliste</string>
+
     <string name="notifications">Varslinger</string>
     <string name="pushNotifications">Push-varslinger</string>
     <string name="pushNotificationsError">Push-varslinger har ikke blitt registrert for denne enheten.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Åpne Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">fag fag klasse klasser</string>
     <string name="search_grades">Vurder vurderinger</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Sidetittel må være satt.</string>
     <string name="pageDetails">Sidedetaljer</string>
     <string name="saving">Lagrer</string>
+    <string name="speedGraderSaving">Lagrer</string>
+    <string name="speedGraderSaved">Lagret</string>
+    <string name="speedGraderFailed">Ikke bestått</string>
+    <string name="speedGraderSaveErrorTitle">Obs, noe gikk galt</string>
+    <string name="speedGraderSaveErrorMessage">Det oppsto en feil ved lagring av vurderingsendringen din Du kan prøve igjen, eller prøve senere.</string>
+    <string name="speedGraderSaveErrorContentDescription">Lagring av vurderingen mislyktes. Trykk for detaljer.</string>
+
     <string name="confirmDeleteEvent">Er du sikker du ønsker å slette denne hendelsen?</string>
     <string name="conferencesNotSupported">Videomøter støttes ikke på mobil.</string>
     <string name="filePreviewContentDescription">Forhåndsvisning av filen</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Opptak</string>
     <string name="conferenceInProgress">Videomøte pågår</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferanser (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Videomøte pågår</string>
+    <string name="conferencesWidgetDismissed">Konferanse avvist</string>
     <string name="a11y_criterion_content_description">Kriterievurdering %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">mer informasjon</string>
@@ -1376,6 +1394,10 @@
         <item quantity="one">%s gjøremålselement</item>
         <item quantity="other">%s gjøremålselementer</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s gjøremålselement</item>
+        <item quantity="other">%s gjøremålselementer</item>
+    </plurals>
     <string name="noAnnotationSelected">Ingen merknad valgt</string>
     <string name="emailNotifications">E-post varslinger</string>
     <string name="emailNotificationsImmediately">Umiddelbart</string>
@@ -1662,7 +1684,9 @@
     <string name="calendarNoEvents">Ingen arrangementer i dag!</string>
     <string name="calendarNoEventsDescription">Det ser ut som dette er en flott dag til å slappe av og lade batteriene.</string>
     <string name="userCalendarToDo">Å gjøre</string>
+    <string name="userCalendarToDoNew">Gjøremål</string>
     <string name="courseToDo">%s Gjøremål</string>
+    <string name="courseToDoNew">%s Gjøremål</string>
     <string name="calendarEventExcused">Fritatt</string>
     <string name="calendarEventMissing">Mangler</string>
     <string name="calendarEventGraded">Vurdert</string>
@@ -1687,21 +1711,30 @@
     <string name="a11y_eventCreatedAnnouncement">Hendelsen %s ble opprettet.</string>
     <string name="a11y_eventUpdatedAnnouncement">Hendelsen %s ble oppdatert</string>
     <string name="a11y_toDoCreatedAnnouncement">Gjøremålet %s ble opprettet.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Gjøremålet %s opprettet.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Gjøremålet %s ble oppdatert</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Gjøremålet %s oppdatert</string>
     <string name="todoScreenTitle">Å gjøre</string>
+    <string name="todoScreenTitleNew">Gjøremål</string>
     <string name="todoDateLabel">Dato</string>
     <string name="todoDescriptionLabel">Beskrivelse</string>
     <string name="todoDeleteConfirmationTitle">Slette gjøremål?</string>
+    <string name="todoDeleteConfirmationTitleNew">Slette gjøremål?</string>
     <string name="todoDeleteConfirmationText">Dette vil slette gjøremålselementet ditt permanent.</string>
+    <string name="todoDeleteConfirmationTextNew">Dette vil slette gjøremålet ditt permanent.</string>
     <string name="todoDeleteErrorMessage">Det oppsto en feil ved sletting av dette gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="todoDeleteErrorMessageNew">Det oppsto en feil ved sletting av dette gjøremålet. Sjekk tilkoblingen din og prøv på nytt.</string>
     <string name="createTodoScreenTitle">Ny i gjøremål</string>
+    <string name="createTodoScreenTitleNew">Nye gjøremål</string>
     <string name="editTodoScreenTitle">Rediger gjøremål</string>
+    <string name="editTodoScreenTitleNew">Rediger gjøremål</string>
     <string name="createToDoTitleHint">Legg til tittel</string>
     <string name="createToDoDateLabel">Dato</string>
     <string name="createToDoTimeLabel">Tid</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Detaljer</string>
     <string name="todoSaveErrorMessage">Det oppsto en feil ved lagring av dette gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="todoSaveErrorMessageNew">Det oppsto en feil ved lagring av dette gjøremålet. Sjekk tilkoblingen din og prøv på nytt.</string>
     <string name="selectCalendarScreenTitle">Velg kalender</string>
     <string name="errorContentRetryButton">Forsøk igjen</string>
     <string name="eventLocationLabel">Sted</string>
@@ -1709,6 +1742,7 @@
     <string name="eventDetailsLabel">Detaljer</string>
     <string name="errorLoadingEvent">Det oppsto et problem ved lasting av denne hendelsen. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="errorLoadingTodo">Det oppsto et problem ved lasting av dette gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="errorLoadingTodoNew">Det oppsto en feil ved lasting av dette gjøremålet. Sjekk tilkoblingen din og prøv på nytt.</string>
     <string name="eventDeleteConfirmationTitle">Slette hendelse?</string>
     <string name="eventDeleteConfirmationText">Dette vil slette hendelsen din permanent.</string>
     <string name="eventDeleteErrorMessage">Det oppsto en feil ved sletting av denne hendelsen. Kontroller tilkoblingen og prøv på nytt.</string>
@@ -1725,6 +1759,7 @@
     <string name="eventDeleteScopeAll">Alle hendelser</string>
     <string name="eventDeleteScopeFollowing">Denne og følgende hendelser</string>
     <string name="calendarAddToDo">Legg til gjøremål</string>
+    <string name="calendarAddToDoNew">Legg til gjøremål</string>
     <string name="calendarAddEvent">Legg til arrangement</string>
     <string name="createEventScreenTitle">Ny hendelse</string>
     <string name="editEventScreenTitle">Rediger hendelse</string>
@@ -2103,7 +2138,9 @@
     <string name="widgetNotLoggedInTitle">La oss logge deg inn!</string>
     <string name="widgetToDoNotLoggedInSubtitle">For å se gjøremålene dine, logg inn på kontoen din i appen. Det tar bare et øyeblikk!</string>
     <string name="a11y_widgetToDoOpenToDoList">Åpne gjøremålsliste-skjermen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Åpne gjøremålsliste-skjermen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Opprett nytt gjøremål</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Opprett nytt gjøremål</string>
     <string name="widgetGradesErrorSubtitle">Vi har problemer med å vise vurderingene dine akkurat nå. Prøv igjen om litt eller gå til appen.</string>
     <string name="widgetGradesNotLoggedInSubtitle">For å se vurderinger, logg inn på kontoen din i appen. Det tar bare et øyeblikk!</string>
     <string name="widgetSingleGradeErrorSubtitle">Vi har problemer med å vise vurderingene dine akkurat nå.</string>
@@ -2111,6 +2148,19 @@
     <string name="widgetSingleGradeSelectCourse">La oss velge et fag</string>
     <string name="widgetGradesErrorLoadingCourses">Det oppsto en feil ved lasting av fag.</string>
     <string name="settingsSwitchExperience">Bytt til Canvas Career</string>
+    <string name="forecastWidgetTitle">Ukentlig oppsummering</string>
+    <string name="forecastWidgetWeekPeriod">Uke %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Mangler</string>
+    <string name="forecastWidgetDue">Forfall</string>
+    <string name="forecastWidgetRecentGrades">Nye vurderinger</string>
+    <string name="forecastWidgetGradeWeight">%d%% av sluttvurdering</string>
+    <string name="forecastWidgetErrorMessage">Vi har problemer med å laste inn oppgavene dine. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="forecastWidgetEmptyMissing">Ingen manglende oppgaver. Du er opptatt!</string>
+    <string name="forecastWidgetEmptyDue">Ingen oppgaver forfaller denne uken.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Ingen nye vurderinger denne uken.</string>
+    <string name="a11y_contentDescription_previousWeek">Forrige uke</string>
+    <string name="a11y_contentDescription_nextWeek">Neste uke</string>
+
     <string name="speedGraderGradeTabTitle">Vurdering og vurderingskriterier</string>
     <string name="speedGraderDetailsTabTitle">Detaljer</string>
     <string name="a11y_contentDescription_expandPanel">Vis panel</string>
@@ -2189,6 +2239,7 @@
     <string name="errorLoadingToDos">Det oppsto en feil under lastingen av gjøremålene dine. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="errorUpdatingToDo">Det oppsto en feil ved oppdatering av gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="noToDosForNow">Nye gjøremål for nå!</string>
+    <string name="noToDosForNowNew">Nye gjøremål for nå!</string>
     <string name="noToDosForNowSubtext">Det ser ut som dette er et godt tidspunkt å slappe av, hvile og lade batteriene.</string>
     <string name="todoSwipeDone">Ferdig</string>
     <string name="todoSwipeUndo">Angre</string>
@@ -2199,8 +2250,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Innstillinger for gjøremålsliste</string>
+    <string name="todoFilterPreferencesNew">Innstillinger for gjøremålsliste</string>
     <string name="todoFilterVisibleItems">Synlige elementer</string>
     <string name="todoFilterShowPersonalToDos">Vis personlige gjøremål</string>
+    <string name="todoFilterShowPersonalToDosNew">Vis personlige gjøremål</string>
     <string name="todoFilterShowCalendarEvents">Vis kalenderoppføringer</string>
     <string name="todoFilterShowCompleted">Vis fullført</string>
     <string name="todoFilterFavoriteCoursesOnly">Kun favorittfag</string>
@@ -2227,6 +2280,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Avvis invitasjon</string>
     <string name="courseInvitationDeclineConfirmMessage">Er du sikker på at du vil avslå invitasjonen til %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Fremdrift</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">God morgen, %s!</string>
@@ -2349,6 +2405,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hei, %s!</string>
 
+    <string name="courses_and_groups">Fag og grupper</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Tilpass oversikt</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2358,16 +2415,44 @@
     <string name="changing_dashboard_layout">Endre oversikt layout</string>
     <string name="changing_dashboard_layout_message">For å endre oversikt layout, må du starte applikasjonen på nytt</string>
     <string name="restart_now">Start på nytt nå</string>
+    <string name="turn_on_new_dashboard">Slå på den nye oversikten</string>
     <string name="switched_back">Byttet tilbake?</string>
     <string name="switched_back_message">Takk for at du prøver det nye oversikten! Kan du fortelle oss hvorfor du byttet tilbake?</string>
+    <string name="survey_option_hard_to_find">Vanskelig å finne ting</string>
+    <string name="survey_option_prefer_old_layout">Foretrekker det gamle oppsettet</string>
+    <string name="survey_option_something_broken">Noe fungerte ikke som det skal</string>
     <string name="what_could_we_improve">Hva kan vi forbedre?</string>
+    <string name="what_do_you_think_of_new_dashboard">Hva synes du om den nye oversikten?</string>
+    <string name="let_us_know">Gi oss beskjed!</string>
+    <string name="no_app_to_handle_link">Ingen app tilgjengelig for å åpne denne lenken</string>
     <string name="skip">Hopp over</string>
     <string name="widget_setting_show_greeting">Vis hilsen</string>
     <string name="background_color">Bakgrunnsfarge</string>
+    <string name="widget_setting_show_grades">Fagvurderinger</string>
+    <string name="widget_setting_show_color_overlay">Fargeoverlegg for fag</string>
     <string name="offline_content_available">Frakoblet innhold tilgjengelig</string>
     <string name="a11y_contentDescription_moreOptions">Flere alternativer</string>
     <string name="customizeCourse">Skreddersy fag</string>
     <string name="favoriteCoursesAndGroups">Favorittfag og -grupper</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Eksterne verktøy er ikke tilgjengelige i frakoblet modus</string>
+    <string name="widget_weekly_summary">Ukentlig oppsummering</string>
+
+    <string name="dashboardCourseNickname">Kallenavn</string>
+    <string name="dashboardCourseNicknameHint">Skriv kallenavn for faget her</string>
+    <string name="dashboardCourseColor">Fagfarge</string>
+    <string name="widget_toDo">Daglige gjøremål</string>
+    <string name="dailyToDoWidgetTitle">Daglige gjøremål</string>
+    <string name="todoWidget_showCompleted">Vis fullført</string>
+    <string name="todoWidget_emptyTitle">Du er ferdig for nå!</string>
+    <string name="todoWidget_emptyMessage">Det ser ut til at du ikke er ledig denne dagen.\nVil du legge til noen gjøremål?</string>
+    <string name="todoWidget_addTodo">Legg til gjøremål</string>
+    <string name="todoWidget_errorTitle">Obs, noe gikk galt</string>
+    <string name="todoWidget_errorMessage">Vi kunne ikke laste inn gjøremålene dine.\nPrøv igjen eller kom tilbake senere.</string>
+    <string name="todoWidget_refresh">Oppdater</string>
+    <string name="todoWidget_today">I dag</string>
+    <string name="a11y_todoWidget_jumpToToday">Hopp til i dag</string>
+    <string name="widgetSettings_widgetsColor">Hovedfarge på oversikten</string>
+    <string name="dashboard_globalAnnouncement">Global beskjed</string>
+    <string name="forecastWidget_currentWeek">Gjeldende uke</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml b/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml
index 7840034f7d..b7f58ca7bd 100644
--- a/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml
+++ b/libs/pandares/src/main/res/values-b+sv+SE+instk12/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Inlämningen misslyckades</string>
     <string name="submissionStatusFailedSubtitle">Tryck för att visa detaljer</string>
     <string name="submissionAndRubric">Inlämning och matris</string>
+    <string name="submissionAndFeedback">Inlämning och återkoppling</string>
     <string name="commentsAndRubric">Kommentarer och matris</string>
     <string name="errorLoadingAssignment">Ett problem uppstod vid inläsningen av den här uppgiften. Kontrollera din anslutning och försök igen.</string>
     <string name="submitted">Skickad</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Idag</string>
+    <string name="tomorrow">I morgon</string>
     <string name="past">Tidigare</string>
     <string name="noDate">Inget datum</string>
     <string name="future">Framtida</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Inga objekt att visa</string>
     <string name="Todo">Att göra</string>
+    <string name="TodoNew">Att göra</string>
     <string name="todoFilter">Filtrera kurser</string>
     <string name="filterByEllipsis">Filtrera efter ...</string>
     <string name="favoriteCoursesLabel">Favoritkurser</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupper</string>
     <string name="groupMembers">Gruppmedlemmar</string>
 
+    <string name="messageGroup">Meddelandegrupp</string>
     <string name="loading">Laddar&#8230;</string>
     <string name="select_item_to_display">Välj från listan</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Att göra</string>
+    <string name="todoWidgetTitleNew">Att göra</string>
     <string name="gradesWidgetTitle">Omdömen</string>
     <string name="notificationWidgetTitle">Aviseringar</string>
     <string name="todoWidgetTitleLong">Canvas - Att göra</string>
+    <string name="todoWidgetTitleLongNew">Canvas – Att göra</string>
     <string name="gradesWidgetTitleLong">Canvas - Omdömen</string>
     <string name="gradeWidgetTitleLong">Canvas – bedömning</string>
     <string name="notificationWidgetTitleLong">Canvas - Aviseringar</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kurser</string>
     <string name="toDoList">Att göra-lista</string>
+    <string name="toDoListNew">Att göra-lista</string>
+
     <string name="notifications">Aviseringar</string>
     <string name="pushNotifications">Pushmeddelanden</string>
     <string name="pushNotificationsError">Pushmeddelanden har inte registrerats för den här enheten.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Öppna Speedgrader</string>
 
-    <string name="search_todo">att göra att göra lista</string>
     <string name="search_course">kurs kurser klass klasser</string>
     <string name="search_grades">omdöme omdömen</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Sidrubrik måste anges.</string>
     <string name="pageDetails">Sidinformation</string>
     <string name="saving">Sparar</string>
+    <string name="speedGraderSaving">Sparar</string>
+    <string name="speedGraderSaved">Sparad</string>
+    <string name="speedGraderFailed">Misslyckad</string>
+    <string name="speedGraderSaveErrorTitle">Hoppsan, något gick fel</string>
+    <string name="speedGraderSaveErrorMessage">Ett fel uppstod när din bedömningsändring skulle sparas. Du kan försöka igen, eller vänta till senare.</string>
+    <string name="speedGraderSaveErrorContentDescription">Det gick inte att spara bedömningen. Tryck för information</string>
+
     <string name="confirmDeleteEvent">Vill du ta bort den här händelsen?</string>
     <string name="conferencesNotSupported">Konferenser stöds ännu inte på den här mobilen.</string>
     <string name="filePreviewContentDescription">Förhandsvisningsbild för fil</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Inspelningar</string>
     <string name="conferenceInProgress">Konferens pågår...</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferenser (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Konferens pågår...</string>
+    <string name="conferencesWidgetDismissed">Konferensen avvisades</string>
     <string name="a11y_criterion_content_description">Kriteriebedömning %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">mer information</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s att göra-objekt</item>
         <item quantity="other">%s att göra-objekt</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s att göra-objekt</item>
+        <item quantity="other">%s att göra-objekt</item>
+    </plurals>
     <string name="noAnnotationSelected">Inga noteringar har valts</string>
     <string name="emailNotifications">E-postaviseringar</string>
     <string name="emailNotificationsImmediately">Omedelbart</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Inga händelser idag!</string>
     <string name="calendarNoEventsDescription">Det verkar vara en bra dag för vila, avslappning och omladdning.</string>
     <string name="userCalendarToDo">Att göra</string>
+    <string name="userCalendarToDoNew">Att göra</string>
     <string name="courseToDo">Att-göra för %s</string>
+    <string name="courseToDoNew">%s att göra</string>
     <string name="calendarEventExcused">Ursäktad</string>
     <string name="calendarEventMissing">Saknad</string>
     <string name="calendarEventGraded">Har bedömts</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Händelsen %s skapades.</string>
     <string name="a11y_eventUpdatedAnnouncement">Händelsen %s uppdaterades.</string>
     <string name="a11y_toDoCreatedAnnouncement">Att göra %s skapades.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Att göra %s skapades.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Att göra %s uppdaterades.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Att göra %s uppdaterades.</string>
     <string name="todoScreenTitle">Att göra</string>
+    <string name="todoScreenTitleNew">Att göra</string>
     <string name="todoDateLabel">Datum</string>
     <string name="todoDescriptionLabel">Beskrivning</string>
     <string name="todoDeleteConfirmationTitle">Vill du radera Att-göra?</string>
+    <string name="todoDeleteConfirmationTitleNew">Vill du radera Att göra?</string>
     <string name="todoDeleteConfirmationText">Detta tar bort ditt Att göra-objekt permanent.</string>
+    <string name="todoDeleteConfirmationTextNew">Detta tar bort ditt Att göra-objekt permanent.</string>
     <string name="todoDeleteErrorMessage">Det gick inte att ta bort det här att-göra-objektet. Kontrollera din anslutning och försök igen.</string>
+    <string name="todoDeleteErrorMessageNew">Det gick inte att radera detta att göra-objekt. Kontrollera anslutningen och försök igen.</string>
     <string name="createTodoScreenTitle">Ny att-göra</string>
+    <string name="createTodoScreenTitleNew">Nytt Att göra</string>
     <string name="editTodoScreenTitle">Redigera att-göra</string>
+    <string name="editTodoScreenTitleNew">Redigera Att göra</string>
     <string name="createToDoTitleHint">Lägg till titel</string>
     <string name="createToDoDateLabel">Datum</string>
     <string name="createToDoTimeLabel">Tid</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Detaljer</string>
     <string name="todoSaveErrorMessage">Det gick inte att läsa in det här att-göra-objektet. Kontrollera din anslutning och försök igen.</string>
+    <string name="todoSaveErrorMessageNew">Det gick inte att spara detta att göra-objekt. Kontrollera anslutningen och försök igen.</string>
     <string name="selectCalendarScreenTitle">Välj kalender</string>
     <string name="errorContentRetryButton">Försök igen</string>
     <string name="eventLocationLabel">Plats</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Detaljer</string>
     <string name="errorLoadingEvent">Det gick inte att läsa in den här händelsen. Kontrollera din anslutning och försök igen.</string>
     <string name="errorLoadingTodo">Det gick inte att läsa in det här att göra-objektet. Kontrollera din anslutning och försök igen.</string>
+    <string name="errorLoadingTodoNew">Det gick inte att läsa in detta att göra-objekt. Kontrollera anslutningen och försök igen.</string>
     <string name="eventDeleteConfirmationTitle">Radera händelse?</string>
     <string name="eventDeleteConfirmationText">Detta raderar din händelse permanent.</string>
     <string name="eventDeleteErrorMessage">Det gick inte att radera den här händelsen. Kontrollera din anslutning och försök igen.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Alla händelser</string>
     <string name="eventDeleteScopeFollowing">Denna och alla följande händelser</string>
     <string name="calendarAddToDo">Lägg till att göra</string>
+    <string name="calendarAddToDoNew">Lägg till att göra-uppgift</string>
     <string name="calendarAddEvent">Lägg till händelse</string>
     <string name="createEventScreenTitle">Ny händelse</string>
     <string name="editEventScreenTitle">Redigera händelse</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Då loggar vi in dig!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Om du vill se dina att göra-uppgifter loggar du in på ditt konto i appen. Det tar bara en sekund!</string>
     <string name="a11y_widgetToDoOpenToDoList">Öppna skärmen med att göra-listan</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Öppna skärmen med att göra-listan</string>
     <string name="a11y_widgetToDoCreateNewToDo">Skapa en ny att göra-uppgift</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Skapa en ny att göra-uppgift</string>
     <string name="widgetGradesErrorSubtitle">Vi har problem med att visa dig dina bedömningar för tillfället. Försök igen om en stund eller gå till appen.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Om du vill se dina bedömningar loggar du in på ditt konto i appen. Det tar bara en sekund!</string>
     <string name="widgetSingleGradeErrorSubtitle">Vi har problem med att visa dig dina bedömningar för tillfället.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Nu väljer vi en kurs.</string>
     <string name="widgetGradesErrorLoadingCourses">Ett fel inträffade under inläsning av kurser.</string>
     <string name="settingsSwitchExperience">Byt till Canvas Career</string>
+    <string name="forecastWidgetTitle">Veckovis sammanfattning</string>
+    <string name="forecastWidgetWeekPeriod">Vecka %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Saknad</string>
+    <string name="forecastWidgetDue">Inlämningsdatum</string>
+    <string name="forecastWidgetRecentGrades">Nya bedömningar</string>
+    <string name="forecastWidgetGradeWeight">%d%% av slutbedömningen</string>
+    <string name="forecastWidgetErrorMessage">Vi har problem med att läsa in dina uppgifter. Kontrollera din anslutning och försök igen.</string>
+    <string name="forecastWidgetEmptyMissing">Inga saknade uppgifter. Du har kommit ikapp!</string>
+    <string name="forecastWidgetEmptyDue">Inga uppgifter måste lämnas in denna vecka.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Inga nya bedömningar den här veckan.</string>
+    <string name="a11y_contentDescription_previousWeek">Föregående vecka</string>
+    <string name="a11y_contentDescription_nextWeek">Nästa vecka</string>
+
     <string name="speedGraderGradeTabTitle">Bedömning och matris</string>
     <string name="speedGraderDetailsTabTitle">Detaljer</string>
     <string name="a11y_contentDescription_expandPanel">Visa panelen</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Det gick inte att läsa in dina att göra-objekt. Kontrollera din anslutning och försök igen.</string>
     <string name="errorUpdatingToDo">Det gick inte att uppdatera att göra-objektet. Kontrollera din anslutning och försök igen.</string>
     <string name="noToDosForNow">Du har inga att göra-objekt för tillfället!</string>
+    <string name="noToDosForNowNew">Inga Att göra-objekt för tillfället!</string>
     <string name="noToDosForNowSubtext">Det verkar vara en bra tid för vila, slappna av och ladda om batterierna.</string>
     <string name="todoSwipeDone">Klar</string>
     <string name="todoSwipeUndo">Ångra</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Inställningar för att göra-lista</string>
+    <string name="todoFilterPreferencesNew">Inställningar för att göra-lista</string>
     <string name="todoFilterVisibleItems">Synliga objekt</string>
     <string name="todoFilterShowPersonalToDos">Visa personliga att göra-objekt</string>
+    <string name="todoFilterShowPersonalToDosNew">Visa personliga att göra-objekt</string>
     <string name="todoFilterShowCalendarEvents">Visa kalenderhändelser</string>
     <string name="todoFilterShowCompleted">Visa slutförda</string>
     <string name="todoFilterFavoriteCoursesOnly">Endast favoritkurser</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Avvisa inbjudan</string>
     <string name="courseInvitationDeclineConfirmMessage">Är du säker på att du vill avvisa inbjudan till %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Framsteg</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">God morgon %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hej %s!</string>
 
+    <string name="courses_and_groups">Kurser och grupper</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Anpassa översikt</string>
     <string name="dashboard_widgets">Widgetar</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Ändrar layouten för översikten</string>
     <string name="changing_dashboard_layout_message">Om du vill ändra layouten för översikten måste du starta om appen.</string>
     <string name="restart_now">Starta om nu</string>
+    <string name="turn_on_new_dashboard">Aktivera den nya översikten</string>
     <string name="switched_back">Ändrade du tillbaka?</string>
     <string name="switched_back_message">Tack för att du provade den nya översikten! Vill du berätta varför du ändrade tillbaka?</string>
+    <string name="survey_option_hard_to_find">Svårt att hitta saker</string>
+    <string name="survey_option_prefer_old_layout">Föredrar den tidigare layouten</string>
+    <string name="survey_option_something_broken">Något fungerade inte som det skulle</string>
     <string name="what_could_we_improve">Vad kan vi förbättra?</string>
+    <string name="what_do_you_think_of_new_dashboard">Vad tycker du om den nya översikten?</string>
+    <string name="let_us_know">Informera oss!</string>
+    <string name="no_app_to_handle_link">Det finns ingen tillgänglig app som kan öppna den här länken</string>
     <string name="skip">Hoppa över</string>
     <string name="widget_setting_show_greeting">Visa hälsning</string>
     <string name="background_color">Bakgrundsfärg</string>
+    <string name="widget_setting_show_grades">Kursens bedömningar</string>
+    <string name="widget_setting_show_color_overlay">Överlägg för kursfärg</string>
     <string name="offline_content_available">Offlineinnehåll tillgängligt</string>
     <string name="a11y_contentDescription_moreOptions">Fler alternativ</string>
     <string name="customizeCourse">Anpassa kurs</string>
     <string name="favoriteCoursesAndGroups">Favoritkurser och grupper</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Externa verktyg är inte tillgängliga offline.</string>
+    <string name="widget_weekly_summary">Veckovis sammanfattning</string>
+
+    <string name="dashboardCourseNickname">Smeknamn</string>
+    <string name="dashboardCourseNicknameHint">Skriv kursen smeknamn här</string>
+    <string name="dashboardCourseColor">Kursfärg</string>
+    <string name="widget_toDo">Dagliga att göra-objekt</string>
+    <string name="dailyToDoWidgetTitle">Dagliga att göra-objekt</string>
+    <string name="todoWidget_showCompleted">Visa slutförda</string>
+    <string name="todoWidget_emptyTitle">Du är klar för tillfället!</string>
+    <string name="todoWidget_emptyMessage">Det ser ut som du är ledig för idag.\nVill du lägga till några att göra-objekt?</string>
+    <string name="todoWidget_addTodo">Lägg till att göra-uppgift</string>
+    <string name="todoWidget_errorTitle">Hoppsan, något gick fel</string>
+    <string name="todoWidget_errorMessage">Vi kunde inte läsa in dina att göra-objekt.\nFörsök igen, eller kom tillbaka senare.</string>
+    <string name="todoWidget_refresh">Uppdatera</string>
+    <string name="todoWidget_today">I dag</string>
+    <string name="a11y_todoWidget_jumpToToday">Hoppa över idag</string>
+    <string name="widgetSettings_widgetsColor">Huvudfärg för översikt</string>
+    <string name="dashboard_globalAnnouncement">Globalt meddelande</string>
+    <string name="forecastWidget_currentWeek">Aktuell vecka</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+zh+HK/strings.xml b/libs/pandares/src/main/res/values-b+zh+HK/strings.xml
index 128a6e6f5a..ec3cb8922d 100644
--- a/libs/pandares/src/main/res/values-b+zh+HK/strings.xml
+++ b/libs/pandares/src/main/res/values-b+zh+HK/strings.xml
@@ -45,6 +45,7 @@
     <string name="submissionStatusFailedTitle">提交項目失敗</string>
     <string name="submissionStatusFailedSubtitle">點選以檢視詳情</string>
     <string name="submissionAndRubric">提交項目及評分標準</string>
+    <string name="submissionAndFeedback">提交與回饋</string>
     <string name="commentsAndRubric">評論及評分標準</string>
     <string name="errorLoadingAssignment">載入此作業時出現問題。請檢查您的連接然後重試。</string>
     <string name="submitted">已提交</string>
@@ -214,6 +215,7 @@
 
     <!-- Date strings -->
     <string name="today">今天</string>
+    <string name="tomorrow">明天</string>
     <string name="past">歷史</string>
     <string name="noDate">無日期</string>
     <string name="future">未來</string>
@@ -286,6 +288,7 @@
     <string name="monologue">獨白</string>
     <string name="noItemsToDisplayShort">沒有可顯示的項目</string>
     <string name="Todo">待辦事項</string>
+    <string name="TodoNew">待辦事項</string>
     <string name="todoFilter">篩選課程</string>
     <string name="filterByEllipsis">篩選條件為...</string>
     <string name="favoriteCoursesLabel">最喜愛的課程</string>
@@ -463,6 +466,7 @@
     <string name="groups">群組</string>
     <string name="groupMembers">群組成員</string>
 
+    <string name="messageGroup">訊息群組</string>
     <string name="loading">正在載入&#8230;</string>
     <string name="select_item_to_display">從列表中選擇</string>
 
@@ -679,9 +683,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">待辦事項</string>
+    <string name="todoWidgetTitleNew">待辦事項</string>
     <string name="gradesWidgetTitle">成績</string>
     <string name="notificationWidgetTitle">通知</string>
     <string name="todoWidgetTitleLong">Canvas - 待辦事項</string>
+    <string name="todoWidgetTitleLongNew">Canvas - 待辦事項</string>
     <string name="gradesWidgetTitleLong">Canvas - 評分</string>
     <string name="gradeWidgetTitleLong">Canvas - 評分</string>
     <string name="notificationWidgetTitleLong">Canvas - 通知</string>
@@ -717,6 +723,8 @@
     <!-- Tablet Strings -->
     <string name="courses">課程</string>
     <string name="toDoList">待辦事項清單</string>
+    <string name="toDoListNew">待辦事項清單</string>
+
     <string name="notifications">通知</string>
     <string name="pushNotifications">推送通知</string>
     <string name="pushNotificationsError">尚未為此設備註冊推送通知。</string>
@@ -731,7 +739,6 @@
 
     <string name="launchSpeedgrader">打開 Speedgrader</string>
 
-    <string name="search_todo">待辦事項清單</string>
     <string name="search_course">課程 課程 班級 班級</string>
     <string name="search_grades">評分 成績</string>
 
@@ -1059,6 +1066,13 @@
     <string name="pageTitleMustBeSet">必須設定頁面標題。</string>
     <string name="pageDetails">頁面詳情</string>
     <string name="saving">正在儲存</string>
+    <string name="speedGraderSaving">正在儲存</string>
+    <string name="speedGraderSaved">已儲存</string>
+    <string name="speedGraderFailed">失敗</string>
+    <string name="speedGraderSaveErrorTitle">糟糕，出現問題</string>
+    <string name="speedGraderSaveErrorMessage">儲存評分修改時發生錯誤。您可以重試，或稍後再試一次。</string>
+    <string name="speedGraderSaveErrorContentDescription">儲存評分失敗。點選以取得詳細資料。</string>
+
     <string name="confirmDeleteEvent">您是否確定要刪除此活動？</string>
     <string name="conferencesNotSupported">移動設備尚未支援會議。</string>
     <string name="filePreviewContentDescription">檔案預覽圖像</string>
@@ -1204,6 +1218,10 @@
     <string name="recordings">記錄</string>
     <string name="conferenceInProgress">會議進行中</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">會議 (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">會議進行中</string>
+    <string name="conferencesWidgetDismissed">會議已結束</string>
     <string name="a11y_criterion_content_description">標準評級%s</string>
     <string name="a11y_criterion_description_content_description">%s，%s</string>
     <string name="a11y_criterion_button_click_description">更多資訊</string>
@@ -1351,6 +1369,9 @@
     <plurals name="a11y_todoBadgeCount">
         <item quantity="other">%s 個待辦項目</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="other">%s 個待辦事項</item>
+    </plurals>
     <string name="noAnnotationSelected">未選擇任何註釋</string>
     <string name="emailNotifications">電子郵件通知</string>
     <string name="emailNotificationsImmediately">立即</string>
@@ -1632,7 +1653,9 @@
     <string name="calendarNoEvents">今天並無活動！</string>
     <string name="calendarNoEventsDescription">看來是適合休息、放鬆和充電的一天。</string>
     <string name="userCalendarToDo">待辦事項</string>
+    <string name="userCalendarToDoNew">待辦事項</string>
     <string name="courseToDo">%s 待辦事項</string>
+    <string name="courseToDoNew">%s 待辦事項</string>
     <string name="calendarEventExcused">已免除</string>
     <string name="calendarEventMissing">缺少</string>
     <string name="calendarEventGraded">已評分</string>
@@ -1657,21 +1680,30 @@
     <string name="a11y_eventCreatedAnnouncement">已成功建立事件 %s。</string>
     <string name="a11y_eventUpdatedAnnouncement">已成功更新事件 %s。</string>
     <string name="a11y_toDoCreatedAnnouncement">已成功建立待辦事項 %s。</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">已成功建立待辦事項 %s。</string>
     <string name="a11y_toDoUpdatedAnnouncement">已成功更新待辦事項 %s。</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">已成功更新待辦事項 %s。</string>
     <string name="todoScreenTitle">待辦事項</string>
+    <string name="todoScreenTitleNew">待辦事項</string>
     <string name="todoDateLabel">日期</string>
     <string name="todoDescriptionLabel">描述</string>
     <string name="todoDeleteConfirmationTitle">刪除待辦事項？</string>
+    <string name="todoDeleteConfirmationTitleNew">刪除待辦事項？</string>
     <string name="todoDeleteConfirmationText">這將永久刪除您的待辦事項。</string>
+    <string name="todoDeleteConfirmationTextNew">這將永久刪除您的待辦項目。</string>
     <string name="todoDeleteErrorMessage">刪除此待辦事項時出錯。請檢查您的連接然後重試。</string>
+    <string name="todoDeleteErrorMessageNew">刪除此待辦事項時發生錯誤。請檢查您的連線，然後再試一次。</string>
     <string name="createTodoScreenTitle">新待辦事項</string>
+    <string name="createTodoScreenTitleNew">新待辦事項</string>
     <string name="editTodoScreenTitle">編輯待辦事項</string>
+    <string name="editTodoScreenTitleNew">編輯待辦事項</string>
     <string name="createToDoTitleHint">添加標題</string>
     <string name="createToDoDateLabel">日期</string>
     <string name="createToDoTimeLabel">時間</string>
     <string name="createToDoCalendarLabel">行事曆</string>
     <string name="createToDoDetailsLabel">詳細資料</string>
     <string name="todoSaveErrorMessage">保存此待辦事項時出錯。請檢查您的連接然後重試。</string>
+    <string name="todoSaveErrorMessageNew">儲存此待辦事項時發生錯誤。請檢查您的連線，然後再試一次。</string>
     <string name="selectCalendarScreenTitle">選取行事曆</string>
     <string name="errorContentRetryButton">重試</string>
     <string name="eventLocationLabel">位置</string>
@@ -1679,6 +1711,7 @@
     <string name="eventDetailsLabel">詳細資料</string>
     <string name="errorLoadingEvent">載入此活動時出現問題。請檢查您的連接然後重試。</string>
     <string name="errorLoadingTodo">載入此待辦事項時出現問題。請檢查您的連接然後重試。</string>
+    <string name="errorLoadingTodoNew">儲存此待辦事項時發生問題。請檢查您的連線，然後再試一次。</string>
     <string name="eventDeleteConfirmationTitle">刪除事件？</string>
     <string name="eventDeleteConfirmationText">這將永久刪除您的活動。</string>
     <string name="eventDeleteErrorMessage">刪除此活動時發生錯誤。請檢查您的連接然後重試。</string>
@@ -1694,6 +1727,7 @@
     <string name="eventDeleteScopeAll">所有活動</string>
     <string name="eventDeleteScopeFollowing">此活動和所有後續活動</string>
     <string name="calendarAddToDo">添加到待辦事項</string>
+    <string name="calendarAddToDoNew">添加待辦事項</string>
     <string name="calendarAddEvent">添加活動</string>
     <string name="createEventScreenTitle">新活動</string>
     <string name="editEventScreenTitle">編輯事件</string>
@@ -2066,7 +2100,9 @@
     <string name="widgetNotLoggedInTitle">讓我們幫您登入！</string>
     <string name="widgetToDoNotLoggedInSubtitle">若要查看您的待辦事項，請在應用程式中登入您的帳戶。只需一秒鐘！</string>
     <string name="a11y_widgetToDoOpenToDoList">開啟待辦事項清單畫面</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">開啟待辦事項清單畫面</string>
     <string name="a11y_widgetToDoCreateNewToDo">建立新的待辦事項</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">建立新的待辦事項</string>
     <string name="widgetGradesErrorSubtitle">我們現在無法顯示您的成績。請稍後重試或前往應用程式。</string>
     <string name="widgetGradesNotLoggedInSubtitle">要查看您的成績，請在應用程式中登入您的帳戶。只需一秒鐘！</string>
     <string name="widgetSingleGradeErrorSubtitle">我們現在無法顯示您的成績。</string>
@@ -2074,6 +2110,19 @@
     <string name="widgetSingleGradeSelectCourse">讓我們選擇課程</string>
     <string name="widgetGradesErrorLoadingCourses">載入課程時發生錯誤。</string>
     <string name="settingsSwitchExperience">切換到 Canvas Career</string>
+    <string name="forecastWidgetTitle">每週摘要</string>
+    <string name="forecastWidgetWeekPeriod">第 %1$d 週 | %2$s</string>
+    <string name="forecastWidgetMissing">缺少</string>
+    <string name="forecastWidgetDue">截止</string>
+    <string name="forecastWidgetRecentGrades">最新成續</string>
+    <string name="forecastWidgetGradeWeight">最終評分 %d%%</string>
+    <string name="forecastWidgetErrorMessage">我們在載入您的作業時遇到問題。請檢查您的連接然後重試。</string>
+    <string name="forecastWidgetEmptyMissing">沒有缺少作業。您已讀完所有新訊息！</string>
+    <string name="forecastWidgetEmptyDue">本過沒有截止作業。</string>
+    <string name="forecastWidgetEmptyRecentGrades">本週沒有新的成績。</string>
+    <string name="a11y_contentDescription_previousWeek">上週</string>
+    <string name="a11y_contentDescription_nextWeek">下週</string>
+
     <string name="speedGraderGradeTabTitle">評分和評分標準</string>
     <string name="speedGraderDetailsTabTitle">詳細資料</string>
     <string name="a11y_contentDescription_expandPanel">展開面板</string>
@@ -2150,6 +2199,7 @@
     <string name="errorLoadingToDos">載入您的待辦項目時發生錯誤。請檢查您的連接然後重試。</string>
     <string name="errorUpdatingToDo">更新待辦項目時發生錯誤。請檢查您的連接然後重試。</string>
     <string name="noToDosForNow">目前沒有待辦事項！</string>
+    <string name="noToDosForNowNew">暫時沒有待辦事項！</string>
     <string name="noToDosForNowSubtext">看來是適合休息、放鬆和充電的時候。</string>
     <string name="todoSwipeDone">已完成</string>
     <string name="todoSwipeUndo">復原</string>
@@ -2160,8 +2210,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">待辦事項清單偏好設定</string>
+    <string name="todoFilterPreferencesNew">待辦事項清單偏好設定</string>
     <string name="todoFilterVisibleItems">可見項目</string>
     <string name="todoFilterShowPersonalToDos">顯示個人待辦事項</string>
+    <string name="todoFilterShowPersonalToDosNew">顯示個人待辦事項</string>
     <string name="todoFilterShowCalendarEvents">顯示行事曆事件</string>
     <string name="todoFilterShowCompleted">顯示已完成</string>
     <string name="todoFilterFavoriteCoursesOnly">僅顯示最愛課程</string>
@@ -2188,6 +2240,9 @@
     <string name="courseInvitationDeclineConfirmTitle">拒絕邀請</string>
     <string name="courseInvitationDeclineConfirmMessage">是否確定要拒絕 %s 邀請？</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">進行中</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">早上好，%s！</string>
@@ -2310,6 +2365,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">您好，%s</string>
 
+    <string name="courses_and_groups">課程和群組</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">自訂控制面板</string>
     <string name="dashboard_widgets">小部件</string>
@@ -2319,16 +2375,44 @@
     <string name="changing_dashboard_layout">變更控制面板佈局</string>
     <string name="changing_dashboard_layout_message">若要變更控制面板佈局，您必須重新啟動應用程式</string>
     <string name="restart_now">立即重新啟動</string>
+    <string name="turn_on_new_dashboard">啟用新的控制面板</string>
     <string name="switched_back">已切換回原來的佈局？</string>
     <string name="switched_back_message">感謝您試用新的控制面板！請問您切換回原來的佈局的原因是什麼？</string>
+    <string name="survey_option_hard_to_find">難以找到內容</string>
+    <string name="survey_option_prefer_old_layout">更喜歡舊版面</string>
+    <string name="survey_option_something_broken">出現問題</string>
     <string name="what_could_we_improve">我們可以改進哪些地方？</string>
+    <string name="what_do_you_think_of_new_dashboard">您覺得新的控制面板怎麼樣？</string>
+    <string name="let_us_know">請通知我們！</string>
+    <string name="no_app_to_handle_link">沒有可用的應用程式可以開啟此連結</string>
     <string name="skip">跳過</string>
     <string name="widget_setting_show_greeting">顯示問候語</string>
     <string name="background_color">背景顏色</string>
+    <string name="widget_setting_show_grades">課程成績</string>
+    <string name="widget_setting_show_color_overlay">課程顏色覆蓋</string>
     <string name="offline_content_available">離線內容可用</string>
     <string name="a11y_contentDescription_moreOptions">更多選項</string>
     <string name="customizeCourse">定制課程</string>
     <string name="favoriteCoursesAndGroups">最愛課程和群組</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">外部工具無法離線使用。</string>
+    <string name="widget_weekly_summary">每週摘要</string>
+
+    <string name="dashboardCourseNickname">暱稱</string>
+    <string name="dashboardCourseNicknameHint">在此寫入課程暱稱</string>
+    <string name="dashboardCourseColor">課程顏色</string>
+    <string name="widget_toDo">每日待辦事項</string>
+    <string name="dailyToDoWidgetTitle">每日待辦事項</string>
+    <string name="todoWidget_showCompleted">顯示已完成</string>
+    <string name="todoWidget_emptyTitle">您現在已全部完成！</string>
+    <string name="todoWidget_emptyMessage">看來您今天有空。\n是否要添加一些待辦事項？</string>
+    <string name="todoWidget_addTodo">添加待辦事項</string>
+    <string name="todoWidget_errorTitle">糟糕，出現問題</string>
+    <string name="todoWidget_errorMessage">我們無法載入您的待辦事項。\n請再試一次，或稍後返回。</string>
+    <string name="todoWidget_refresh">重新整理</string>
+    <string name="todoWidget_today">今天</string>
+    <string name="a11y_todoWidget_jumpToToday">跳到今天</string>
+    <string name="widgetSettings_widgetsColor">控制面板主色</string>
+    <string name="dashboard_globalAnnouncement">全域通告</string>
+    <string name="forecastWidget_currentWeek">本週</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml b/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml
index ea3778865f..457cdabd03 100644
--- a/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml
+++ b/libs/pandares/src/main/res/values-b+zh+Hans/strings.xml
@@ -45,6 +45,7 @@
     <string name="submissionStatusFailedTitle">提交文件失败</string>
     <string name="submissionStatusFailedSubtitle">轻按以查看详细信息</string>
     <string name="submissionAndRubric">提交项和评价量规</string>
+    <string name="submissionAndFeedback">提交内容和反馈</string>
     <string name="commentsAndRubric">备注和评分细则</string>
     <string name="errorLoadingAssignment">加载此作业时发生问题。请检查您的连接，然后再试一次。</string>
     <string name="submitted">已提交</string>
@@ -214,6 +215,7 @@
 
     <!-- Date strings -->
     <string name="today">今天</string>
+    <string name="tomorrow">明天</string>
     <string name="past">过去</string>
     <string name="noDate">无日期</string>
     <string name="future">未来</string>
@@ -286,6 +288,7 @@
     <string name="monologue">独白</string>
     <string name="noItemsToDisplayShort">没有项目显示</string>
     <string name="Todo">待办事项</string>
+    <string name="TodoNew">待办</string>
     <string name="todoFilter">过滤课程</string>
     <string name="filterByEllipsis">过滤条件...</string>
     <string name="favoriteCoursesLabel">最喜欢的课程</string>
@@ -463,6 +466,7 @@
     <string name="groups">小组</string>
     <string name="groupMembers">小组成员</string>
 
+    <string name="messageGroup">消息组</string>
     <string name="loading">正在加载&#8230;</string>
     <string name="select_item_to_display">从列表中选择</string>
 
@@ -679,9 +683,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">待办事项</string>
+    <string name="todoWidgetTitleNew">待办</string>
     <string name="gradesWidgetTitle">评分</string>
     <string name="notificationWidgetTitle">通知</string>
     <string name="todoWidgetTitleLong">Canvas - 待办事项</string>
+    <string name="todoWidgetTitleLongNew">Canvas - 待办</string>
     <string name="gradesWidgetTitleLong">Canvas - 评分</string>
     <string name="gradeWidgetTitleLong">Canvas - 年级</string>
     <string name="notificationWidgetTitleLong">Canvas - 通知</string>
@@ -717,6 +723,8 @@
     <!-- Tablet Strings -->
     <string name="courses">课程</string>
     <string name="toDoList">待办事项列表</string>
+    <string name="toDoListNew">待办任务列表</string>
+
     <string name="notifications">通知</string>
     <string name="pushNotifications">推送通知</string>
     <string name="pushNotificationsError">未在此设备上注册推送通知。</string>
@@ -731,7 +739,6 @@
 
     <string name="launchSpeedgrader">打开 Speedgrader</string>
 
-    <string name="search_todo">待办事项 待办事项的待办列表</string>
     <string name="search_course">课程 课程 课时 课时</string>
     <string name="search_grades">评分 成绩</string>
 
@@ -1059,6 +1066,13 @@
     <string name="pageTitleMustBeSet">必须设置页面标题。</string>
     <string name="pageDetails">页面详细信息</string>
     <string name="saving">正在保存</string>
+    <string name="speedGraderSaving">正在保存</string>
+    <string name="speedGraderSaved">已保存</string>
+    <string name="speedGraderFailed">失败</string>
+    <string name="speedGraderSaveErrorTitle">糟糕，出错了</string>
+    <string name="speedGraderSaveErrorMessage">保存评分修改时出错。您可以重试或稍后再试。</string>
+    <string name="speedGraderSaveErrorContentDescription">保存评分失败。单击以查看详细信息。</string>
+
     <string name="confirmDeleteEvent">是否确定要删除此活动？</string>
     <string name="conferencesNotSupported">会议目前不支持移动设备。</string>
     <string name="filePreviewContentDescription">文件预览图像</string>
@@ -1204,6 +1218,10 @@
     <string name="recordings">录制文件</string>
     <string name="conferenceInProgress">会议进行中</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">会议 (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">会议进行中</string>
+    <string name="conferencesWidgetDismissed">已忽略会议</string>
     <string name="a11y_criterion_content_description">标准评分 %s</string>
     <string name="a11y_criterion_description_content_description">%s，%s</string>
     <string name="a11y_criterion_button_click_description">更多信息</string>
@@ -1351,6 +1369,9 @@
     <plurals name="a11y_todoBadgeCount">
         <item quantity="other">%s 个待办任务</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="other">%s 个待办任务</item>
+    </plurals>
     <string name="noAnnotationSelected">未选择任何批注</string>
     <string name="emailNotifications">电子邮件通知</string>
     <string name="emailNotificationsImmediately">立即</string>
@@ -1632,7 +1653,9 @@
     <string name="calendarNoEvents">今天没有事件！</string>
     <string name="calendarNoEventsDescription">今天是休息放松的一天。</string>
     <string name="userCalendarToDo">待办事项</string>
+    <string name="userCalendarToDoNew">待办</string>
     <string name="courseToDo">%s待办事项</string>
+    <string name="courseToDoNew">%s 个待办</string>
     <string name="calendarEventExcused">已免除</string>
     <string name="calendarEventMissing">未交</string>
     <string name="calendarEventGraded">已评分</string>
@@ -1657,21 +1680,30 @@
     <string name="a11y_eventCreatedAnnouncement">已成功创建事件 %s。</string>
     <string name="a11y_eventUpdatedAnnouncement">已成功更新事件 %s。</string>
     <string name="a11y_toDoCreatedAnnouncement">已成功创建待办事项 %s。</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">已成功创建待办任务 %s。</string>
     <string name="a11y_toDoUpdatedAnnouncement">已成功更新待办事项 %s。</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">已成功更新待办任务 %s。</string>
     <string name="todoScreenTitle">待办事项</string>
+    <string name="todoScreenTitleNew">待办</string>
     <string name="todoDateLabel">日期</string>
     <string name="todoDescriptionLabel">说明</string>
     <string name="todoDeleteConfirmationTitle">是否删除待办事项？</string>
+    <string name="todoDeleteConfirmationTitleNew">是否删除待办任务？</string>
     <string name="todoDeleteConfirmationText">这将永久删除您的待办事项。</string>
+    <string name="todoDeleteConfirmationTextNew">您的待办任务将永久删除。</string>
     <string name="todoDeleteErrorMessage">删除此待办事项时发生错误。请检查连接，然后重试。</string>
+    <string name="todoDeleteErrorMessageNew">删除此待办任务时出错。请检查连接状况并重试。</string>
     <string name="createTodoScreenTitle">新待办事项</string>
+    <string name="createTodoScreenTitleNew">新建待办任务</string>
     <string name="editTodoScreenTitle">编辑待办事项</string>
+    <string name="editTodoScreenTitleNew">编辑待办任务</string>
     <string name="createToDoTitleHint">添加标题</string>
     <string name="createToDoDateLabel">日期</string>
     <string name="createToDoTimeLabel">时间</string>
     <string name="createToDoCalendarLabel">日历</string>
     <string name="createToDoDetailsLabel">详情</string>
     <string name="todoSaveErrorMessage">保存此待办事项时发生错误。请检查连接，然后重试。</string>
+    <string name="todoSaveErrorMessageNew">保存此待办任务时出错。请检查连接状况并重试。</string>
     <string name="selectCalendarScreenTitle">选择日历</string>
     <string name="errorContentRetryButton">重试</string>
     <string name="eventLocationLabel">位置</string>
@@ -1679,6 +1711,7 @@
     <string name="eventDetailsLabel">详情</string>
     <string name="errorLoadingEvent">加载此事件时遇到问题。请检查连接，然后重试。</string>
     <string name="errorLoadingTodo">加载此待办事项时遇到问题。请检查连接，然后重试。</string>
+    <string name="errorLoadingTodoNew">加载此待办任务时出错。请检查连接状况并重试。</string>
     <string name="eventDeleteConfirmationTitle">是否删除事件？</string>
     <string name="eventDeleteConfirmationText">您的事件将永久删除。</string>
     <string name="eventDeleteErrorMessage">删除此事件时出错。请检查连接，然后重试。</string>
@@ -1694,6 +1727,7 @@
     <string name="eventDeleteScopeAll">所有事件</string>
     <string name="eventDeleteScopeFollowing">此事件和所有后续事件</string>
     <string name="calendarAddToDo">添加到待办事项</string>
+    <string name="calendarAddToDoNew">添加任务</string>
     <string name="calendarAddEvent">添加事件</string>
     <string name="createEventScreenTitle">新事件</string>
     <string name="editEventScreenTitle">编辑事件</string>
@@ -2066,7 +2100,9 @@
     <string name="widgetNotLoggedInTitle">请登录！</string>
     <string name="widgetToDoNotLoggedInSubtitle">要查看任务，请在应用程序中登录您的帐户。只需片刻！</string>
     <string name="a11y_widgetToDoOpenToDoList">打开任务列表页面</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">打开待办任务列表页面</string>
     <string name="a11y_widgetToDoCreateNewToDo">新建任务 </string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">新建待办任务</string>
     <string name="widgetGradesErrorSubtitle">目前显示您的年级时遇到问题。请稍后再试或前往应用程序。</string>
     <string name="widgetGradesNotLoggedInSubtitle">要查看您的年级，请在应用程序中登录您的帐户。只需片刻！</string>
     <string name="widgetSingleGradeErrorSubtitle">目前显示您的年级时遇到问题。</string>
@@ -2074,6 +2110,19 @@
     <string name="widgetSingleGradeSelectCourse">请选择课程</string>
     <string name="widgetGradesErrorLoadingCourses">加载课程时出错。</string>
     <string name="settingsSwitchExperience">切换到 Canvas Career</string>
+    <string name="forecastWidgetTitle">每周摘要</string>
+    <string name="forecastWidgetWeekPeriod">第 %2$s | %1$d 周</string>
+    <string name="forecastWidgetMissing">未交</string>
+    <string name="forecastWidgetDue">截止</string>
+    <string name="forecastWidgetRecentGrades">新评分</string>
+    <string name="forecastWidgetGradeWeight">%d%% 的最终评分</string>
+    <string name="forecastWidgetErrorMessage">加载您的作业时遇到问题。请检查连接，然后重试。</string>
+    <string name="forecastWidgetEmptyMissing">没有缺交作业。您已经全部赶上了！</string>
+    <string name="forecastWidgetEmptyDue">没有本周截止的作业。</string>
+    <string name="forecastWidgetEmptyRecentGrades">本周没有新评分。</string>
+    <string name="a11y_contentDescription_previousWeek">上一周</string>
+    <string name="a11y_contentDescription_nextWeek">下一周</string>
+
     <string name="speedGraderGradeTabTitle">评分和评价量规</string>
     <string name="speedGraderDetailsTabTitle">详情</string>
     <string name="a11y_contentDescription_expandPanel">展开面板</string>
@@ -2150,6 +2199,7 @@
     <string name="errorLoadingToDos">加载待办任务时出错。请检查连接，然后重试。</string>
     <string name="errorUpdatingToDo">更新待办任务时出错。请检查连接，然后重试。</string>
     <string name="noToDosForNow">暂时没有待办任务！</string>
+    <string name="noToDosForNowNew">暂时没有待办任务！</string>
     <string name="noToDosForNowSubtext">现在似乎是休息放松的好时机。</string>
     <string name="todoSwipeDone">完成</string>
     <string name="todoSwipeUndo">后退</string>
@@ -2160,8 +2210,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">待办任务首选项</string>
+    <string name="todoFilterPreferencesNew">待办任务列表首选项</string>
     <string name="todoFilterVisibleItems">可见任务</string>
     <string name="todoFilterShowPersonalToDos">显示个人待办任务</string>
+    <string name="todoFilterShowPersonalToDosNew">显示个人待办任务</string>
     <string name="todoFilterShowCalendarEvents">显示日历事件</string>
     <string name="todoFilterShowCompleted">显示已完成</string>
     <string name="todoFilterFavoriteCoursesOnly">仅限收藏的课程</string>
@@ -2188,6 +2240,9 @@
     <string name="courseInvitationDeclineConfirmTitle">拒绝邀请</string>
     <string name="courseInvitationDeclineConfirmMessage">是否确实要拒绝%s邀请？</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">进度、进步</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">早上好，%s！</string>
@@ -2310,6 +2365,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">您好，%s</string>
 
+    <string name="courses_and_groups">课程和小组</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">自定义控制面板</string>
     <string name="dashboard_widgets">小工具</string>
@@ -2319,16 +2375,44 @@
     <string name="changing_dashboard_layout">更改控制面板布局</string>
     <string name="changing_dashboard_layout_message">要更改控制面板布局，必须重启应用程序</string>
     <string name="restart_now">立即重启</string>
+    <string name="turn_on_new_dashboard">打开新的控制面板</string>
     <string name="switched_back">是否换回旧版？</string>
     <string name="switched_back_message">感谢您尝试新的控制面板！请告诉我们您换回旧版的原因。</string>
+    <string name="survey_option_hard_to_find">难以查找内容</string>
+    <string name="survey_option_prefer_old_layout">偏好原布局</string>
+    <string name="survey_option_something_broken">出现异常</string>
     <string name="what_could_we_improve">请为我们提供改进建议。</string>
+    <string name="what_do_you_think_of_new_dashboard">您对新控制面板的评价如何？</string>
+    <string name="let_us_know">请告诉我们！</string>
+    <string name="no_app_to_handle_link">没有应用程序可打开此链接</string>
     <string name="skip">略过</string>
     <string name="widget_setting_show_greeting">显示欢迎</string>
     <string name="background_color">背景色</string>
+    <string name="widget_setting_show_grades">课程评分</string>
+    <string name="widget_setting_show_color_overlay">课程颜色叠加</string>
     <string name="offline_content_available">可用的离线内容</string>
     <string name="a11y_contentDescription_moreOptions">更多选项</string>
     <string name="customizeCourse">自定义课程</string>
     <string name="favoriteCoursesAndGroups">收藏的课程和小组</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">外部工具无法离线使用。</string>
+    <string name="widget_weekly_summary">每周摘要</string>
+
+    <string name="dashboardCourseNickname">昵称</string>
+    <string name="dashboardCourseNicknameHint">在此处撰写课程别称</string>
+    <string name="dashboardCourseColor">课程颜色</string>
+    <string name="widget_toDo">每日待办任务</string>
+    <string name="dailyToDoWidgetTitle">每日待办任务</string>
+    <string name="todoWidget_showCompleted">显示已完成</string>
+    <string name="todoWidget_emptyTitle">您的任务已全部完成！</string>
+    <string name="todoWidget_emptyMessage">您今天没有任务。\n是否要添加一些任务？</string>
+    <string name="todoWidget_addTodo">添加任务</string>
+    <string name="todoWidget_errorTitle">糟糕，出错了</string>
+    <string name="todoWidget_errorMessage">无法加载您的待办任务。\n再试一次，或稍后回来。</string>
+    <string name="todoWidget_refresh">刷新</string>
+    <string name="todoWidget_today">今天</string>
+    <string name="a11y_todoWidget_jumpToToday">跳到今天</string>
+    <string name="widgetSettings_widgetsColor">控制面板主要颜色</string>
+    <string name="dashboard_globalAnnouncement">全局公告</string>
+    <string name="forecastWidget_currentWeek">本周</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml b/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml
index 128a6e6f5a..ec3cb8922d 100644
--- a/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml
+++ b/libs/pandares/src/main/res/values-b+zh+Hant/strings.xml
@@ -45,6 +45,7 @@
     <string name="submissionStatusFailedTitle">提交項目失敗</string>
     <string name="submissionStatusFailedSubtitle">點選以檢視詳情</string>
     <string name="submissionAndRubric">提交項目及評分標準</string>
+    <string name="submissionAndFeedback">提交與回饋</string>
     <string name="commentsAndRubric">評論及評分標準</string>
     <string name="errorLoadingAssignment">載入此作業時出現問題。請檢查您的連接然後重試。</string>
     <string name="submitted">已提交</string>
@@ -214,6 +215,7 @@
 
     <!-- Date strings -->
     <string name="today">今天</string>
+    <string name="tomorrow">明天</string>
     <string name="past">歷史</string>
     <string name="noDate">無日期</string>
     <string name="future">未來</string>
@@ -286,6 +288,7 @@
     <string name="monologue">獨白</string>
     <string name="noItemsToDisplayShort">沒有可顯示的項目</string>
     <string name="Todo">待辦事項</string>
+    <string name="TodoNew">待辦事項</string>
     <string name="todoFilter">篩選課程</string>
     <string name="filterByEllipsis">篩選條件為...</string>
     <string name="favoriteCoursesLabel">最喜愛的課程</string>
@@ -463,6 +466,7 @@
     <string name="groups">群組</string>
     <string name="groupMembers">群組成員</string>
 
+    <string name="messageGroup">訊息群組</string>
     <string name="loading">正在載入&#8230;</string>
     <string name="select_item_to_display">從列表中選擇</string>
 
@@ -679,9 +683,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">待辦事項</string>
+    <string name="todoWidgetTitleNew">待辦事項</string>
     <string name="gradesWidgetTitle">成績</string>
     <string name="notificationWidgetTitle">通知</string>
     <string name="todoWidgetTitleLong">Canvas - 待辦事項</string>
+    <string name="todoWidgetTitleLongNew">Canvas - 待辦事項</string>
     <string name="gradesWidgetTitleLong">Canvas - 評分</string>
     <string name="gradeWidgetTitleLong">Canvas - 評分</string>
     <string name="notificationWidgetTitleLong">Canvas - 通知</string>
@@ -717,6 +723,8 @@
     <!-- Tablet Strings -->
     <string name="courses">課程</string>
     <string name="toDoList">待辦事項清單</string>
+    <string name="toDoListNew">待辦事項清單</string>
+
     <string name="notifications">通知</string>
     <string name="pushNotifications">推送通知</string>
     <string name="pushNotificationsError">尚未為此設備註冊推送通知。</string>
@@ -731,7 +739,6 @@
 
     <string name="launchSpeedgrader">打開 Speedgrader</string>
 
-    <string name="search_todo">待辦事項清單</string>
     <string name="search_course">課程 課程 班級 班級</string>
     <string name="search_grades">評分 成績</string>
 
@@ -1059,6 +1066,13 @@
     <string name="pageTitleMustBeSet">必須設定頁面標題。</string>
     <string name="pageDetails">頁面詳情</string>
     <string name="saving">正在儲存</string>
+    <string name="speedGraderSaving">正在儲存</string>
+    <string name="speedGraderSaved">已儲存</string>
+    <string name="speedGraderFailed">失敗</string>
+    <string name="speedGraderSaveErrorTitle">糟糕，出現問題</string>
+    <string name="speedGraderSaveErrorMessage">儲存評分修改時發生錯誤。您可以重試，或稍後再試一次。</string>
+    <string name="speedGraderSaveErrorContentDescription">儲存評分失敗。點選以取得詳細資料。</string>
+
     <string name="confirmDeleteEvent">您是否確定要刪除此活動？</string>
     <string name="conferencesNotSupported">移動設備尚未支援會議。</string>
     <string name="filePreviewContentDescription">檔案預覽圖像</string>
@@ -1204,6 +1218,10 @@
     <string name="recordings">記錄</string>
     <string name="conferenceInProgress">會議進行中</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">會議 (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">會議進行中</string>
+    <string name="conferencesWidgetDismissed">會議已結束</string>
     <string name="a11y_criterion_content_description">標準評級%s</string>
     <string name="a11y_criterion_description_content_description">%s，%s</string>
     <string name="a11y_criterion_button_click_description">更多資訊</string>
@@ -1351,6 +1369,9 @@
     <plurals name="a11y_todoBadgeCount">
         <item quantity="other">%s 個待辦項目</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="other">%s 個待辦事項</item>
+    </plurals>
     <string name="noAnnotationSelected">未選擇任何註釋</string>
     <string name="emailNotifications">電子郵件通知</string>
     <string name="emailNotificationsImmediately">立即</string>
@@ -1632,7 +1653,9 @@
     <string name="calendarNoEvents">今天並無活動！</string>
     <string name="calendarNoEventsDescription">看來是適合休息、放鬆和充電的一天。</string>
     <string name="userCalendarToDo">待辦事項</string>
+    <string name="userCalendarToDoNew">待辦事項</string>
     <string name="courseToDo">%s 待辦事項</string>
+    <string name="courseToDoNew">%s 待辦事項</string>
     <string name="calendarEventExcused">已免除</string>
     <string name="calendarEventMissing">缺少</string>
     <string name="calendarEventGraded">已評分</string>
@@ -1657,21 +1680,30 @@
     <string name="a11y_eventCreatedAnnouncement">已成功建立事件 %s。</string>
     <string name="a11y_eventUpdatedAnnouncement">已成功更新事件 %s。</string>
     <string name="a11y_toDoCreatedAnnouncement">已成功建立待辦事項 %s。</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">已成功建立待辦事項 %s。</string>
     <string name="a11y_toDoUpdatedAnnouncement">已成功更新待辦事項 %s。</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">已成功更新待辦事項 %s。</string>
     <string name="todoScreenTitle">待辦事項</string>
+    <string name="todoScreenTitleNew">待辦事項</string>
     <string name="todoDateLabel">日期</string>
     <string name="todoDescriptionLabel">描述</string>
     <string name="todoDeleteConfirmationTitle">刪除待辦事項？</string>
+    <string name="todoDeleteConfirmationTitleNew">刪除待辦事項？</string>
     <string name="todoDeleteConfirmationText">這將永久刪除您的待辦事項。</string>
+    <string name="todoDeleteConfirmationTextNew">這將永久刪除您的待辦項目。</string>
     <string name="todoDeleteErrorMessage">刪除此待辦事項時出錯。請檢查您的連接然後重試。</string>
+    <string name="todoDeleteErrorMessageNew">刪除此待辦事項時發生錯誤。請檢查您的連線，然後再試一次。</string>
     <string name="createTodoScreenTitle">新待辦事項</string>
+    <string name="createTodoScreenTitleNew">新待辦事項</string>
     <string name="editTodoScreenTitle">編輯待辦事項</string>
+    <string name="editTodoScreenTitleNew">編輯待辦事項</string>
     <string name="createToDoTitleHint">添加標題</string>
     <string name="createToDoDateLabel">日期</string>
     <string name="createToDoTimeLabel">時間</string>
     <string name="createToDoCalendarLabel">行事曆</string>
     <string name="createToDoDetailsLabel">詳細資料</string>
     <string name="todoSaveErrorMessage">保存此待辦事項時出錯。請檢查您的連接然後重試。</string>
+    <string name="todoSaveErrorMessageNew">儲存此待辦事項時發生錯誤。請檢查您的連線，然後再試一次。</string>
     <string name="selectCalendarScreenTitle">選取行事曆</string>
     <string name="errorContentRetryButton">重試</string>
     <string name="eventLocationLabel">位置</string>
@@ -1679,6 +1711,7 @@
     <string name="eventDetailsLabel">詳細資料</string>
     <string name="errorLoadingEvent">載入此活動時出現問題。請檢查您的連接然後重試。</string>
     <string name="errorLoadingTodo">載入此待辦事項時出現問題。請檢查您的連接然後重試。</string>
+    <string name="errorLoadingTodoNew">儲存此待辦事項時發生問題。請檢查您的連線，然後再試一次。</string>
     <string name="eventDeleteConfirmationTitle">刪除事件？</string>
     <string name="eventDeleteConfirmationText">這將永久刪除您的活動。</string>
     <string name="eventDeleteErrorMessage">刪除此活動時發生錯誤。請檢查您的連接然後重試。</string>
@@ -1694,6 +1727,7 @@
     <string name="eventDeleteScopeAll">所有活動</string>
     <string name="eventDeleteScopeFollowing">此活動和所有後續活動</string>
     <string name="calendarAddToDo">添加到待辦事項</string>
+    <string name="calendarAddToDoNew">添加待辦事項</string>
     <string name="calendarAddEvent">添加活動</string>
     <string name="createEventScreenTitle">新活動</string>
     <string name="editEventScreenTitle">編輯事件</string>
@@ -2066,7 +2100,9 @@
     <string name="widgetNotLoggedInTitle">讓我們幫您登入！</string>
     <string name="widgetToDoNotLoggedInSubtitle">若要查看您的待辦事項，請在應用程式中登入您的帳戶。只需一秒鐘！</string>
     <string name="a11y_widgetToDoOpenToDoList">開啟待辦事項清單畫面</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">開啟待辦事項清單畫面</string>
     <string name="a11y_widgetToDoCreateNewToDo">建立新的待辦事項</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">建立新的待辦事項</string>
     <string name="widgetGradesErrorSubtitle">我們現在無法顯示您的成績。請稍後重試或前往應用程式。</string>
     <string name="widgetGradesNotLoggedInSubtitle">要查看您的成績，請在應用程式中登入您的帳戶。只需一秒鐘！</string>
     <string name="widgetSingleGradeErrorSubtitle">我們現在無法顯示您的成績。</string>
@@ -2074,6 +2110,19 @@
     <string name="widgetSingleGradeSelectCourse">讓我們選擇課程</string>
     <string name="widgetGradesErrorLoadingCourses">載入課程時發生錯誤。</string>
     <string name="settingsSwitchExperience">切換到 Canvas Career</string>
+    <string name="forecastWidgetTitle">每週摘要</string>
+    <string name="forecastWidgetWeekPeriod">第 %1$d 週 | %2$s</string>
+    <string name="forecastWidgetMissing">缺少</string>
+    <string name="forecastWidgetDue">截止</string>
+    <string name="forecastWidgetRecentGrades">最新成續</string>
+    <string name="forecastWidgetGradeWeight">最終評分 %d%%</string>
+    <string name="forecastWidgetErrorMessage">我們在載入您的作業時遇到問題。請檢查您的連接然後重試。</string>
+    <string name="forecastWidgetEmptyMissing">沒有缺少作業。您已讀完所有新訊息！</string>
+    <string name="forecastWidgetEmptyDue">本過沒有截止作業。</string>
+    <string name="forecastWidgetEmptyRecentGrades">本週沒有新的成績。</string>
+    <string name="a11y_contentDescription_previousWeek">上週</string>
+    <string name="a11y_contentDescription_nextWeek">下週</string>
+
     <string name="speedGraderGradeTabTitle">評分和評分標準</string>
     <string name="speedGraderDetailsTabTitle">詳細資料</string>
     <string name="a11y_contentDescription_expandPanel">展開面板</string>
@@ -2150,6 +2199,7 @@
     <string name="errorLoadingToDos">載入您的待辦項目時發生錯誤。請檢查您的連接然後重試。</string>
     <string name="errorUpdatingToDo">更新待辦項目時發生錯誤。請檢查您的連接然後重試。</string>
     <string name="noToDosForNow">目前沒有待辦事項！</string>
+    <string name="noToDosForNowNew">暫時沒有待辦事項！</string>
     <string name="noToDosForNowSubtext">看來是適合休息、放鬆和充電的時候。</string>
     <string name="todoSwipeDone">已完成</string>
     <string name="todoSwipeUndo">復原</string>
@@ -2160,8 +2210,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">待辦事項清單偏好設定</string>
+    <string name="todoFilterPreferencesNew">待辦事項清單偏好設定</string>
     <string name="todoFilterVisibleItems">可見項目</string>
     <string name="todoFilterShowPersonalToDos">顯示個人待辦事項</string>
+    <string name="todoFilterShowPersonalToDosNew">顯示個人待辦事項</string>
     <string name="todoFilterShowCalendarEvents">顯示行事曆事件</string>
     <string name="todoFilterShowCompleted">顯示已完成</string>
     <string name="todoFilterFavoriteCoursesOnly">僅顯示最愛課程</string>
@@ -2188,6 +2240,9 @@
     <string name="courseInvitationDeclineConfirmTitle">拒絕邀請</string>
     <string name="courseInvitationDeclineConfirmMessage">是否確定要拒絕 %s 邀請？</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">進行中</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">早上好，%s！</string>
@@ -2310,6 +2365,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">您好，%s</string>
 
+    <string name="courses_and_groups">課程和群組</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">自訂控制面板</string>
     <string name="dashboard_widgets">小部件</string>
@@ -2319,16 +2375,44 @@
     <string name="changing_dashboard_layout">變更控制面板佈局</string>
     <string name="changing_dashboard_layout_message">若要變更控制面板佈局，您必須重新啟動應用程式</string>
     <string name="restart_now">立即重新啟動</string>
+    <string name="turn_on_new_dashboard">啟用新的控制面板</string>
     <string name="switched_back">已切換回原來的佈局？</string>
     <string name="switched_back_message">感謝您試用新的控制面板！請問您切換回原來的佈局的原因是什麼？</string>
+    <string name="survey_option_hard_to_find">難以找到內容</string>
+    <string name="survey_option_prefer_old_layout">更喜歡舊版面</string>
+    <string name="survey_option_something_broken">出現問題</string>
     <string name="what_could_we_improve">我們可以改進哪些地方？</string>
+    <string name="what_do_you_think_of_new_dashboard">您覺得新的控制面板怎麼樣？</string>
+    <string name="let_us_know">請通知我們！</string>
+    <string name="no_app_to_handle_link">沒有可用的應用程式可以開啟此連結</string>
     <string name="skip">跳過</string>
     <string name="widget_setting_show_greeting">顯示問候語</string>
     <string name="background_color">背景顏色</string>
+    <string name="widget_setting_show_grades">課程成績</string>
+    <string name="widget_setting_show_color_overlay">課程顏色覆蓋</string>
     <string name="offline_content_available">離線內容可用</string>
     <string name="a11y_contentDescription_moreOptions">更多選項</string>
     <string name="customizeCourse">定制課程</string>
     <string name="favoriteCoursesAndGroups">最愛課程和群組</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">外部工具無法離線使用。</string>
+    <string name="widget_weekly_summary">每週摘要</string>
+
+    <string name="dashboardCourseNickname">暱稱</string>
+    <string name="dashboardCourseNicknameHint">在此寫入課程暱稱</string>
+    <string name="dashboardCourseColor">課程顏色</string>
+    <string name="widget_toDo">每日待辦事項</string>
+    <string name="dailyToDoWidgetTitle">每日待辦事項</string>
+    <string name="todoWidget_showCompleted">顯示已完成</string>
+    <string name="todoWidget_emptyTitle">您現在已全部完成！</string>
+    <string name="todoWidget_emptyMessage">看來您今天有空。\n是否要添加一些待辦事項？</string>
+    <string name="todoWidget_addTodo">添加待辦事項</string>
+    <string name="todoWidget_errorTitle">糟糕，出現問題</string>
+    <string name="todoWidget_errorMessage">我們無法載入您的待辦事項。\n請再試一次，或稍後返回。</string>
+    <string name="todoWidget_refresh">重新整理</string>
+    <string name="todoWidget_today">今天</string>
+    <string name="a11y_todoWidget_jumpToToday">跳到今天</string>
+    <string name="widgetSettings_widgetsColor">控制面板主色</string>
+    <string name="dashboard_globalAnnouncement">全域通告</string>
+    <string name="forecastWidget_currentWeek">本週</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-ca/strings.xml b/libs/pandares/src/main/res/values-ca/strings.xml
index 16114800c1..b2ec8105e1 100644
--- a/libs/pandares/src/main/res/values-ca/strings.xml
+++ b/libs/pandares/src/main/res/values-ca/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">L\'entrega ha fallat</string>
     <string name="submissionStatusFailedSubtitle">Toqueu per veure\'n els detalls</string>
     <string name="submissionAndRubric">Entrega i rúbrica</string>
+    <string name="submissionAndFeedback">Entrega i comentaris</string>
     <string name="commentsAndRubric">Comentaris i rúbrica</string>
     <string name="errorLoadingAssignment">S\'ha produït un problema en carregar aquesta activitat. Reviseu la connexió i torneu-ho a provar.</string>
     <string name="submitted">Entregat</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Avui</string>
+    <string name="tomorrow">Demà</string>
     <string name="past">Passat</string>
     <string name="noDate">Sense data</string>
     <string name="future">Futur</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monòleg</string>
     <string name="noItemsToDisplayShort">No hi ha cap element per mostrar</string>
     <string name="Todo">Tasques pendents</string>
+    <string name="TodoNew">Tasques pendents</string>
     <string name="todoFilter">Filtra les assignatures</string>
     <string name="filterByEllipsis">Filtra per&#8230;</string>
     <string name="favoriteCoursesLabel">Assignatures preferides</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grups</string>
     <string name="groupMembers">Membres del grup</string>
 
+    <string name="messageGroup">Envieu un missatge al grup</string>
     <string name="loading">S\'està carregant&#8230;</string>
     <string name="select_item_to_display">Seleccioneu a la llista</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Tasques pendents</string>
+    <string name="todoWidgetTitleNew">Tasques pendents</string>
     <string name="gradesWidgetTitle">Notes</string>
     <string name="notificationWidgetTitle">Notificacions</string>
     <string name="todoWidgetTitleLong">Canvas: tasques pendents</string>
+    <string name="todoWidgetTitleLongNew">Canvas: tasques pendents</string>
     <string name="gradesWidgetTitleLong">Canvas: notes</string>
     <string name="gradeWidgetTitleLong">Canvas: nota</string>
     <string name="notificationWidgetTitleLong">Canvas: notificacions</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Assignatures</string>
     <string name="toDoList">Llista de tasques pendents</string>
+    <string name="toDoListNew">Llista de Tasques pendents</string>
+
     <string name="notifications">Notificacions</string>
     <string name="pushNotifications">Notificacions d\'inserció</string>
     <string name="pushNotificationsError">No s\'han registrat les notificacions d\'inserció per a aquest dispositiu.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Obre SpeedGrader</string>
 
-    <string name="search_todo">llista de tasques pendents</string>
     <string name="search_course">assignatura assignatures classe classes</string>
     <string name="search_grades">nota notes</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">S\'ha d\'establir el títol de la pàgina.</string>
     <string name="pageDetails">Detalls de la pàgina</string>
     <string name="saving">S\'està desant</string>
+    <string name="speedGraderSaving">S\'està desant</string>
+    <string name="speedGraderSaved">S’ha desat</string>
+    <string name="speedGraderFailed">No s\'ha pogut</string>
+    <string name="speedGraderSaveErrorTitle">Ui, s’ha produït un error</string>
+    <string name="speedGraderSaveErrorMessage">S\'ha produït un error en desar la modificació de la nota Podeu tornar a provar-ho ara o més endavant.</string>
+    <string name="speedGraderSaveErrorContentDescription">No s’ha pogut desar la nota. Toqueu-hi per obtenir-ne informació.</string>
+
     <string name="confirmDeleteEvent">Segur que voleu suprimir aquest esdeveniment?</string>
     <string name="conferencesNotSupported">Encara no s\'admeten conferències als dispositius mòbils.</string>
     <string name="filePreviewContentDescription">Imatge de visualització prèvia de fitxer</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Enregistraments</string>
     <string name="conferenceInProgress">Conferència en curs</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferències (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conferència en curs</string>
+    <string name="conferencesWidgetDismissed">S’ha rebutjat la conferència</string>
     <string name="a11y_criterion_content_description">Classificació del criteri %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">més informació</string>
@@ -1376,6 +1394,10 @@
         <item quantity="one">%s element de Tasques pendents</item>
         <item quantity="other">%s elements de Tasques pendents</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s element de Tasques pendents</item>
+        <item quantity="other">%s elements de Tasques pendents</item>
+    </plurals>
     <string name="noAnnotationSelected">No hi ha cap anotació seleccionada</string>
     <string name="emailNotifications">Notificacions per correu electrònic</string>
     <string name="emailNotificationsImmediately">Immediatament</string>
@@ -1662,7 +1684,9 @@
     <string name="calendarNoEvents">Avui no hi ha cap esdeveniment.</string>
     <string name="calendarNoEventsDescription">Sembla un dia fabulós per descansar, relaxar-se i carregar piles.</string>
     <string name="userCalendarToDo">Tasques pendents</string>
+    <string name="userCalendarToDoNew">Tasques pendents</string>
     <string name="courseToDo">Tasques pendents de %s</string>
+    <string name="courseToDoNew">%s tasques pendents</string>
     <string name="calendarEventExcused">Justificat</string>
     <string name="calendarEventMissing">No presentat</string>
     <string name="calendarEventGraded">Qualificat</string>
@@ -1687,21 +1711,30 @@
     <string name="a11y_eventCreatedAnnouncement">S\'ha creat correctament l\'esdeveniment %s.</string>
     <string name="a11y_eventUpdatedAnnouncement">S\'ha actualitzat correctament l\'esdeveniment %s.</string>
     <string name="a11y_toDoCreatedAnnouncement">S\'ha creat correctament la llista de tasques pendents %s.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">S\'ha creat correctament la tasca pendent %s.</string>
     <string name="a11y_toDoUpdatedAnnouncement">S\'ha actualitzat correctament la llista de tasques pendents %s.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">S\'ha actualitzat correctament la tasca pendent %s.</string>
     <string name="todoScreenTitle">Tasques pendents</string>
+    <string name="todoScreenTitleNew">Tasques pendents</string>
     <string name="todoDateLabel">Data</string>
     <string name="todoDescriptionLabel">Descripció</string>
     <string name="todoDeleteConfirmationTitle">Voleu suprimir les tasques pendents?</string>
+    <string name="todoDeleteConfirmationTitleNew">Voleu suprimir les tasques pendents?</string>
     <string name="todoDeleteConfirmationText">Suprimireu permanentment l’element Tasques pendents.</string>
+    <string name="todoDeleteConfirmationTextNew">D\'aquesta manera, se suprimirà permanentment l’element de Tasques pendents.</string>
     <string name="todoDeleteErrorMessage">S\'ha produït un error en carregar aquestes tasques pendents. Reviseu la connexió i torneu a provar-ho.</string>
+    <string name="todoDeleteErrorMessageNew">S’ha produït un error en suprimir aquesta tasca pendent. Comproveu la connexió i torneu a provar-ho.</string>
     <string name="createTodoScreenTitle">Noves tasques pendents</string>
+    <string name="createTodoScreenTitleNew">Noves tasques pendents</string>
     <string name="editTodoScreenTitle">Edita les tasques pendents</string>
+    <string name="editTodoScreenTitleNew">Editeu les tasques pendents</string>
     <string name="createToDoTitleHint">Afegeix un títol</string>
     <string name="createToDoDateLabel">Data</string>
     <string name="createToDoTimeLabel">Hora</string>
     <string name="createToDoCalendarLabel">Calendari</string>
     <string name="createToDoDetailsLabel">Informació</string>
     <string name="todoSaveErrorMessage">S\'ha produït un error en desar aquestes tasques pendents. Reviseu la connexió i torneu a provar-ho.</string>
+    <string name="todoSaveErrorMessageNew">S’ha produït un error en desar aquesta tasca pendent. Comproveu la connexió i torneu a provar-ho.</string>
     <string name="selectCalendarScreenTitle">Selecciona un calendari</string>
     <string name="errorContentRetryButton">Torna a provar-ho</string>
     <string name="eventLocationLabel">Ubicació</string>
@@ -1709,6 +1742,7 @@
     <string name="eventDetailsLabel">Informació</string>
     <string name="errorLoadingEvent">S\'ha produït un problema en carregar aquest esdeveniment. Reviseu la connexió i torneu a provar-ho.</string>
     <string name="errorLoadingTodo">S\'ha produït un problema en carregar aquesta llista de tasques pendents. Reviseu la connexió i torneu a provar-ho.</string>
+    <string name="errorLoadingTodoNew">S’ha produït un error en carregar aquesta tasca pendent. Comproveu la connexió i torneu a provar-ho.</string>
     <string name="eventDeleteConfirmationTitle">Voleu suprimir l\'esdeveniment?</string>
     <string name="eventDeleteConfirmationText">D’aquesta manera, se suprimirà permanentment el vostre esdeveniment.</string>
     <string name="eventDeleteErrorMessage">S\'ha produït un error en suprimir aquest esdeveniment. Reviseu la connexió i torneu a provar-ho.</string>
@@ -1725,6 +1759,7 @@
     <string name="eventDeleteScopeAll">Tots els esdeveniments</string>
     <string name="eventDeleteScopeFollowing">Aquest i tots els esdeveniments següents</string>
     <string name="calendarAddToDo">Afegeix les tasques pendents</string>
+    <string name="calendarAddToDoNew">Afegiu-hi les tasques pendents</string>
     <string name="calendarAddEvent">Afegeix un esdeveniment</string>
     <string name="createEventScreenTitle">Esdeveniment nou</string>
     <string name="editEventScreenTitle">Edita l\'esdeveniment</string>
@@ -2103,7 +2138,9 @@
     <string name="widgetNotLoggedInTitle">Anem a fer que inicieu la sessió!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Per consultar les tasques pendents, inicieu la sessió al compte a l’aplicació. Només serà un segon!</string>
     <string name="a11y_widgetToDoOpenToDoList">Obriu la pantalla de la llista de tasques pendents</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Obriu la pantalla de la llista de tasques pendents</string>
     <string name="a11y_widgetToDoCreateNewToDo">Creeu una llista nova de tasques pendents</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Creeu una nova tasca pendent</string>
     <string name="widgetGradesErrorSubtitle">Estem tenint problemes per mostrar les vostres notes en aquest moment. Torneu a provar-ho d’aquí a uns instants o aneu a l’aplicació.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Per consultar les notes, inicieu la sessió al compte a l’aplicació. Només serà un segon!</string>
     <string name="widgetSingleGradeErrorSubtitle">Estem tenint problemes per mostrar les vostres notes en aquest moment.</string>
@@ -2111,6 +2148,19 @@
     <string name="widgetSingleGradeSelectCourse">Triem una assignatura</string>
     <string name="widgetGradesErrorLoadingCourses">S\'ha produït un error en carregar les assignatures.</string>
     <string name="settingsSwitchExperience">Canvia al Canvas Career</string>
+    <string name="forecastWidgetTitle">Resum setmanal</string>
+    <string name="forecastWidgetWeekPeriod">Setmana %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">No presentat</string>
+    <string name="forecastWidgetDue">Data de lliurament</string>
+    <string name="forecastWidgetRecentGrades">Notes noves</string>
+    <string name="forecastWidgetGradeWeight">Nota final de %d%%</string>
+    <string name="forecastWidgetErrorMessage">Tenim problemes per carregar les vostres activitats. Reviseu la connexió i torneu a provar-ho.</string>
+    <string name="forecastWidgetEmptyMissing">No hi ha cap activitat no presentada. Esteu completament al dia.</string>
+    <string name="forecastWidgetEmptyDue">No hi ha cap activitat que s’hagi de lliurar aquesta setmana.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No hi ha cap nota nova aquesta setmana.</string>
+    <string name="a11y_contentDescription_previousWeek">La setmana anterior</string>
+    <string name="a11y_contentDescription_nextWeek">La setmana que ve</string>
+
     <string name="speedGraderGradeTabTitle">Nota i rúbrica</string>
     <string name="speedGraderDetailsTabTitle">Informació</string>
     <string name="a11y_contentDescription_expandPanel">Desplegueu la subfinestra</string>
@@ -2189,6 +2239,7 @@
     <string name="errorLoadingToDos">S\'ha produït un error en carregar els elements de Tasques pendents. Reviseu la connexió i torneu a provar-ho.</string>
     <string name="errorUpdatingToDo">S\'ha produït un error en actualitzar l’element de Tasques pendents. Reviseu la connexió i torneu a provar-ho.</string>
     <string name="noToDosForNow">No hi ha cap tasca pendent per ara</string>
+    <string name="noToDosForNowNew">No hi ha cap tasca pendent per ara</string>
     <string name="noToDosForNowSubtext">Sembla un moment perfecte per descansar, relaxar-se i carregar les piles.</string>
     <string name="todoSwipeDone">Fet</string>
     <string name="todoSwipeUndo">Desfés-ho</string>
@@ -2199,8 +2250,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferències de la llista de tasques pendents</string>
+    <string name="todoFilterPreferencesNew">Preferències de la llista de tasques pendents</string>
     <string name="todoFilterVisibleItems">Elements visibles</string>
     <string name="todoFilterShowPersonalToDos">Mostreu les tasques pendents personals</string>
+    <string name="todoFilterShowPersonalToDosNew">Mostreu les tasques pendents personals</string>
     <string name="todoFilterShowCalendarEvents">Mostreu els esdeveniments del calendari</string>
     <string name="todoFilterShowCompleted">Mostreu els elements finalitzats</string>
     <string name="todoFilterFavoriteCoursesOnly">Només les assignatures preferides</string>
@@ -2227,6 +2280,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Rebutgeu la invitació</string>
     <string name="courseInvitationDeclineConfirmMessage">Segur que voleu rebutjar la invitació a %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progrés</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Bon dia, %s!</string>
@@ -2349,6 +2405,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hola, %s</string>
 
+    <string name="courses_and_groups">Assignatures i grups</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personalitzeu el panell de control</string>
     <string name="dashboard_widgets">Ginys</string>
@@ -2358,16 +2415,44 @@
     <string name="changing_dashboard_layout">S’està canviant el disseny del panell de control</string>
     <string name="changing_dashboard_layout_message">Per canviar el disseny del panell de control, heu de reiniciar l\'aplicació</string>
     <string name="restart_now">Reinicia-la ara</string>
+    <string name="turn_on_new_dashboard">Activeu el panell de control nou</string>
     <string name="switched_back">Heu tornat a canviar a la versió anterior?</string>
     <string name="switched_back_message">Gràcies per provar el nou panell de control Podríeu indicar-nos per què heu tornat a canviar a la versió anterior?</string>
+    <string name="survey_option_hard_to_find">Costa cercar coses</string>
+    <string name="survey_option_prefer_old_layout">Prefereixo el disseny antic</string>
+    <string name="survey_option_something_broken">Alguna cosa no ha anat bé</string>
     <string name="what_could_we_improve">Què podríem millorar?</string>
+    <string name="what_do_you_think_of_new_dashboard">Què penseu del panell de control nou?</string>
+    <string name="let_us_know">Feu-nos-ho saber!</string>
+    <string name="no_app_to_handle_link">No hi ha cap aplicació disponible per obrir aquest enllaç</string>
     <string name="skip">Omet-ho</string>
     <string name="widget_setting_show_greeting">Mostreu la salutació</string>
     <string name="background_color">Color del fons</string>
+    <string name="widget_setting_show_grades">Notes de l\'assignatura</string>
+    <string name="widget_setting_show_color_overlay">Superposició dels colors de l\'assignatura</string>
     <string name="offline_content_available">Hi ha contingut sense connexió disponible</string>
     <string name="a11y_contentDescription_moreOptions">Més opcions</string>
     <string name="customizeCourse">Personalitzeu l\'assignatura</string>
     <string name="favoriteCoursesAndGroups">Assignatures i grups preferits</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Les eines externes no estan disponibles sense connexió.</string>
+    <string name="widget_weekly_summary">Resum setmanal</string>
+
+    <string name="dashboardCourseNickname">Àlies</string>
+    <string name="dashboardCourseNicknameHint">Escriviu aquí l’àlies per a l’assignatura</string>
+    <string name="dashboardCourseColor">Color de l\'assignatura</string>
+    <string name="widget_toDo">Tasques pendents diàries</string>
+    <string name="dailyToDoWidgetTitle">Tasques pendents diàries</string>
+    <string name="todoWidget_showCompleted">Mostreu els elements finalitzats</string>
+    <string name="todoWidget_emptyTitle">Ja ho teniu tot fet de moment!</string>
+    <string name="todoWidget_emptyMessage">Sembla que aquest dia esteu lliure.\nVoleu afegir-hi alguna tasca pendent?</string>
+    <string name="todoWidget_addTodo">Afegiu-hi les tasques pendents</string>
+    <string name="todoWidget_errorTitle">Ui, s’ha produït un error</string>
+    <string name="todoWidget_errorMessage">No hem pogut carregar les tasques pendents.\nProveu-ho de nou o torneu més endavant.</string>
+    <string name="todoWidget_refresh">Actualitza-ho</string>
+    <string name="todoWidget_today">Avui</string>
+    <string name="a11y_todoWidget_jumpToToday">Salteu a Avui</string>
+    <string name="widgetSettings_widgetsColor">Color principal del panell de control</string>
+    <string name="dashboard_globalAnnouncement">Anunci global</string>
+    <string name="forecastWidget_currentWeek">Setmana actual</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-cy/strings.xml b/libs/pandares/src/main/res/values-cy/strings.xml
index b78f20c902..5d4706c2b3 100644
--- a/libs/pandares/src/main/res/values-cy/strings.xml
+++ b/libs/pandares/src/main/res/values-cy/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Cyflwyniad wedi methu</string>
     <string name="submissionStatusFailedSubtitle">Tapiwch i weld manylion</string>
     <string name="submissionAndRubric">Cyflwyniad a Chyfarwyddyd Sgorio</string>
+    <string name="submissionAndFeedback">Cyflwyniad ac Adborth</string>
     <string name="commentsAndRubric">Sylwadau a Chyfarwyddyd Sgorio</string>
     <string name="errorLoadingAssignment">Problem wrth lwytho’r aseiniad hwn. Gwiriwch eich cysylltiad a rhoi cynnig arall arni.</string>
     <string name="submitted">Wedi Cyflwyno</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Heddiw</string>
+    <string name="tomorrow">Yfory</string>
     <string name="past">Ddoe</string>
     <string name="noDate">Dim Dyddiad</string>
     <string name="future">Yn y Dyfodol</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Dim eitemau i’w dangos</string>
     <string name="Todo">Tasgau i’w Gwneud</string>
+    <string name="TodoNew">Tasg i’w Gwneud</string>
     <string name="todoFilter">Hidlo Cyrsiau</string>
     <string name="filterByEllipsis">Hidlo yn ôl&#8230;</string>
     <string name="favoriteCoursesLabel">Hoff Gyrsiau</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grwpiau</string>
     <string name="groupMembers">Aelodau Grŵp</string>
 
+    <string name="messageGroup">Anfon neges at grŵp</string>
     <string name="loading">Wrthi’n llwytho&#8230;</string>
     <string name="select_item_to_display">Dewis o’r rhestr</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Tasgau i’w Gwneud</string>
+    <string name="todoWidgetTitleNew">Tasg i’w Gwneud</string>
     <string name="gradesWidgetTitle">Graddau</string>
     <string name="notificationWidgetTitle">Hysbysiadau</string>
     <string name="todoWidgetTitleLong">Canvas - Tasgau i’w Gwneud</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Tasgau i’w Gwneud</string>
     <string name="gradesWidgetTitleLong">Canvas - Graddau</string>
     <string name="gradeWidgetTitleLong">Canvas - Gradd</string>
     <string name="notificationWidgetTitleLong">Canvas - Hysbysiadau</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Cyrsiau</string>
     <string name="toDoList">Rhestr Tasgau i’w Gwneud</string>
+    <string name="toDoListNew">Rhestr Tasgau i’w Gwneud</string>
+
     <string name="notifications">Hysbysiadau</string>
     <string name="pushNotifications">Hysbysiadau Marchnata</string>
     <string name="pushNotificationsError">Dydy Hysbysiadau Marchnata ddim wedi cael eu cofrestru ar gyfer y dyfais hwn.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Agor SpeedGrader</string>
 
-    <string name="search_todo">Rhestr tasgau i’w gwneud</string>
     <string name="search_course">cwrs cyrsiau dosbarth dosbarthiadau</string>
     <string name="search_grades">gradd graddau</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Rhaid gosod teitl y dudalen.</string>
     <string name="pageDetails">Manylion y Dudalen</string>
     <string name="saving">Wrthi’n cadw</string>
+    <string name="speedGraderSaving">Wrthi\'n cadw</string>
+    <string name="speedGraderSaved">Wedi Cadw</string>
+    <string name="speedGraderFailed">Wedi Methu</string>
+    <string name="speedGraderSaveErrorTitle">Wps, aeth rhywbeth o\'i le</string>
+    <string name="speedGraderSaveErrorMessage">Gwall wrth gadw eich addasiad gradd. Gallwch chi roi cynnig arall arni nawr neu wedyn.</string>
+    <string name="speedGraderSaveErrorContentDescription">Wedi methu cadw\'r radd. Tapiwch i gael manylion.</string>
+
     <string name="confirmDeleteEvent">Ydych chi’n siŵr eich bod am ddileu’r digwyddiad hwn?</string>
     <string name="conferencesNotSupported">Does dim modd delio â chynadleddau ar ffonau symudol eto.</string>
     <string name="filePreviewContentDescription">Delwedd Rhagolwg o Ffeil</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Recordiad</string>
     <string name="conferenceInProgress">Cynhadledd ar waith</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Cynadleddau (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Cynhadledd ar waith</string>
+    <string name="conferencesWidgetDismissed">Cynhadledd wedi\'i diystyru</string>
     <string name="a11y_criterion_content_description">Sgoriau maen prawf %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">rhagor o wybodaeth</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s eitem i’w gwneud</item>
         <item quantity="other">%s eitem i’w gwneud</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s eitem i’w gwneud</item>
+        <item quantity="other">%s eitem i’w gwneud</item>
+    </plurals>
     <string name="noAnnotationSelected">Dim anodiad wedi’i ddewis</string>
     <string name="emailNotifications">Hysbysiadau E-bost</string>
     <string name="emailNotificationsImmediately">Yn syth</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Dim Digwyddiadau Heddiw!</string>
     <string name="calendarNoEventsDescription">Mae’n edrych fel diwrnod gwych i orffwys, ymlacio a dod at eich hun.</string>
     <string name="userCalendarToDo">Tasgau i’w Gwneud</string>
+    <string name="userCalendarToDoNew">Tasg i’w Gwneud</string>
     <string name="courseToDo">%s I’w Gwneud</string>
+    <string name="courseToDoNew">%s Tasg i\'w gwneud</string>
     <string name="calendarEventExcused">Wedi esgusodi</string>
     <string name="calendarEventMissing">Ar goll</string>
     <string name="calendarEventGraded">Wedi graddio</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Wedi llwyddo i greu %s digwyddiad.</string>
     <string name="a11y_eventUpdatedAnnouncement">Wedi llwyddo i ddiweddaru %s digwyddiad.</string>
     <string name="a11y_toDoCreatedAnnouncement">Wedi llwyddo i greu %s i’w wneud.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Wedi llwyddo i greu %s i’w wneud.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Wedi llwyddo diweddaru %s i’w wneud</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Wedi llwyddo diweddaru %s i’w wneud</string>
     <string name="todoScreenTitle">Tasgau i’w Gwneud</string>
+    <string name="todoScreenTitleNew">Tasg i’w Gwneud</string>
     <string name="todoDateLabel">Dyddiad</string>
     <string name="todoDescriptionLabel">Disgrifiad</string>
     <string name="todoDeleteConfirmationTitle">Dileu I’w Gwneud?</string>
+    <string name="todoDeleteConfirmationTitleNew">Dileu Tasg i’w Gwneud?</string>
     <string name="todoDeleteConfirmationText">Bydd hyn yn dileu eich eitem I’w Gwneud yn barhaol.</string>
+    <string name="todoDeleteConfirmationTextNew">Bydd hyn yn dileu eich Eitem I’w Gwneud yn barhaol.</string>
     <string name="todoDeleteErrorMessage">Gwall wrth ddileu’r Dasg i’w Gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
+    <string name="todoDeleteErrorMessageNew">Cafwyd gwall wrth ddileu\'r dasg i\'w gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
     <string name="createTodoScreenTitle">Tasg Newydd i’w Gwneud</string>
+    <string name="createTodoScreenTitleNew">Tasg Newydd i’w Gwneud</string>
     <string name="editTodoScreenTitle">Golygu Tasg i’w Gwneud</string>
+    <string name="editTodoScreenTitleNew">Golygu Tasg i’w Gwneud</string>
     <string name="createToDoTitleHint">Ychwanegu teitl</string>
     <string name="createToDoDateLabel">Dyddiad</string>
     <string name="createToDoTimeLabel">Amser</string>
     <string name="createToDoCalendarLabel">Calendr</string>
     <string name="createToDoDetailsLabel">Manylion</string>
     <string name="todoSaveErrorMessage">Gwall wrth gadw’r Dasg i’w Gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
+    <string name="todoSaveErrorMessageNew">Cafwyd gwall wrth gadw\'r dasg i\'w gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
     <string name="selectCalendarScreenTitle">Dewis Calendr</string>
     <string name="errorContentRetryButton">Ailgynnig</string>
     <string name="eventLocationLabel">Lleoliad</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Manylion</string>
     <string name="errorLoadingEvent">Problem wrth lwytho’r digwyddiad hwn. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
     <string name="errorLoadingTodo">Problem wrth lwytho’r rhestr tasgau i\'w gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
+    <string name="errorLoadingTodoNew">Cafwyd problem wrth lwytho\'r dasg i\'w gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
     <string name="eventDeleteConfirmationTitle">Dileu’r Digwyddiad?</string>
     <string name="eventDeleteConfirmationText">Bydd hyn yn dileu’r digwyddiad yn barhaol.</string>
     <string name="eventDeleteErrorMessage">Gwall wrth ddileu’r digwyddiad hwn. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Pob digwyddiad</string>
     <string name="eventDeleteScopeFollowing">Y digwyddiad hwn a phob digwyddiad canlynol</string>
     <string name="calendarAddToDo">Ychwanegu Tasg i’w Gwneud</string>
+    <string name="calendarAddToDoNew">Ychwanegu Tasg i\'w Gwneud</string>
     <string name="calendarAddEvent">Ychwanegu Digwyddiad</string>
     <string name="createEventScreenTitle">Digwyddiad Newydd</string>
     <string name="editEventScreenTitle">Golygu Digwyddiad</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Dewch i ni Fewngofnodi!</string>
     <string name="widgetToDoNotLoggedInSubtitle">I weld eich pethau i’w gwneud, mewngofnodwch i’ch cyfrif ar yr ap. Fyddwch chi ddim chwinciad!</string>
     <string name="a11y_widgetToDoOpenToDoList">Agor sgrin y rhestr I’w Gwneud</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Agor sgrin y rhestr tasgau i\'w gwneud</string>
     <string name="a11y_widgetToDoCreateNewToDo">Creu Tasg newydd i’w Gwneud</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Creu tasg newydd i’w gwneud</string>
     <string name="widgetGradesErrorSubtitle">Rydyn ni’n cael trafferth dangos eich graddau ar hyn o bryd. Rhowch gynnig arall arni nes ymlaen neu ewch i’r ap.</string>
     <string name="widgetGradesNotLoggedInSubtitle">I weld eich graddau, mewngofnodwch i’ch cyfrif ar yr ap. Fyddwch chi ddim chwinciad!</string>
     <string name="widgetSingleGradeErrorSubtitle">Rydyn ni’n cael trafferth dangos eich graddau ar hyn o bryd.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Dewch i ni ddewis cwrs</string>
     <string name="widgetGradesErrorLoadingCourses">Gwall wrth lwytho cyrsiau.</string>
     <string name="settingsSwitchExperience">Newid i Canvas Career</string>
+    <string name="forecastWidgetTitle">Crynodeb Wythnosol</string>
+    <string name="forecastWidgetWeekPeriod">Wythnos %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Ar goll</string>
+    <string name="forecastWidgetDue">Erbyn</string>
+    <string name="forecastWidgetRecentGrades">Graddau Newydd</string>
+    <string name="forecastWidgetGradeWeight">%d%% y radd derfynol</string>
+    <string name="forecastWidgetErrorMessage">Rydym yn cael trafferth llwytho eich aseiniadau. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
+    <string name="forecastWidgetEmptyMissing">Dim aseiniadau ar goll. Rydych chi wedi dal i fyny!</string>
+    <string name="forecastWidgetEmptyDue">Dim aseiniadau yn ddyledus yr wythnos hon.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Dim graddau newydd wythnos yma.</string>
+    <string name="a11y_contentDescription_previousWeek">Yr wythnos flaenorol</string>
+    <string name="a11y_contentDescription_nextWeek">Yr wythnos nesaf</string>
+
     <string name="speedGraderGradeTabTitle">Gradd; a Chyfarwyddyd Sgorio</string>
     <string name="speedGraderDetailsTabTitle">Manylion</string>
     <string name="a11y_contentDescription_expandPanel">Ehangu\'r panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Gwall wrth lwytho eich eitemau i’w gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
     <string name="errorUpdatingToDo">Gwall wrth ddiweddaru’r eitem i\'w gwneud. Gwiriwch eich cysylltiad a rhowch gynnig arall arni.</string>
     <string name="noToDosForNow">Does dim eitemau i’w gwneud ar hyn o bryd!</string>
+    <string name="noToDosForNowNew">Dim tasgau i’w gwneud ar hyn o bryd!</string>
     <string name="noToDosForNowSubtext">Mae’n edrych fel amser gwych i orffwys, ymlacio a dod atoch eich hun.</string>
     <string name="todoSwipeDone">Wedi gorffen</string>
     <string name="todoSwipeUndo">Dad-wneud</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Dewisiadau rhestr i’w Gwneud</string>
+    <string name="todoFilterPreferencesNew">Dewisiadau rhestr tasgau i’w gwneud</string>
     <string name="todoFilterVisibleItems">Eitemau Gweladwy</string>
     <string name="todoFilterShowPersonalToDos">Dangos Eitemau Personol i\'w Gwneud</string>
+    <string name="todoFilterShowPersonalToDosNew">Dangos rhestr Tasgau i’w Gwneud Personol</string>
     <string name="todoFilterShowCalendarEvents">Dangos Digwyddiadau Calendr</string>
     <string name="todoFilterShowCompleted">Dangos rhai sydd wedi\'u Cwblhau</string>
     <string name="todoFilterFavoriteCoursesOnly">Hoff Gyrsiau yn unig</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Gwrthod Gwahoddiad</string>
     <string name="courseInvitationDeclineConfirmMessage">Ydych chi’n siŵr eich bod am wrthod y gwahoddiad i %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Cynnydd</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Bore da, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Helo, %s</string>
 
+    <string name="courses_and_groups">Cyrsiau a Grwpiau</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Addasu Dangosfwrdd</string>
     <string name="dashboard_widgets">Teclynnau</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Wrthi’n newid cynllun y dangosfwrdd</string>
     <string name="changing_dashboard_layout_message">I newid cynllun y dangosfwrdd, mae\'n rhaid i chi ailddechrau’r rhaglen</string>
     <string name="restart_now">Ailddechrau nawr</string>
+    <string name="turn_on_new_dashboard">Rhoi\'r dangosfwrdd newydd ar waith</string>
     <string name="switched_back">Wedi newid yn ôl?</string>
     <string name="switched_back_message">Diolch am roi cynnig ar y dangosfwrdd newydd! Allech chi ddweud wrthyn ni pam eich bod wedi newid yn ôl?</string>
+    <string name="survey_option_hard_to_find">Anodd dod o hyd i bethau</string>
+    <string name="survey_option_prefer_old_layout">Well gen i\'r hen gynllun</string>
+    <string name="survey_option_something_broken">Doedd rhywbeth ddim wedi gweithio\'n iawn</string>
     <string name="what_could_we_improve">Beth allen ni ei wella?</string>
+    <string name="what_do_you_think_of_new_dashboard">Beth yw eich barn chi am y dangosfwrdd newydd?</string>
+    <string name="let_us_know">Rhowch wybod i ni!</string>
+    <string name="no_app_to_handle_link">Does dim ap ar gael i agor y ddolen hon</string>
     <string name="skip">Anwybyddu</string>
     <string name="widget_setting_show_greeting">Dangos cyfarchiad</string>
     <string name="background_color">Lliw\'r cefndir</string>
+    <string name="widget_setting_show_grades">Graddau Cwrs</string>
+    <string name="widget_setting_show_color_overlay">Gorchudd Lliw Cwrs</string>
     <string name="offline_content_available">Cynnwys all-lein ar gael</string>
     <string name="a11y_contentDescription_moreOptions">Mwy o opsiynau</string>
     <string name="customizeCourse">Personoli Cwrs</string>
     <string name="favoriteCoursesAndGroups">Hoff Gyrsiau a Grwpiau</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Nid yw Adnoddau Allanol ar gael all-lein.</string>
+    <string name="widget_weekly_summary">Crynodeb Wythnosol</string>
+
+    <string name="dashboardCourseNickname">Llysenw</string>
+    <string name="dashboardCourseNicknameHint">Ysgrifennwch lysenw’r cwrs yma</string>
+    <string name="dashboardCourseColor">Lliw Cwrs</string>
+    <string name="widget_toDo">I\'w Gwneud – Dyddiol</string>
+    <string name="dailyToDoWidgetTitle">I\'w Gwneud – Dyddiol</string>
+    <string name="todoWidget_showCompleted">Dangos rhai sydd wedi\'u Cwblhau</string>
+    <string name="todoWidget_emptyTitle">Rydych chi wedi gorffen popeth am y tro!</string>
+    <string name="todoWidget_emptyMessage">Mae\'n ymddangos eich bod chi\'n rhydd heddiw.\nYdych chi am ychwanegu tasgau i\'w gwneud?</string>
+    <string name="todoWidget_addTodo">Ychwanegu Tasg i\'w Gwneud</string>
+    <string name="todoWidget_errorTitle">Wps, aeth rhywbeth o\'i le</string>
+    <string name="todoWidget_errorMessage">Doedd dim modd i ni lwytho eich Tasgau i\'w Gwneud.\nRhowch gynnig arall arni neu ddod yn ôl rywbryd eto.</string>
+    <string name="todoWidget_refresh">Adnewyddu</string>
+    <string name="todoWidget_today">Heddiw</string>
+    <string name="a11y_todoWidget_jumpToToday">Neidio i heddiw</string>
+    <string name="widgetSettings_widgetsColor">Prif Liw\'r Dangosfwrdd</string>
+    <string name="dashboard_globalAnnouncement">Cyhoeddiad Cyffredinol</string>
+    <string name="forecastWidget_currentWeek">Wythnos gyfredol</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-da/strings.xml b/libs/pandares/src/main/res/values-da/strings.xml
index 738f5bb980..e32a8cecdd 100644
--- a/libs/pandares/src/main/res/values-da/strings.xml
+++ b/libs/pandares/src/main/res/values-da/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Aflevering mislykkedes</string>
     <string name="submissionStatusFailedSubtitle">Tryk for at se detaljer</string>
     <string name="submissionAndRubric">Aflevering og rubrik</string>
+    <string name="submissionAndFeedback">Indsendelse og feedback</string>
     <string name="commentsAndRubric">Kommentarer og rubrik</string>
     <string name="errorLoadingAssignment">Der opstod et problem med at indlæse denne opgave. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="submitted">Afleveret</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">I dag</string>
+    <string name="tomorrow">I morgen</string>
     <string name="past">Tidligere</string>
     <string name="noDate">Ingen dato</string>
     <string name="future">Fremtid</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Ingen elementer for visning</string>
     <string name="Todo">Opgaveliste</string>
+    <string name="TodoNew">Element på opgaveliste</string>
     <string name="todoFilter">Filtrer fag</string>
     <string name="filterByEllipsis">Sorter efter &#8230;</string>
     <string name="favoriteCoursesLabel">Favoritfag</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupper</string>
     <string name="groupMembers">Gruppemedlemmer</string>
 
+    <string name="messageGroup">Send besked til gruppe</string>
     <string name="loading">Indlæser&#8230;</string>
     <string name="select_item_to_display">Vælg fra listen</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Opgaveliste</string>
+    <string name="todoWidgetTitleNew">Element på opgaveliste</string>
     <string name="gradesWidgetTitle">Karakterer</string>
     <string name="notificationWidgetTitle">Notifikationer</string>
     <string name="todoWidgetTitleLong">Canvas - Opgaveliste</string>
+    <string name="todoWidgetTitleLongNew">Canvas – Opgaveliste</string>
     <string name="gradesWidgetTitleLong">Canvas - Karakterer</string>
     <string name="gradeWidgetTitleLong">Canvas – Karakter</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifikationer</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Fag</string>
     <string name="toDoList">Opgaveliste</string>
+    <string name="toDoListNew">Opgaveliste</string>
+
     <string name="notifications">Notifikationer</string>
     <string name="pushNotifications">Push notifikationer</string>
     <string name="pushNotificationsError">Push-meddelelser er ikke blevet registreret for denne enhed.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Åbn SpeedGrader</string>
 
-    <string name="search_todo">at gøre at gøre at gøre at gøre liste</string>
     <string name="search_course">kursus kuser klasse klasser</string>
     <string name="search_grades">karakter karakterer</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Sidens titel skal indstilles.</string>
     <string name="pageDetails">Sidedetaljer</string>
     <string name="saving">Gemmer</string>
+    <string name="speedGraderSaving">Gemmer</string>
+    <string name="speedGraderSaved">Gemt</string>
+    <string name="speedGraderFailed">Mislykkedes</string>
+    <string name="speedGraderSaveErrorTitle">Ups, noget gik galt</string>
+    <string name="speedGraderSaveErrorMessage">Der opstod en fejl under lagring af karakterændringen. Du kan prøve igen nu eller senere.</string>
+    <string name="speedGraderSaveErrorContentDescription">Karakteren kunne ikke gemmes. Tryk for at få nærmere oplysninger.</string>
+
     <string name="confirmDeleteEvent">Er du sikker på, du vil slette denne begivenhed?</string>
     <string name="conferencesNotSupported">Konferencer understøttes endnu ikke på mobil.</string>
     <string name="filePreviewContentDescription">Forhåndsvisning af fil-billede</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Optagelser</string>
     <string name="conferenceInProgress">Konference i gang</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferencer (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Konference i gang</string>
+    <string name="conferencesWidgetDismissed">Konferencen afvist</string>
     <string name="a11y_criterion_content_description">Kriteriebedømmelse %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">yderligere oplysninger</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s element på opgavelisten</item>
         <item quantity="other">%s elementer på opgavelisten</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s element på opgavelisten</item>
+        <item quantity="other">%s elementer på opgavelisten</item>
+    </plurals>
     <string name="noAnnotationSelected">Der er ikke valgt nogen anmærkning</string>
     <string name="emailNotifications">E-mail-meddelelser</string>
     <string name="emailNotificationsImmediately">Straks</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Ingen begivenheder i dag!</string>
     <string name="calendarNoEventsDescription">Det er en alle tiders dag til at tage den med ro og slappe af.</string>
     <string name="userCalendarToDo">Opgaveliste</string>
+    <string name="userCalendarToDoNew">At gøre</string>
     <string name="courseToDo">%s Opgaveliste</string>
+    <string name="courseToDoNew">%s opgaveliste</string>
     <string name="calendarEventExcused">Undskyldt</string>
     <string name="calendarEventMissing">Mangler</string>
     <string name="calendarEventGraded">Bedømt</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Begivenhed %s blev oprettet.</string>
     <string name="a11y_eventUpdatedAnnouncement">Begivenhed %s blev opdateret.</string>
     <string name="a11y_toDoCreatedAnnouncement">Opgaveliste %s blev oprettet.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Element på opgaveliste %s blev oprettet.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Opgaveliste %s blev opdateret.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Element på opgaveliste %s blev opdateret.</string>
     <string name="todoScreenTitle">Opgaveliste</string>
+    <string name="todoScreenTitleNew">At gøre</string>
     <string name="todoDateLabel">Dato</string>
     <string name="todoDescriptionLabel">Beskrivelse</string>
     <string name="todoDeleteConfirmationTitle">Slet opgave?</string>
+    <string name="todoDeleteConfirmationTitleNew">Slet opgave?</string>
     <string name="todoDeleteConfirmationText">Du sletter din opgave permanent.</string>
+    <string name="todoDeleteConfirmationTextNew">Dette vil slette dit element på opgavelisten permanent.</string>
     <string name="todoDeleteErrorMessage">Der opstod en fejl under sletning af denne opgaveliste. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="todoDeleteErrorMessageNew">Der opstod en fejl under sletning af dette element på opgavelisten. Tjek din forbindelse, og prøv igen.</string>
     <string name="createTodoScreenTitle">Nyt på opgavelisten</string>
+    <string name="createTodoScreenTitleNew">Ny opgave</string>
     <string name="editTodoScreenTitle">Rediger opgavelisten</string>
+    <string name="editTodoScreenTitleNew">Rediger opgave</string>
     <string name="createToDoTitleHint">Tilføj titel</string>
     <string name="createToDoDateLabel">Dato</string>
     <string name="createToDoTimeLabel">Tidspunkt</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Nærmere oplysninger</string>
     <string name="todoSaveErrorMessage">Der opstod en fejl ved lagring af denne opgaveliste. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="todoSaveErrorMessageNew">Der opstod en fejl under lagring af dette element på opgavelisten. Tjek din forbindelse, og prøv igen.</string>
     <string name="selectCalendarScreenTitle">Vælg kalender</string>
     <string name="errorContentRetryButton">Prøv igen</string>
     <string name="eventLocationLabel">Placering</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Nærmere oplysninger</string>
     <string name="errorLoadingEvent">Der opstod et problem under indlæsning af denne begivenhed. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="errorLoadingTodo">Der opstod et problem med at indlæse denne opgave. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="errorLoadingTodoNew">Der opstod en fejl under indlæsning af dette element på opgavelisten. Tjek din forbindelse, og prøv igen.</string>
     <string name="eventDeleteConfirmationTitle">Slet begivenhed?</string>
     <string name="eventDeleteConfirmationText">Dette sletter din begivenhed permanent.</string>
     <string name="eventDeleteErrorMessage">Der opstod en fejl under sletning af denne begivenhed. Kontrollér forbindelsen, og prøv igen.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Alle begivenheder</string>
     <string name="eventDeleteScopeFollowing">Denne og alle efterfølgende begivenheder</string>
     <string name="calendarAddToDo">Tilføj til opgaveliste</string>
+    <string name="calendarAddToDoNew">Tilføj opgave</string>
     <string name="calendarAddEvent">Tilføj begivenhed</string>
     <string name="createEventScreenTitle">Ny begivenhed</string>
     <string name="editEventScreenTitle">Rediger begivenhed</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Lad os få dig logget ind!</string>
     <string name="widgetToDoNotLoggedInSubtitle">For at se din opgaveliste skal du logge ind på din konto i appen. Det tager kun et øjeblik!</string>
     <string name="a11y_widgetToDoOpenToDoList">Åbn skærmen med opgavelisten</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Åbn skærmen med opgavelisten</string>
     <string name="a11y_widgetToDoCreateNewToDo">Opret ny opgave</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Opret nyt element på opgavelisten</string>
     <string name="widgetGradesErrorSubtitle">Vi har problemer med at vise dine karakterer lige nu. Prøv igen om lidt, eller brug appen.</string>
     <string name="widgetGradesNotLoggedInSubtitle">For at se dine karakterer skal du logge ind på din konto i appen. Det tager kun et øjeblik!</string>
     <string name="widgetSingleGradeErrorSubtitle">Vi har problemer med at vise dine karakterer lige nu.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Lad os vælge et fag</string>
     <string name="widgetGradesErrorLoadingCourses">Der opstod en fejl under indlæsning af fag.</string>
     <string name="settingsSwitchExperience">Skift til Canvas Career</string>
+    <string name="forecastWidgetTitle">Ugentlig oversigt</string>
+    <string name="forecastWidgetWeekPeriod">Uge %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Mangler</string>
+    <string name="forecastWidgetDue">Forfalder</string>
+    <string name="forecastWidgetRecentGrades">Nye karakterer</string>
+    <string name="forecastWidgetGradeWeight">%d%% af den endelige karakter</string>
+    <string name="forecastWidgetErrorMessage">Vi har problemer med at indlæse dine opgaver. Kontrollér forbindelsen, og prøv igen.</string>
+    <string name="forecastWidgetEmptyMissing">Ingen manglende opgaver. Du har set det hele!</string>
+    <string name="forecastWidgetEmptyDue">Ingen opgaver skal afleveres i denne uge</string>
+    <string name="forecastWidgetEmptyRecentGrades">Ingen nye karakterer i denne uge.</string>
+    <string name="a11y_contentDescription_previousWeek">Forrige uge</string>
+    <string name="a11y_contentDescription_nextWeek">Næste uge</string>
+
     <string name="speedGraderGradeTabTitle">Karakter og rubrik</string>
     <string name="speedGraderDetailsTabTitle">Nærmere oplysninger</string>
     <string name="a11y_contentDescription_expandPanel">Udvid panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Der opstod en fejl under indlæsning af dine elementer på opgavelisten. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="errorUpdatingToDo">Der opstod en fejl under indlæsning af dit element på opgavelisten. Kontrollér forbindelsen, og prøv igen.</string>
     <string name="noToDosForNow">Ingen elementer på opgavelisten indtil videre!</string>
+    <string name="noToDosForNowNew">Ingen elementer på opgavelisten for nu!</string>
     <string name="noToDosForNowSubtext">Det ser ud til at være et godt tidspunkt til at hvile sig og slappe af.</string>
     <string name="todoSwipeDone">Udført</string>
     <string name="todoSwipeUndo">Fortryd</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Præferencer for opgavelister</string>
+    <string name="todoFilterPreferencesNew">Præferencer for opgaveliste</string>
     <string name="todoFilterVisibleItems">Synlige elementer</string>
     <string name="todoFilterShowPersonalToDos">Vis personlig opgaveliste</string>
+    <string name="todoFilterShowPersonalToDosNew">Vis personlig opgaveliste</string>
     <string name="todoFilterShowCalendarEvents">Vis kalenderbegivenheder</string>
     <string name="todoFilterShowCompleted">Vis afsluttet</string>
     <string name="todoFilterFavoriteCoursesOnly">Kun favoritfag</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Afvis invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Er du sikker på, at du vil afvise invitationen til %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Fremskridt</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Godmorgen %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hej %s</string>
 
+    <string name="courses_and_groups">Fag og grupper</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Tilpas oversigt</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Skift oversigtens layout</string>
     <string name="changing_dashboard_layout_message">For at skifte oversigtens layout skal du genstarte applikationen.</string>
     <string name="restart_now">Genstart nu</string>
+    <string name="turn_on_new_dashboard">Aktiver den nye oversigt til</string>
     <string name="switched_back">Skiftede tilbage?</string>
     <string name="switched_back_message">Tak, fordi du prøvede den nye oversigt! Kan du fortælle os, hvorfor du skiftede tilbage?</string>
+    <string name="survey_option_hard_to_find">Svært at finde ting</string>
+    <string name="survey_option_prefer_old_layout">Foretrækker det gamle layout</string>
+    <string name="survey_option_something_broken">Noget fungerede ikke rigtigt</string>
     <string name="what_could_we_improve">Hvad kunne vi forbedre?</string>
+    <string name="what_do_you_think_of_new_dashboard">Hvad synes du om den nye oversigt?</string>
+    <string name="let_us_know">Fortæl os det!</string>
+    <string name="no_app_to_handle_link">Ingen app tilgængelig til at åbne dette link</string>
     <string name="skip">Spring over</string>
     <string name="widget_setting_show_greeting">Vis hilsen</string>
     <string name="background_color">Baggrundsfarve</string>
+    <string name="widget_setting_show_grades">Fagets karakterer</string>
+    <string name="widget_setting_show_color_overlay">Farveoverlejring for faget</string>
     <string name="offline_content_available">Offlineindhold tilgængeligt</string>
     <string name="a11y_contentDescription_moreOptions">Flere indstillinger:</string>
     <string name="customizeCourse">Tilpas fag</string>
     <string name="favoriteCoursesAndGroups">Favoritfag og -grupper</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Eksterne værktøjer er ikke tilgængelige offline.</string>
+    <string name="widget_weekly_summary">Ugentlig oversigt</string>
+
+    <string name="dashboardCourseNickname">Alias</string>
+    <string name="dashboardCourseNicknameHint">Skriv fagets navn her</string>
+    <string name="dashboardCourseColor">Fagets farve</string>
+    <string name="widget_toDo">Daglig opgaveliste</string>
+    <string name="dailyToDoWidgetTitle">Daglig opgaveliste</string>
+    <string name="todoWidget_showCompleted">Vis afsluttet</string>
+    <string name="todoWidget_emptyTitle">Du er færdig for nu!</string>
+    <string name="todoWidget_emptyMessage">Det ser ud til, at du har fri denne dag.\nVil du tilføje noget til opgavelisten?</string>
+    <string name="todoWidget_addTodo">Tilføj opgave</string>
+    <string name="todoWidget_errorTitle">Ups, noget gik galt</string>
+    <string name="todoWidget_errorMessage">Vi kunne ikke indlæse din opgaveliste.\nPrøv igen, eller kom tilbage senere.</string>
+    <string name="todoWidget_refresh">Opdater</string>
+    <string name="todoWidget_today">I dag</string>
+    <string name="a11y_todoWidget_jumpToToday">Spring til i dag</string>
+    <string name="widgetSettings_widgetsColor">Oversigtens hovedfarve</string>
+    <string name="dashboard_globalAnnouncement">Generel besked</string>
+    <string name="forecastWidget_currentWeek">Aktuel uge</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-de/strings.xml b/libs/pandares/src/main/res/values-de/strings.xml
index 1e1a0df87a..a3c6ad2f79 100644
--- a/libs/pandares/src/main/res/values-de/strings.xml
+++ b/libs/pandares/src/main/res/values-de/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Abgabe fehlgeschlagen</string>
     <string name="submissionStatusFailedSubtitle">Zum Anzeigen der Details antippen</string>
     <string name="submissionAndRubric">Abgabe und Bewertungsschema</string>
+    <string name="submissionAndFeedback">Abgabe &amp; Feedback</string>
     <string name="commentsAndRubric">Kommentare und Bewertungsschema</string>
     <string name="errorLoadingAssignment">Beim Laden dieser Aufgabe ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
     <string name="submitted">Abgegeben</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Heute</string>
+    <string name="tomorrow">Morgen</string>
     <string name="past">Vergangenheit</string>
     <string name="noDate">Kein Datum</string>
     <string name="future">Zukünftig</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Keine Elemente zum Anzeigen</string>
     <string name="Todo">Zu erledigen</string>
+    <string name="TodoNew">Aufgaben</string>
     <string name="todoFilter">Kurse filtern</string>
     <string name="filterByEllipsis">Filtern nach ...</string>
     <string name="favoriteCoursesLabel">Lieblingskurse</string>
@@ -474,6 +477,7 @@
     <string name="groups">Gruppen</string>
     <string name="groupMembers">Gruppenmitglieder</string>
 
+    <string name="messageGroup">Nachricht an Gruppe</string>
     <string name="loading">&#8230; wird geladen</string>
     <string name="select_item_to_display">Aus Aufzählung auswählen</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Zu erledigen</string>
+    <string name="todoWidgetTitleNew">Aufgaben</string>
     <string name="gradesWidgetTitle">Noten</string>
     <string name="notificationWidgetTitle">Benachrichtigungen</string>
     <string name="todoWidgetTitleLong">Canvas – Zu erledigen</string>
+    <string name="todoWidgetTitleLongNew">Canvas – To-Dos</string>
     <string name="gradesWidgetTitleLong">Canvas - Noten</string>
     <string name="gradeWidgetTitleLong">Canvas – Note</string>
     <string name="notificationWidgetTitleLong">Canvas - Benachrichtigungen</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kurse</string>
     <string name="toDoList">Aufgabenliste</string>
+    <string name="toDoListNew">To-Do-Liste</string>
+
     <string name="notifications">Benachrichtigungen</string>
     <string name="pushNotifications">Push-Benachrichtigungen</string>
     <string name="pushNotificationsError">Push-Benachrichtigungen wurden für dieses Gerät nicht angemeldet.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Speedgrader öffnen</string>
 
-    <string name="search_todo">Zu erledigen To-Do-Liste</string>
     <string name="search_course">Kurs Kurse Klasse Klassen</string>
     <string name="search_grades">Note Noten</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Ein Seitentitel muss eingestellt werden.</string>
     <string name="pageDetails">Seitendetails</string>
     <string name="saving">Wird gespeichert</string>
+    <string name="speedGraderSaving">Wird gespeichert</string>
+    <string name="speedGraderSaved">Gespeichert</string>
+    <string name="speedGraderFailed">Fehlgeschlagen</string>
+    <string name="speedGraderSaveErrorTitle">Ups, etwas ist schief gelaufen</string>
+    <string name="speedGraderSaveErrorMessage">Beim Speichern der Notenänderung ist ein Fehler aufgetreten Sie können es erneut versuchen oder später wiederkommen.</string>
+    <string name="speedGraderSaveErrorContentDescription">Das Speichern der Note ist fehlgeschlagen. Bitte tippen Sie für weitere Details.</string>
+
     <string name="confirmDeleteEvent">Möchten Sie dieses Event wirklich löschen?</string>
     <string name="conferencesNotSupported">Konferenzen werden auf Mobilgeräten noch nicht unterstützt.</string>
     <string name="filePreviewContentDescription">Dateivorschaubild</string>
@@ -1090,7 +1104,7 @@
     <string name="addChildSubTitle">Geben Sie den Studierenden-Pairing-Code ein, den Sie erhalten haben.</string>
     <string name="addChildHint">Pairing-Code &#8230;</string>
     <string name="addChildErrorMessage">Pairing fehlgeschlagen. Stellen Sie sicher, dass ihr Pairing-Code korrekt und noch gültig ist.</string>
-    <string name="gradeComplete">Fertigstellen</string>
+    <string name="gradeComplete">Vollständig</string>
     <string name="gradeIncomplete">Unvollständig</string>
 
     <!--Teacher Strings-->
@@ -1225,6 +1239,10 @@
     <string name="recordings">Aufzeichnungen</string>
     <string name="conferenceInProgress">Aktive Konferenz</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferenzen (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Aktive Konferenz</string>
+    <string name="conferencesWidgetDismissed">Konferenz beendet</string>
     <string name="a11y_criterion_content_description">Bewertung dieses Kriteriums %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">weitere Informationen</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s To-Do-Element</item>
         <item quantity="other">%s To-Do-Elemente</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s To-Do-Element</item>
+        <item quantity="other">%s To-Do-Elemente</item>
+    </plurals>
     <string name="noAnnotationSelected">Keine Anmerkung ausgewählt</string>
     <string name="emailNotifications">E-Mail-Benachrichtigungen</string>
     <string name="emailNotificationsImmediately">Sofort</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Heute keine Ereignisse!</string>
     <string name="calendarNoEventsDescription">Scheinbar ein großartiger Tag für Ruhe, Entspannung und Energie tanken..</string>
     <string name="userCalendarToDo">Zu erledigen</string>
+    <string name="userCalendarToDoNew">Aufgaben</string>
     <string name="courseToDo">Aufgabe für %s</string>
+    <string name="courseToDoNew">%s To-Do</string>
     <string name="calendarEventExcused">Entschuldigt</string>
     <string name="calendarEventMissing">Fehlt</string>
     <string name="calendarEventGraded">Benotet</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Ereignis %s erfolgreich erstellt.</string>
     <string name="a11y_eventUpdatedAnnouncement">Ereignis %s erfolgreich aktualisiert.</string>
     <string name="a11y_toDoCreatedAnnouncement">To-Do %s erfolgreich erstellt.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-Do %s erfolgreich erstellt.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To-Do %s erfolgreich aktualisiert.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-Do %s erfolgreich aktualisiert.</string>
     <string name="todoScreenTitle">Zu erledigen</string>
+    <string name="todoScreenTitleNew">Aufgaben</string>
     <string name="todoDateLabel">Datum</string>
     <string name="todoDescriptionLabel">Beschreibung</string>
     <string name="todoDeleteConfirmationTitle">To-Do löschen?</string>
+    <string name="todoDeleteConfirmationTitleNew">To-Do löschen?</string>
     <string name="todoDeleteConfirmationText">Dies wird Ihr To-Do-Element endgültig löschen.</string>
+    <string name="todoDeleteConfirmationTextNew">Dies wird Ihr To-Do-Element endgültig löschen.</string>
     <string name="todoDeleteErrorMessage">Fehler beim Löschen dieser Aufgabe. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
+    <string name="todoDeleteErrorMessageNew">Beim Löschen dieses To-Dos ist ein Fehler aufgetreten. Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut.</string>
     <string name="createTodoScreenTitle">Neue Aufgabe</string>
+    <string name="createTodoScreenTitleNew">Neues To-Do</string>
     <string name="editTodoScreenTitle">Aufgabe bearbeiten</string>
+    <string name="editTodoScreenTitleNew">To-Do bearbeiten</string>
     <string name="createToDoTitleHint">Titel hinzufügen</string>
     <string name="createToDoDateLabel">Datum</string>
     <string name="createToDoTimeLabel">Zeit</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">Fehler beim Speichern dieser Aufgabe Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
+    <string name="todoSaveErrorMessageNew">Beim Speichern dieses To-Dos ist ein Fehler aufgetreten. Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut.</string>
     <string name="selectCalendarScreenTitle">Kalender auswählen</string>
     <string name="errorContentRetryButton">Erneut versuchen</string>
     <string name="eventLocationLabel">Standort</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">Beim Laden dieses Ereignisses ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
     <string name="errorLoadingTodo">Beim Laden dieses To-Do ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
+    <string name="errorLoadingTodoNew">Beim Laden dieses To-Dos ist ein Problem aufgetreten. Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut.</string>
     <string name="eventDeleteConfirmationTitle">Ereignis löschen?</string>
     <string name="eventDeleteConfirmationText">Dies wird Ihr Ereignis endgültig löschen.</string>
     <string name="eventDeleteErrorMessage">Fehler beim Löschen dieses Ereignisses. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Alle Ereignisse</string>
     <string name="eventDeleteScopeFollowing">Dies und alle folgenden Ereignisse</string>
     <string name="calendarAddToDo">Aufgabe hinzufügen</string>
+    <string name="calendarAddToDoNew">Aufgaben hinzufügen</string>
     <string name="calendarAddEvent">Ereignis hinzufügen</string>
     <string name="createEventScreenTitle">Neues Ereignis</string>
     <string name="editEventScreenTitle">Event bearbeiten</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Dann melden Sie sich an!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Um Ihre Aufgaben zu sehen, melden Sie sich bitte in der App bei Ihrem Konto an. Es dauert nur eine Sekunde!</string>
     <string name="a11y_widgetToDoOpenToDoList">Bildschirm „Aufgabenliste“ öffnen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Bildschirm „To-Do-Liste“ öffnen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Neue Aufgabe erstellen</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Neues To-Do erstellen</string>
     <string name="widgetGradesErrorSubtitle">Wir haben im Moment Probleme mit der Anzeige Ihrer Aufgaben. Bitte versuchen Sie es in Kürze erneut oder besuchen Sie die App.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Um Ihre Noten zu sehen, melden Sie sich bitte in der App bei Ihrem Konto an. Es dauert nur eine Sekunde!</string>
     <string name="widgetSingleGradeErrorSubtitle">Wir haben im Moment Probleme mit der Anzeige Ihrer Aufgaben.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Wählen wir einen Kurs aus</string>
     <string name="widgetGradesErrorLoadingCourses">Beim Laden der Kurse ist ein Fehler aufgetreten.</string>
     <string name="settingsSwitchExperience">Zu Canvas Career wechseln</string>
+    <string name="forecastWidgetTitle">Wöchentliche Zusammenfassung</string>
+    <string name="forecastWidgetWeekPeriod">Woche %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Fehlt</string>
+    <string name="forecastWidgetDue">Fällig</string>
+    <string name="forecastWidgetRecentGrades">Neue Noten</string>
+    <string name="forecastWidgetGradeWeight">%d%% der endgültigen Note</string>
+    <string name="forecastWidgetErrorMessage">Wir haben Probleme beim Laden der Noten Ihrer Aufgaben. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
+    <string name="forecastWidgetEmptyMissing">Keine fehlende Aufgaben. Sie werden alle erfasst!</string>
+    <string name="forecastWidgetEmptyDue">Keine Aufgaben in dieser Woche fällig</string>
+    <string name="forecastWidgetEmptyRecentGrades">Keine neuen Noten in dieser Woche.</string>
+    <string name="a11y_contentDescription_previousWeek">Vorherige Woche</string>
+    <string name="a11y_contentDescription_nextWeek">Nächte Woche</string>
+
     <string name="speedGraderGradeTabTitle">Note und Bewertungsschema</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Panel erweitern</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Beim Laden Ihrer To-Do-Elemente ist ein Fehler aufgetreten. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
     <string name="errorUpdatingToDo">Es ist ein Fehler beim Aktualisieren des To-Do-Elements aufgetreten. Bitte überprüfen Sie Ihre Verbindung, und versuchen Sie es erneut.</string>
     <string name="noToDosForNow">Keine To-Dos vorhanden!</string>
+    <string name="noToDosForNowNew">Keine To-Dos vorhanden!</string>
     <string name="noToDosForNowSubtext">Scheinbar ein großartiger Zeitpunkt für Ruhe, Entspannung und Energie tanken.</string>
     <string name="todoSwipeDone">Fertig</string>
     <string name="todoSwipeUndo">Rückgängig machen</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Präferenzen für To-Do-Liste</string>
+    <string name="todoFilterPreferencesNew">Präferenzen für To-Do-Liste</string>
     <string name="todoFilterVisibleItems">Sichtbare Elemente</string>
     <string name="todoFilterShowPersonalToDos">Persönliche To-Dos anzeigen</string>
+    <string name="todoFilterShowPersonalToDosNew">Persönliche To-Dos anzeigen</string>
     <string name="todoFilterShowCalendarEvents">Kalenderereignisse anzeigen</string>
     <string name="todoFilterShowCompleted">Erledigte anzeigen</string>
     <string name="todoFilterFavoriteCoursesOnly">Nur bevorzugte Kurse</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Einladung ablehnen</string>
     <string name="courseInvitationDeclineConfirmMessage">Sind Sie sicher, dass Sie die Einladung zu %s ablehnen möchten?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Fortschritt</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Guten Morgen, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hallo %s,</string>
 
+    <string name="courses_and_groups">Kurse &amp; Gruppen</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Dashboard anpassen</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Ändern des Dashboard-Layouts</string>
     <string name="changing_dashboard_layout_message">Um das Layout des Dashboards zu ändern, müssen Sie die Anwendung neu starten</string>
     <string name="restart_now">Jetzt neu starten</string>
+    <string name="turn_on_new_dashboard">Das neue Dashboard aktivieren</string>
     <string name="switched_back">Zurückgewechselt?</string>
     <string name="switched_back_message">Danke, dass Sie das neue Dashboard ausprobiert haben! Können Sie uns sagen, warum Sie zurück gewechselt haben?</string>
+    <string name="survey_option_hard_to_find">Schwierigkeiten beim Finden von Elementen</string>
+    <string name="survey_option_prefer_old_layout">Altes Layout bevorzugen</string>
+    <string name="survey_option_something_broken">Etwas funktioniert nicht richtig</string>
     <string name="what_could_we_improve">Was könnten wir verbessern?</string>
+    <string name="what_do_you_think_of_new_dashboard">Was ist Ihre Meinung zum neuen Dashboard?</string>
+    <string name="let_us_know">Lassen Sie es uns wissen!</string>
+    <string name="no_app_to_handle_link">Es ist keine App verfügbar, um diesen Link zu öffnen</string>
     <string name="skip">Überspringen</string>
     <string name="widget_setting_show_greeting">Begrüßung anzeigen</string>
     <string name="background_color">Hintergrundfarbe</string>
+    <string name="widget_setting_show_grades">Kursnoten</string>
+    <string name="widget_setting_show_color_overlay">Kursfarbe Überlagerung</string>
     <string name="offline_content_available">Offline-Inhalte verfügbar</string>
     <string name="a11y_contentDescription_moreOptions">Weitere Optionen</string>
     <string name="customizeCourse">Kurs anpassen</string>
     <string name="favoriteCoursesAndGroups">Bevorzugte Kurse und Gruppen</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Externe Tools sind offline nicht verfügbar.</string>
+    <string name="widget_weekly_summary">Wöchentliche Zusammenfassung</string>
+
+    <string name="dashboardCourseNickname">Spitzname</string>
+    <string name="dashboardCourseNicknameHint">Bitte hier den Spitznamen für den Kurs eingeben</string>
+    <string name="dashboardCourseColor">Kursfarbe</string>
+    <string name="widget_toDo">Tägliche Aufgaben</string>
+    <string name="dailyToDoWidgetTitle">Tägliche Aufgaben</string>
+    <string name="todoWidget_showCompleted">Erledigte anzeigen</string>
+    <string name="todoWidget_emptyTitle">Das war\'s fürs Erste.</string>
+    <string name="todoWidget_emptyMessage">Es scheint, als hätten Sie an diesem Tag Zeit.\nMöchten Sie einige Aufgaben hinzufügen?</string>
+    <string name="todoWidget_addTodo">Aufgaben hinzufügen</string>
+    <string name="todoWidget_errorTitle">Ups, etwas ist schief gelaufen</string>
+    <string name="todoWidget_errorMessage">Wir konnten Ihre Aufgaben nicht laden.\nVersuchen Sie es erneut oder kommen Sie später wieder.</string>
+    <string name="todoWidget_refresh">Aktualisieren</string>
+    <string name="todoWidget_today">Heute</string>
+    <string name="a11y_todoWidget_jumpToToday">Zu heute springen</string>
+    <string name="widgetSettings_widgetsColor">Dashboard-Hauptfarbe</string>
+    <string name="dashboard_globalAnnouncement">Globale Ankündigung</string>
+    <string name="forecastWidget_currentWeek">Aktuelle Woche</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-en-rAU/strings.xml b/libs/pandares/src/main/res/values-en-rAU/strings.xml
index 38ae994461..f98e910845 100644
--- a/libs/pandares/src/main/res/values-en-rAU/strings.xml
+++ b/libs/pandares/src/main/res/values-en-rAU/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Submission Failed</string>
     <string name="submissionStatusFailedSubtitle">Tap to view details</string>
     <string name="submissionAndRubric">Submission &amp; Rubric</string>
+    <string name="submissionAndFeedback">Submission &amp; Feedback</string>
     <string name="commentsAndRubric">Comments &amp; Rubric</string>
     <string name="errorLoadingAssignment">There was a problem loading this assignment. Please check your connection and try again.</string>
     <string name="submitted">Submitted</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Today</string>
+    <string name="tomorrow">Tomorrow</string>
     <string name="past">Past</string>
     <string name="noDate">No Date</string>
     <string name="future">Future</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">No items to display</string>
     <string name="Todo">To Do</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Courses</string>
     <string name="filterByEllipsis">Filter by&#8230;</string>
     <string name="favoriteCoursesLabel">Favourite Courses</string>
@@ -474,6 +477,7 @@
     <string name="groups">Groups</string>
     <string name="groupMembers">Group Members</string>
 
+    <string name="messageGroup">Message group</string>
     <string name="loading">Loading&#8230;</string>
     <string name="select_item_to_display">Select from the list</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To Do</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Marks</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas - To Do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Marks</string>
     <string name="gradeWidgetTitleLong">Canvas - Grade</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Courses</string>
     <string name="toDoList">To Do List</string>
+    <string name="toDoListNew">To-do List</string>
+
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Push Notifications</string>
     <string name="pushNotificationsError">Push Notifications have not been registered for this device.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Open Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">course courses class classes</string>
     <string name="search_grades">mark marks</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Page title must be set.</string>
     <string name="pageDetails">Page Details</string>
     <string name="saving">Saving</string>
+    <string name="speedGraderSaving">Saving</string>
+    <string name="speedGraderSaved">Saved</string>
+    <string name="speedGraderFailed">Failed</string>
+    <string name="speedGraderSaveErrorTitle">Oops something went wrong</string>
+    <string name="speedGraderSaveErrorMessage">There was an error while saving your grade modification. You can retry, or try again later.</string>
+    <string name="speedGraderSaveErrorContentDescription">Grade save failed. Tap for details.</string>
+
     <string name="confirmDeleteEvent">Are you sure you wish to delete this event?</string>
     <string name="conferencesNotSupported">Conferences are not yet supported on mobile.</string>
     <string name="filePreviewContentDescription">File preview image</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Recordings</string>
     <string name="conferenceInProgress">Conference in progress</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferences (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conference in progress</string>
+    <string name="conferencesWidgetDismissed">Conference dismissed</string>
     <string name="a11y_criterion_content_description">Criterion rating %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">more information</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s to do item</item>
         <item quantity="other">%s to do items</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s to-do item</item>
+        <item quantity="other">%s to-do items</item>
+    </plurals>
     <string name="noAnnotationSelected">No annotation selected</string>
     <string name="emailNotifications">Email Notifications</string>
     <string name="emailNotificationsImmediately">Immediately</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">No Events Today!</string>
     <string name="calendarNoEventsDescription">It looks like a great day to rest, relax, and recharge.</string>
     <string name="userCalendarToDo">To Do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">%s To Do</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Excused</string>
     <string name="calendarEventMissing">Missing</string>
     <string name="calendarEventGraded">Marked</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Event %s successfully created.</string>
     <string name="a11y_eventUpdatedAnnouncement">Event %s successfully updated.</string>
     <string name="a11y_toDoCreatedAnnouncement">To do %s successfully created.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-do %s successfully created.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To do %s successfully updated.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-do %s successfully updated.</string>
     <string name="todoScreenTitle">To Do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Delete To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Delete To-do?</string>
     <string name="todoDeleteConfirmationText">This will permanently delete your To Do item.</string>
+    <string name="todoDeleteConfirmationTextNew">This will permanently delete your To-do item.</string>
     <string name="todoDeleteErrorMessage">There was an error deleting this To Do. Please check your connection and try again.</string>
+    <string name="todoDeleteErrorMessageNew">There was an error deleting this To-do. Please check your connection and try again.</string>
     <string name="createTodoScreenTitle">New To Do</string>
+    <string name="createTodoScreenTitleNew">New To-do</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Add title</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Time</string>
     <string name="createToDoCalendarLabel">Calendar</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">There was an error saving this To Do. Please check your connection and try again.</string>
+    <string name="todoSaveErrorMessageNew">There was an error saving this To-do. Please check your connection and try again.</string>
     <string name="selectCalendarScreenTitle">Select Calendar</string>
     <string name="errorContentRetryButton">Retry</string>
     <string name="eventLocationLabel">Location</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">There was a problem loading this event. Please check your connection and try again.</string>
     <string name="errorLoadingTodo">There was a problem loading this to-do. Please check your connection and try again.</string>
+    <string name="errorLoadingTodoNew">There was a problem loading this To-do. Please check your connection and try again.</string>
     <string name="eventDeleteConfirmationTitle">Delete Event?</string>
     <string name="eventDeleteConfirmationText">This will permanently delete your event.</string>
     <string name="eventDeleteErrorMessage">There was an error deleting this event. Please check your connection and try again.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">All events</string>
     <string name="eventDeleteScopeFollowing">This and all following events</string>
     <string name="calendarAddToDo">Add To Do</string>
+    <string name="calendarAddToDoNew">Add To-do</string>
     <string name="calendarAddEvent">Add Event</string>
     <string name="createEventScreenTitle">New Event</string>
     <string name="editEventScreenTitle">Edit Event</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Let\'s Get You Logged In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">To see your to-dos, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open To Do list screen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Open To-do list screen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Create new To Do</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Create new To-do</string>
     <string name="widgetGradesErrorSubtitle">We\'re having trouble showing your grades right now. Please try again in a bit or head to the app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">To see your grades, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="widgetSingleGradeErrorSubtitle">We\'re having trouble showing your grades right now.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Let’s choose a course</string>
     <string name="widgetGradesErrorLoadingCourses">An error occurred while loading courses.</string>
     <string name="settingsSwitchExperience">Switch to Canvas Career</string>
+    <string name="forecastWidgetTitle">Weekly Summary</string>
+    <string name="forecastWidgetWeekPeriod">Week %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Missing</string>
+    <string name="forecastWidgetDue">Due</string>
+    <string name="forecastWidgetRecentGrades">New Marks</string>
+    <string name="forecastWidgetGradeWeight">%d%% of final grade</string>
+    <string name="forecastWidgetErrorMessage">We\'re having trouble loading your assignments. Please check your connection and try again.</string>
+    <string name="forecastWidgetEmptyMissing">No missing assignments. You\'re all caught up!</string>
+    <string name="forecastWidgetEmptyDue">No assignments due this week.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No new grades in this week.</string>
+    <string name="a11y_contentDescription_previousWeek">Previous week</string>
+    <string name="a11y_contentDescription_nextWeek">Next week</string>
+
     <string name="speedGraderGradeTabTitle">Grade &amp; Rubric</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Expand panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">There was an error loading your to-do items. Please check your connection and try again.</string>
     <string name="errorUpdatingToDo">There was an error updating the to-do item. Please check your connection and try again.</string>
     <string name="noToDosForNow">No To Dos for now!</string>
+    <string name="noToDosForNowNew">No To-dos for now!</string>
     <string name="noToDosForNowSubtext">It looks like a great time to rest, relax, and recharge.</string>
     <string name="todoSwipeDone">Done</string>
     <string name="todoSwipeUndo">Undo</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">To Do list Preferences</string>
+    <string name="todoFilterPreferencesNew">To-do list Preferences</string>
     <string name="todoFilterVisibleItems">Visible Items</string>
     <string name="todoFilterShowPersonalToDos">Show Personal To Dos</string>
+    <string name="todoFilterShowPersonalToDosNew">Show Personal To-dos</string>
     <string name="todoFilterShowCalendarEvents">Show Calendar Events</string>
     <string name="todoFilterShowCompleted">Show Completed</string>
     <string name="todoFilterFavoriteCoursesOnly">Favourite Courses Only</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Decline Invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Are you sure you want to decline the invitation to %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progress</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Good morning, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hello, %s</string>
 
+    <string name="courses_and_groups">Courses &amp; Groups</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Customise Dashboard</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Changing dashboard layout</string>
     <string name="changing_dashboard_layout_message">To change the dashboard layout restart the application</string>
     <string name="restart_now">Restart now</string>
+    <string name="turn_on_new_dashboard">Turn on the new dashboard</string>
     <string name="switched_back">Switched back?</string>
     <string name="switched_back_message">Thanks for trying the new dashboard! Could you tell us why you switched back?</string>
+    <string name="survey_option_hard_to_find">Hard to find things</string>
+    <string name="survey_option_prefer_old_layout">Prefer the old layout</string>
+    <string name="survey_option_something_broken">Something didn\'t work right</string>
     <string name="what_could_we_improve">What could we improve?</string>
+    <string name="what_do_you_think_of_new_dashboard">What do you think of the new dashboard?</string>
+    <string name="let_us_know">Let us know!</string>
+    <string name="no_app_to_handle_link">No app available to open this link</string>
     <string name="skip">Skip</string>
     <string name="widget_setting_show_greeting">Show greeting</string>
     <string name="background_color">Background colour</string>
+    <string name="widget_setting_show_grades">Course Marks</string>
+    <string name="widget_setting_show_color_overlay">Course Colour Overlay</string>
     <string name="offline_content_available">Offline content available</string>
     <string name="a11y_contentDescription_moreOptions">More options</string>
     <string name="customizeCourse">Customise Course</string>
     <string name="favoriteCoursesAndGroups">Favourite Courses and Groups</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">External Tools are not available offline.</string>
+    <string name="widget_weekly_summary">Weekly Summary</string>
+
+    <string name="dashboardCourseNickname">Nickname</string>
+    <string name="dashboardCourseNicknameHint">Write course nickname here</string>
+    <string name="dashboardCourseColor">Course Colour</string>
+    <string name="widget_toDo">Daily To-do</string>
+    <string name="dailyToDoWidgetTitle">Daily To-do</string>
+    <string name="todoWidget_showCompleted">Show Completed</string>
+    <string name="todoWidget_emptyTitle">You\'re all done for now!</string>
+    <string name="todoWidget_emptyMessage">Looks like you\'re free for this day.\nDo you want to add some To-dos?</string>
+    <string name="todoWidget_addTodo">Add To-do</string>
+    <string name="todoWidget_errorTitle">Oops, Something went wrong</string>
+    <string name="todoWidget_errorMessage">We weren\'t able to load your To-dos.\nTry again, or come back later.</string>
+    <string name="todoWidget_refresh">Refresh</string>
+    <string name="todoWidget_today">Today</string>
+    <string name="a11y_todoWidget_jumpToToday">Jump to today</string>
+    <string name="widgetSettings_widgetsColor">Dashboard Main Color</string>
+    <string name="dashboard_globalAnnouncement">Global Announcement</string>
+    <string name="forecastWidget_currentWeek">Current week</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-en-rCY/strings.xml b/libs/pandares/src/main/res/values-en-rCY/strings.xml
index d93c5a4552..2c2f706310 100644
--- a/libs/pandares/src/main/res/values-en-rCY/strings.xml
+++ b/libs/pandares/src/main/res/values-en-rCY/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Submission failed</string>
     <string name="submissionStatusFailedSubtitle">Tap to view details</string>
     <string name="submissionAndRubric">Submission &amp; Rubric</string>
+    <string name="submissionAndFeedback">Submission &amp; Feedback</string>
     <string name="commentsAndRubric">Comments &amp; Rubric</string>
     <string name="errorLoadingAssignment">There was a problem loading this assignment. Please check your connection and try again.</string>
     <string name="submitted">Submitted</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Today</string>
+    <string name="tomorrow">Tomorrow</string>
     <string name="past">Past</string>
     <string name="noDate">No date</string>
     <string name="future">Future</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">No items to display</string>
     <string name="Todo">To-do</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Modules</string>
     <string name="filterByEllipsis">Filter by&#8230;</string>
     <string name="favoriteCoursesLabel">Favourite modules</string>
@@ -474,6 +477,7 @@
     <string name="groups">Groups</string>
     <string name="groupMembers">Group members</string>
 
+    <string name="messageGroup">Message group</string>
     <string name="loading">Loading&#8230;</string>
     <string name="select_item_to_display">Select from the list</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To-do</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Grades</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas - to do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Marks</string>
     <string name="gradeWidgetTitleLong">Canvas - Grade</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Modules</string>
     <string name="toDoList">To do list</string>
+    <string name="toDoListNew">To-do List</string>
+
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Push notifications</string>
     <string name="pushNotificationsError">Push notifications have not been registered for this device.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Open Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">module modules class classes</string>
     <string name="search_grades">mark marks</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Page title must be set.</string>
     <string name="pageDetails">Page details</string>
     <string name="saving">Saving</string>
+    <string name="speedGraderSaving">Saving</string>
+    <string name="speedGraderSaved">Saved</string>
+    <string name="speedGraderFailed">Failed</string>
+    <string name="speedGraderSaveErrorTitle">Oops something went wrong</string>
+    <string name="speedGraderSaveErrorMessage">There was an error while saving your grade modification. You can retry or try again later.</string>
+    <string name="speedGraderSaveErrorContentDescription">Grade save failed. Tap for details.</string>
+
     <string name="confirmDeleteEvent">Are you sure you wish to delete this event?</string>
     <string name="conferencesNotSupported">Conferences are not yet supported on mobile.</string>
     <string name="filePreviewContentDescription">File preview image</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Recordings</string>
     <string name="conferenceInProgress">Conference in progress</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferences (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conference in progress</string>
+    <string name="conferencesWidgetDismissed">Conference dismissed</string>
     <string name="a11y_criterion_content_description">Criterion rating %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">more information</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s to do item</item>
         <item quantity="other">%s to do items</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s to-do item</item>
+        <item quantity="other">%s to-do items</item>
+    </plurals>
     <string name="noAnnotationSelected">No annotation selected</string>
     <string name="emailNotifications">Email Notifications</string>
     <string name="emailNotificationsImmediately">Immediately</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">No Events Today!</string>
     <string name="calendarNoEventsDescription">It looks like a great day to rest, relax, and recharge.</string>
     <string name="userCalendarToDo">To-do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">%s To Do</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Excused</string>
     <string name="calendarEventMissing">Missing</string>
     <string name="calendarEventGraded">Graded</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Event %s successfully created.</string>
     <string name="a11y_eventUpdatedAnnouncement">Event %s successfully updated.</string>
     <string name="a11y_toDoCreatedAnnouncement">To do %s successfully created.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-do %s successfully created.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To do %s successfully updated.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-do %s successfully updated.</string>
     <string name="todoScreenTitle">To-do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Delete To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Delete To-do?</string>
     <string name="todoDeleteConfirmationText">This will permanently delete your To Do item.</string>
+    <string name="todoDeleteConfirmationTextNew">This will permanently delete your To-do item.</string>
     <string name="todoDeleteErrorMessage">There was an error deleting this To Do. Please check your connection and try again.</string>
+    <string name="todoDeleteErrorMessageNew">There was an error deleting this To-do. Please check your connection and try again.</string>
     <string name="createTodoScreenTitle">New To Do</string>
+    <string name="createTodoScreenTitleNew">New To-do</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Add title</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Time</string>
     <string name="createToDoCalendarLabel">Calendar</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">There was an error saving this To Do. Please check your connection and try again.</string>
+    <string name="todoSaveErrorMessageNew">There was an error saving this To-do. Please check your connection and try again.</string>
     <string name="selectCalendarScreenTitle">Select Calendar</string>
     <string name="errorContentRetryButton">Retry</string>
     <string name="eventLocationLabel">Location</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">There was a problem loading this event. Please check your connection and try again.</string>
     <string name="errorLoadingTodo">There was a problem loading this to-do. Please check your connection and try again.</string>
+    <string name="errorLoadingTodoNew">There was a problem loading this to-do. Please check your connection and try again.</string>
     <string name="eventDeleteConfirmationTitle">Delete Event?</string>
     <string name="eventDeleteConfirmationText">This will permanently delete your event.</string>
     <string name="eventDeleteErrorMessage">There was an error deleting this event. Please check your connection and try again.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">All events</string>
     <string name="eventDeleteScopeFollowing">This and all following events</string>
     <string name="calendarAddToDo">Add ‘to-do’</string>
+    <string name="calendarAddToDoNew">Add To-do</string>
     <string name="calendarAddEvent">Add Event</string>
     <string name="createEventScreenTitle">New Event</string>
     <string name="editEventScreenTitle">Edit event</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Let\'s Get You Logged In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">To see your to-dos, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open To Do list screen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Open To-do list screen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Create new To Do</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Create new To-do</string>
     <string name="widgetGradesErrorSubtitle">We\'re having trouble showing your grades right now. Please try again in a bit or head to the app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">To see your grades, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="widgetSingleGradeErrorSubtitle">We\'re having trouble showing your grades right now.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Let’s choose a module</string>
     <string name="widgetGradesErrorLoadingCourses">An error occurred while loading modules.</string>
     <string name="settingsSwitchExperience">Switch to Canvas Career</string>
+    <string name="forecastWidgetTitle">Weekly Summary</string>
+    <string name="forecastWidgetWeekPeriod">Week %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Missing</string>
+    <string name="forecastWidgetDue">Due</string>
+    <string name="forecastWidgetRecentGrades">New Grades</string>
+    <string name="forecastWidgetGradeWeight">%d%% of final grade</string>
+    <string name="forecastWidgetErrorMessage">We\'re having trouble loading your assignments. Please check your connection and try again.</string>
+    <string name="forecastWidgetEmptyMissing">No missing assignments. You\'re all caught up!</string>
+    <string name="forecastWidgetEmptyDue">No assignments due this week.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No new grades in this week.</string>
+    <string name="a11y_contentDescription_previousWeek">Previous week</string>
+    <string name="a11y_contentDescription_nextWeek">Next week</string>
+
     <string name="speedGraderGradeTabTitle">Grade &amp; Rubric</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Expand panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">There was an error loading your to-do items. Please check your connection and try again.</string>
     <string name="errorUpdatingToDo">There was an error updating the to-do item. Please check your connection and try again.</string>
     <string name="noToDosForNow">No To Dos for now!</string>
+    <string name="noToDosForNowNew">No To-dos for now!</string>
     <string name="noToDosForNowSubtext">It looks like a great time to rest, relax, and recharge.</string>
     <string name="todoSwipeDone">Done</string>
     <string name="todoSwipeUndo">Undo</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">To Do list Preferences</string>
+    <string name="todoFilterPreferencesNew">To-do list Preferences</string>
     <string name="todoFilterVisibleItems">Visible Items</string>
     <string name="todoFilterShowPersonalToDos">Show Personal To Dos</string>
+    <string name="todoFilterShowPersonalToDosNew">Show Personal To-dos</string>
     <string name="todoFilterShowCalendarEvents">Show Calendar Events</string>
     <string name="todoFilterShowCompleted">Show Completed</string>
     <string name="todoFilterFavoriteCoursesOnly">Favourite Modules Only</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Decline Invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Are you sure you want to decline the invitation to %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progress</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Good morning, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hello, %s</string>
 
+    <string name="courses_and_groups">Modules &amp; Groups</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Customise Dashboard</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Changing dashboard layout</string>
     <string name="changing_dashboard_layout_message">To change the dashboard layout you have to restart the application</string>
     <string name="restart_now">Restart now</string>
+    <string name="turn_on_new_dashboard">Turn on the new dashboard</string>
     <string name="switched_back">Switched back?</string>
     <string name="switched_back_message">Thanks for trying the new dashboard! Could you tell us why you switched back?</string>
+    <string name="survey_option_hard_to_find">Hard to find things</string>
+    <string name="survey_option_prefer_old_layout">Prefer the old layout</string>
+    <string name="survey_option_something_broken">Something didn\'t work right</string>
     <string name="what_could_we_improve">What could we improve?</string>
+    <string name="what_do_you_think_of_new_dashboard">What do you think of the new dashboard?</string>
+    <string name="let_us_know">Let us know!</string>
+    <string name="no_app_to_handle_link">No app available to open this link</string>
     <string name="skip">Skip</string>
     <string name="widget_setting_show_greeting">Show greeting</string>
     <string name="background_color">Background colour</string>
+    <string name="widget_setting_show_grades">Module grades</string>
+    <string name="widget_setting_show_color_overlay">Module Colour Overlay</string>
     <string name="offline_content_available">Offline content available</string>
     <string name="a11y_contentDescription_moreOptions">More options</string>
     <string name="customizeCourse">Customise module</string>
     <string name="favoriteCoursesAndGroups">Favourite Modules and Groups</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">External Tools are not available offline.</string>
+    <string name="widget_weekly_summary">Weekly Summary</string>
+
+    <string name="dashboardCourseNickname">Nickname</string>
+    <string name="dashboardCourseNicknameHint">Write module nickname here</string>
+    <string name="dashboardCourseColor">Module Colour</string>
+    <string name="widget_toDo">Daily To-do</string>
+    <string name="dailyToDoWidgetTitle">Daily To-do</string>
+    <string name="todoWidget_showCompleted">Show Completed</string>
+    <string name="todoWidget_emptyTitle">You\'re all done for now!</string>
+    <string name="todoWidget_emptyMessage">Looks like you\'re free for this day.\nDo you want to add some To-dos?</string>
+    <string name="todoWidget_addTodo">Add To-do</string>
+    <string name="todoWidget_errorTitle">Oops, something went wrong</string>
+    <string name="todoWidget_errorMessage">We weren\'t able to load your To-dos.\nTry again or come back later.</string>
+    <string name="todoWidget_refresh">Refresh</string>
+    <string name="todoWidget_today">Today</string>
+    <string name="a11y_todoWidget_jumpToToday">Jump to today</string>
+    <string name="widgetSettings_widgetsColor">Dashboard Main Colour</string>
+    <string name="dashboard_globalAnnouncement">Global Announcement</string>
+    <string name="forecastWidget_currentWeek">Current week</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-en-rGB/strings.xml b/libs/pandares/src/main/res/values-en-rGB/strings.xml
index 475540c00d..29f97fad6f 100644
--- a/libs/pandares/src/main/res/values-en-rGB/strings.xml
+++ b/libs/pandares/src/main/res/values-en-rGB/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Submission failed</string>
     <string name="submissionStatusFailedSubtitle">Tap to view details</string>
     <string name="submissionAndRubric">Submission &amp; Rubric</string>
+    <string name="submissionAndFeedback">Submission &amp; Feedback</string>
     <string name="commentsAndRubric">Comments &amp; Rubric</string>
     <string name="errorLoadingAssignment">There was a problem loading this assignment. Please check your connection and try again.</string>
     <string name="submitted">Submitted</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Today</string>
+    <string name="tomorrow">Tomorrow</string>
     <string name="past">Past</string>
     <string name="noDate">No date</string>
     <string name="future">Future</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">No items to display</string>
     <string name="Todo">To-do</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Courses</string>
     <string name="filterByEllipsis">Filter by&#8230;</string>
     <string name="favoriteCoursesLabel">Favourite courses</string>
@@ -474,6 +477,7 @@
     <string name="groups">Groups</string>
     <string name="groupMembers">Group members</string>
 
+    <string name="messageGroup">Message group</string>
     <string name="loading">Loading&#8230;</string>
     <string name="select_item_to_display">Select from the list</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To-do</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Grades</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas - to do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Marks</string>
     <string name="gradeWidgetTitleLong">Canvas - Grade</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Courses</string>
     <string name="toDoList">To do list</string>
+    <string name="toDoListNew">To-do List</string>
+
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Push notifications</string>
     <string name="pushNotificationsError">Push notifications have not been registered for this device.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Open Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">course courses class classes</string>
     <string name="search_grades">mark marks</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Page title must be set.</string>
     <string name="pageDetails">Page details</string>
     <string name="saving">Saving</string>
+    <string name="speedGraderSaving">Saving</string>
+    <string name="speedGraderSaved">Saved</string>
+    <string name="speedGraderFailed">Failed</string>
+    <string name="speedGraderSaveErrorTitle">Oops something went wrong</string>
+    <string name="speedGraderSaveErrorMessage">There was an error while saving your grade modification. You can retry or try again later.</string>
+    <string name="speedGraderSaveErrorContentDescription">Grade save failed. Tap for details.</string>
+
     <string name="confirmDeleteEvent">Are you sure you wish to delete this event?</string>
     <string name="conferencesNotSupported">Conferences are not yet supported on mobile.</string>
     <string name="filePreviewContentDescription">File preview image</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Recordings</string>
     <string name="conferenceInProgress">Conference in progress</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferences (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conference in progress</string>
+    <string name="conferencesWidgetDismissed">Conference dismissed</string>
     <string name="a11y_criterion_content_description">Criterion rating %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">more information</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s to do item</item>
         <item quantity="other">%s to do items</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s to-do item</item>
+        <item quantity="other">%s to-do items</item>
+    </plurals>
     <string name="noAnnotationSelected">No annotation selected</string>
     <string name="emailNotifications">Email Notifications</string>
     <string name="emailNotificationsImmediately">Immediately</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">No Events Today!</string>
     <string name="calendarNoEventsDescription">It looks like a great day to rest, relax, and recharge.</string>
     <string name="userCalendarToDo">To-do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">%s To Do</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Excused</string>
     <string name="calendarEventMissing">Missing</string>
     <string name="calendarEventGraded">Graded</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Event %s successfully created.</string>
     <string name="a11y_eventUpdatedAnnouncement">Event %s successfully updated.</string>
     <string name="a11y_toDoCreatedAnnouncement">To do %s successfully created.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-do %s successfully created.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To do %s successfully updated.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-do %s successfully updated.</string>
     <string name="todoScreenTitle">To-do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Delete To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Delete To-do?</string>
     <string name="todoDeleteConfirmationText">This will permanently delete your To Do item.</string>
+    <string name="todoDeleteConfirmationTextNew">This will permanently delete your To-do item.</string>
     <string name="todoDeleteErrorMessage">There was an error deleting this To Do. Please check your connection and try again.</string>
+    <string name="todoDeleteErrorMessageNew">There was an error deleting this To-do. Please check your connection and try again.</string>
     <string name="createTodoScreenTitle">New To Do</string>
+    <string name="createTodoScreenTitleNew">New To-do</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Add title</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Time</string>
     <string name="createToDoCalendarLabel">Calendar</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">There was an error saving this To Do. Please check your connection and try again.</string>
+    <string name="todoSaveErrorMessageNew">There was an error saving this To-do. Please check your connection and try again.</string>
     <string name="selectCalendarScreenTitle">Select Calendar</string>
     <string name="errorContentRetryButton">Retry</string>
     <string name="eventLocationLabel">Location</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">There was a problem loading this event. Please check your connection and try again.</string>
     <string name="errorLoadingTodo">There was a problem loading this to-do. Please check your connection and try again.</string>
+    <string name="errorLoadingTodoNew">There was a problem loading this to-do. Please check your connection and try again.</string>
     <string name="eventDeleteConfirmationTitle">Delete Event?</string>
     <string name="eventDeleteConfirmationText">This will permanently delete your event.</string>
     <string name="eventDeleteErrorMessage">There was an error deleting this event. Please check your connection and try again.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">All events</string>
     <string name="eventDeleteScopeFollowing">This and all following events</string>
     <string name="calendarAddToDo">Add ‘to-do’</string>
+    <string name="calendarAddToDoNew">Add To-do</string>
     <string name="calendarAddEvent">Add Event</string>
     <string name="createEventScreenTitle">New Event</string>
     <string name="editEventScreenTitle">Edit event</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Let\'s Get You Logged In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">To see your to-dos, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open To Do list screen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Open To-do list screen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Create new To Do</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Create new To-do</string>
     <string name="widgetGradesErrorSubtitle">We\'re having trouble showing your grades right now. Please try again in a bit or head to the app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">To see your grades, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="widgetSingleGradeErrorSubtitle">We\'re having trouble showing your grades right now.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Let’s choose a course</string>
     <string name="widgetGradesErrorLoadingCourses">An error occurred while loading courses.</string>
     <string name="settingsSwitchExperience">Switch to Canvas Career</string>
+    <string name="forecastWidgetTitle">Weekly Summary</string>
+    <string name="forecastWidgetWeekPeriod">Week %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Missing</string>
+    <string name="forecastWidgetDue">Due</string>
+    <string name="forecastWidgetRecentGrades">New Grades</string>
+    <string name="forecastWidgetGradeWeight">%d%% of final grade</string>
+    <string name="forecastWidgetErrorMessage">We\'re having trouble loading your assignments. Please check your connection and try again.</string>
+    <string name="forecastWidgetEmptyMissing">No missing assignments. You\'re all caught up!</string>
+    <string name="forecastWidgetEmptyDue">No assignments due this week.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No new grades in this week.</string>
+    <string name="a11y_contentDescription_previousWeek">Previous week</string>
+    <string name="a11y_contentDescription_nextWeek">Next week</string>
+
     <string name="speedGraderGradeTabTitle">Grade &amp; Rubric</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Expand panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">There was an error loading your to-do items. Please check your connection and try again.</string>
     <string name="errorUpdatingToDo">There was an error updating the to-do item. Please check your connection and try again.</string>
     <string name="noToDosForNow">No To Dos for now!</string>
+    <string name="noToDosForNowNew">No To-dos for now!</string>
     <string name="noToDosForNowSubtext">It looks like a great time to rest, relax, and recharge.</string>
     <string name="todoSwipeDone">Done</string>
     <string name="todoSwipeUndo">Undo</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">To Do list Preferences</string>
+    <string name="todoFilterPreferencesNew">To-do list Preferences</string>
     <string name="todoFilterVisibleItems">Visible Items</string>
     <string name="todoFilterShowPersonalToDos">Show Personal To Dos</string>
+    <string name="todoFilterShowPersonalToDosNew">Show Personal To-dos</string>
     <string name="todoFilterShowCalendarEvents">Show Calendar Events</string>
     <string name="todoFilterShowCompleted">Show Completed</string>
     <string name="todoFilterFavoriteCoursesOnly">Favourite Courses Only</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Decline Invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Are you sure you want to decline the invitation to %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progress</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Good morning, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hello, %s</string>
 
+    <string name="courses_and_groups">Courses &amp; Groups</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Customise Dashboard</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Changing dashboard layout</string>
     <string name="changing_dashboard_layout_message">To change the dashboard layout you have to restart the application</string>
     <string name="restart_now">Restart now</string>
+    <string name="turn_on_new_dashboard">Turn on the new dashboard</string>
     <string name="switched_back">Switched back?</string>
     <string name="switched_back_message">Thanks for trying the new dashboard! Could you tell us why you switched back?</string>
+    <string name="survey_option_hard_to_find">Hard to find things</string>
+    <string name="survey_option_prefer_old_layout">Prefer the old layout</string>
+    <string name="survey_option_something_broken">Something didn\'t work right</string>
     <string name="what_could_we_improve">What could we improve?</string>
+    <string name="what_do_you_think_of_new_dashboard">What do you think of the new dashboard?</string>
+    <string name="let_us_know">Let us know!</string>
+    <string name="no_app_to_handle_link">No app available to open this link</string>
     <string name="skip">Skip</string>
     <string name="widget_setting_show_greeting">Show greeting</string>
     <string name="background_color">Background colour</string>
+    <string name="widget_setting_show_grades">Course grades</string>
+    <string name="widget_setting_show_color_overlay">Course Colour Overlay</string>
     <string name="offline_content_available">Offline content available</string>
     <string name="a11y_contentDescription_moreOptions">More options</string>
     <string name="customizeCourse">Customise course</string>
     <string name="favoriteCoursesAndGroups">Favourite Courses and Groups</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">External Tools are not available offline.</string>
+    <string name="widget_weekly_summary">Weekly Summary</string>
+
+    <string name="dashboardCourseNickname">Nickname</string>
+    <string name="dashboardCourseNicknameHint">Write course nickname here</string>
+    <string name="dashboardCourseColor">Course Colour</string>
+    <string name="widget_toDo">Daily To-do</string>
+    <string name="dailyToDoWidgetTitle">Daily To-do</string>
+    <string name="todoWidget_showCompleted">Show Completed</string>
+    <string name="todoWidget_emptyTitle">You\'re all done for now!</string>
+    <string name="todoWidget_emptyMessage">Looks like you\'re free for this day.\nDo you want to add some To-dos?</string>
+    <string name="todoWidget_addTodo">Add To-do</string>
+    <string name="todoWidget_errorTitle">Oops, something went wrong</string>
+    <string name="todoWidget_errorMessage">We weren\'t able to load your To-dos.\nTry again or come back later.</string>
+    <string name="todoWidget_refresh">Refresh</string>
+    <string name="todoWidget_today">Today</string>
+    <string name="a11y_todoWidget_jumpToToday">Jump to today</string>
+    <string name="widgetSettings_widgetsColor">Dashboard Main Colour</string>
+    <string name="dashboard_globalAnnouncement">Global Announcement</string>
+    <string name="forecastWidget_currentWeek">Current week</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-en/strings.xml b/libs/pandares/src/main/res/values-en/strings.xml
index ccd70c8a7b..030560e018 100644
--- a/libs/pandares/src/main/res/values-en/strings.xml
+++ b/libs/pandares/src/main/res/values-en/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Submission Failed</string>
     <string name="submissionStatusFailedSubtitle">Tap to view details</string>
     <string name="submissionAndRubric">Submission &amp; Rubric</string>
+    <string name="submissionAndFeedback">Submission &amp; Feedback</string>
     <string name="commentsAndRubric">Comments &amp; Rubric</string>
     <string name="errorLoadingAssignment">There was a problem loading this assignment. Please check your connection and try again.</string>
     <string name="submitted">Submitted</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Today</string>
+    <string name="tomorrow">Tomorrow</string>
     <string name="past">Past</string>
     <string name="noDate">No Date</string>
     <string name="future">Future</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">No items to display</string>
     <string name="Todo">To Do</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Courses</string>
     <string name="filterByEllipsis">Filter by…</string>
     <string name="favoriteCoursesLabel">Favorite Courses</string>
@@ -473,6 +476,7 @@
     <string name="group">Group</string>
     <string name="groups">Groups</string>
     <string name="groupMembers">Group Members</string>
+    <string name="messageGroup">Message group</string>
 
     <string name="loading">Loading&#8230;</string>
     <string name="select_item_to_display">Select from the list</string>
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To Do</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Grades</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas - To Do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Grades</string>
     <string name="gradeWidgetTitleLong">Canvas - Grade</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -728,6 +734,7 @@
     <!-- Tablet Strings -->
     <string name="courses">Courses</string>
     <string name="toDoList">To Do List</string>
+    <string name="toDoListNew">To-do List</string>
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Push Notifications</string>
     <string name="pushNotificationsError">Push Notifications have not been registered for this device.</string>
@@ -742,7 +749,6 @@
 
     <string name="launchSpeedgrader">Open Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">course courses class classes</string>
     <string name="search_grades">grade grades</string>
 
@@ -1078,6 +1084,12 @@
     <string name="pageTitleMustBeSet">Page title must be set.</string>
     <string name="pageDetails">Page Details</string>
     <string name="saving">Saving</string>
+    <string name="speedGraderSaving">Saving</string>
+    <string name="speedGraderSaved">Saved</string>
+    <string name="speedGraderFailed">Failed</string>
+    <string name="speedGraderSaveErrorTitle">Oops something went wrong</string>
+    <string name="speedGraderSaveErrorMessage">There was an error while saving your grade modification. You can retry, or try again later.</string>
+    <string name="speedGraderSaveErrorContentDescription">Grade save failed. Tap for details.</string>
     <string name="confirmDeleteEvent">Are you sure you wish to delete this event?</string>
     <string name="conferencesNotSupported">Conferences are not yet supported on mobile.</string>
     <string name="filePreviewContentDescription">File preview image</string>
@@ -1225,6 +1237,11 @@
     <string name="recordings">Recordings</string>
     <string name="conferenceInProgress">Conference in progress</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferences (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conference in progress</string>
+    <string name="conferencesWidgetDismissed">Conference dismissed</string>
+
     <string name="a11y_criterion_content_description">Criterion rating %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">more information</string>
@@ -1383,6 +1400,11 @@
         <item quantity="other">%s to do items</item>
     </plurals>
 
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s to-do item</item>
+        <item quantity="other">%s to-do items</item>
+    </plurals>
+
     <string name="noAnnotationSelected">No annotation selected</string>
 
     <string name="emailNotifications">Email Notifications</string>
@@ -1673,7 +1695,9 @@
     <string name="calendarNoEvents">No Events Today!</string>
     <string name="calendarNoEventsDescription">It looks like a great day to rest, relax, and recharge.</string>
     <string name="userCalendarToDo">To Do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">%s To Do</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Excused</string>
     <string name="calendarEventMissing">Missing</string>
     <string name="calendarEventGraded">Graded</string>
@@ -1698,22 +1722,31 @@
     <string name="a11y_eventCreatedAnnouncement">Event %s successfully created.</string>
     <string name="a11y_eventUpdatedAnnouncement">Event %s successfully updated.</string>
     <string name="a11y_toDoCreatedAnnouncement">To do %s successfully created.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-do %s successfully created.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To do %s successfully updated.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-do %s successfully updated.</string>
 
     <string name="todoScreenTitle">To Do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Delete To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Delete To-do?</string>
     <string name="todoDeleteConfirmationText">This will permanently delete your To Do item.</string>
+    <string name="todoDeleteConfirmationTextNew">This will permanently delete your To-do item.</string>
     <string name="todoDeleteErrorMessage">There was an error deleting this To Do. Please check your connection and try again.</string>
+    <string name="todoDeleteErrorMessageNew">There was an error deleting this To-do. Please check your connection and try again.</string>
     <string name="createTodoScreenTitle">New To Do</string>
+    <string name="createTodoScreenTitleNew">New To-do</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Add title</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Time</string>
     <string name="createToDoCalendarLabel">Calendar</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">There was an error saving this To Do. Please check your connection and try again.</string>
+    <string name="todoSaveErrorMessageNew">There was an error saving this To-do. Please check your connection and try again.</string>
     <string name="selectCalendarScreenTitle">Select Calendar</string>
 
     <string name="errorContentRetryButton">Retry</string>
@@ -1723,6 +1756,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">There was a problem loading this event. Please check your connection and try again.</string>
     <string name="errorLoadingTodo">There was a problem loading this todo. Please check your connection and try again.</string>
+    <string name="errorLoadingTodoNew">There was a problem loading this to-do. Please check your connection and try again.</string>
     <string name="eventDeleteConfirmationTitle">Delete Event?</string>
     <string name="eventDeleteConfirmationText">This will permanently delete your event.</string>
     <string name="eventDeleteErrorMessage">There was an error deleting this event. Please check your connection and try again.</string>
@@ -1739,6 +1773,7 @@
     <string name="eventDeleteScopeAll">All events</string>
     <string name="eventDeleteScopeFollowing">This and all following events</string>
     <string name="calendarAddToDo">Add To Do</string>
+    <string name="calendarAddToDoNew">Add To-do</string>
     <string name="calendarAddEvent">Add Event</string>
 
     <string name="createEventScreenTitle">New Event</string>
@@ -2119,7 +2154,9 @@
     <string name="widgetNotLoggedInTitle">Let\'s Get You Logged In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">To see your to-dos, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open To Do list screen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Open To-do list screen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Create new To Do</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Create new To-do</string>
 
     <string name="widgetGradesErrorSubtitle">We\'re having trouble showing your grades right now. Please try again in a bit or head to the app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">To see your grades, please log in to your account in the app. It\'ll just take a sec!</string>
@@ -2129,6 +2166,19 @@
     <string name="widgetGradesErrorLoadingCourses">An error occurred while loading courses.</string>
     <string name="settingsSwitchExperience">Switch to Canvas Career</string>
 
+    <string name="forecastWidgetTitle">Weekly Summary</string>
+    <string name="forecastWidgetWeekPeriod">Week %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Missing</string>
+    <string name="forecastWidgetDue">Due</string>
+    <string name="forecastWidgetRecentGrades">New Grades</string>
+    <string name="forecastWidgetGradeWeight">%d%% of final grade</string>
+    <string name="forecastWidgetErrorMessage">We\'re having trouble loading your assignments. Please check your connection and try again.</string>
+    <string name="forecastWidgetEmptyMissing">No missing assignments. You\'re all caught up!</string>
+    <string name="forecastWidgetEmptyDue">No assignments due this week.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No new grades in this week.</string>
+    <string name="a11y_contentDescription_previousWeek">Previous week</string>
+    <string name="a11y_contentDescription_nextWeek">Next week</string>
+
     <string name="speedGraderGradeTabTitle">Grade &amp; Rubric</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Expand panel</string>
@@ -2206,6 +2256,7 @@
     <string name="errorLoadingToDos">There was an error loading your to-do items. Please check your connection and try again.</string>
     <string name="errorUpdatingToDo">There was an error updating the to-do item. Please check your connection and try again.</string>
     <string name="noToDosForNow">No To Dos for now!</string>
+    <string name="noToDosForNowNew">No To-dos for now!</string>
     <string name="noToDosForNowSubtext">It looks like a great time to rest, relax, and recharge.</string>
     <string name="todoSwipeDone">Done</string>
     <string name="todoSwipeUndo">Undo</string>
@@ -2216,8 +2267,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">To Do list Preferences</string>
+    <string name="todoFilterPreferencesNew">To-do list Preferences</string>
     <string name="todoFilterVisibleItems">Visible Items</string>
     <string name="todoFilterShowPersonalToDos">Show Personal To Dos</string>
+    <string name="todoFilterShowPersonalToDosNew">Show Personal To-dos</string>
     <string name="todoFilterShowCalendarEvents">Show Calendar Events</string>
     <string name="todoFilterShowCompleted">Show Completed</string>
     <string name="todoFilterFavoriteCoursesOnly">Favourite Courses Only</string>
@@ -2245,6 +2298,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Decline Invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Are you sure you want to decline the invitation to %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progress</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Good morning, %s!</string>
@@ -2367,6 +2423,7 @@
 
     <!-- Widget Display Names -->
     <string name="widget_hello">Hello, %s</string>
+    <string name="courses_and_groups">Courses &amp; Groups</string>
 
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Customize Dashboard</string>
@@ -2377,16 +2434,44 @@
     <string name="changing_dashboard_layout">Changing dashboard layout</string>
     <string name="changing_dashboard_layout_message">To change the dashboard layout you have to restart the application</string>
     <string name="restart_now">Restart now</string>
+    <string name="turn_on_new_dashboard">Turn on the new dashboard</string>
     <string name="switched_back">Switched back?</string>
     <string name="switched_back_message">Thanks for trying the new dashboard! Could you tell us why you switched back?</string>
+    <string name="survey_option_hard_to_find">Hard to find things</string>
+    <string name="survey_option_prefer_old_layout">Prefer the old layout</string>
+    <string name="survey_option_something_broken">Something didn\'t work right</string>
     <string name="what_could_we_improve">What could we improve?</string>
+    <string name="what_do_you_think_of_new_dashboard">What do you think of the new dashboard?</string>
+    <string name="let_us_know">Let us know!</string>
+    <string name="no_app_to_handle_link">No app available to open this link</string>
     <string name="skip">Skip</string>
     <string name="widget_setting_show_greeting">Show greeting</string>
     <string name="background_color">Background color</string>
+    <string name="widget_setting_show_grades">Course Grades</string>
+    <string name="widget_setting_show_color_overlay">Course Color Overlay</string>
     <string name="offline_content_available">Offline content available</string>
     <string name="a11y_contentDescription_moreOptions">More options</string>
     <string name="customizeCourse">Customize Course</string>
     <string name="favoriteCoursesAndGroups">Favorite Courses and Groups</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">External Tools are not available offline.</string>
+    <string name="widget_weekly_summary">Weekly Summary</string>
+
+    <string name="dashboardCourseNickname">Nickname</string>
+    <string name="dashboardCourseNicknameHint">Write course nickname here</string>
+    <string name="dashboardCourseColor">Course Color</string>
+    <string name="widget_toDo">Daily To-do</string>
+    <string name="dailyToDoWidgetTitle">Daily To-do</string>
+    <string name="todoWidget_showCompleted">Show Completed</string>
+    <string name="todoWidget_emptyTitle">You\'re all done for now!</string>
+    <string name="todoWidget_emptyMessage">Looks like you\'re free for this day.\nDo you want to add some To-dos?</string>
+    <string name="todoWidget_addTodo">Add To-do</string>
+    <string name="todoWidget_errorTitle">Oops, Something went wrong</string>
+    <string name="todoWidget_errorMessage">We weren\'t able to load your To-dos.\nTry again, or come back later.</string>
+    <string name="todoWidget_refresh">Refresh</string>
+    <string name="todoWidget_today">Today</string>
+    <string name="a11y_todoWidget_jumpToToday">Jump to today</string>
+    <string name="widgetSettings_widgetsColor">Dashboard Main Color</string>
+    <string name="dashboard_globalAnnouncement">Global Announcement</string>
+    <string name="forecastWidget_currentWeek">Current week</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-es-rES/strings.xml b/libs/pandares/src/main/res/values-es-rES/strings.xml
index 2423bd768a..27a663f871 100644
--- a/libs/pandares/src/main/res/values-es-rES/strings.xml
+++ b/libs/pandares/src/main/res/values-es-rES/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">No se ha podido entregar</string>
     <string name="submissionStatusFailedSubtitle">Toca para ver los detalles</string>
     <string name="submissionAndRubric">Entrega y rúbrica</string>
+    <string name="submissionAndFeedback">Entrega y comentarios</string>
     <string name="commentsAndRubric">Comentarios y Rúbrica</string>
     <string name="errorLoadingAssignment">Se ha producido un problema al cargar esta actividad. Comprueba tu conexión y vuelve a intentarlo.</string>
     <string name="submitted">Entregado</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Hoy</string>
+    <string name="tomorrow">Mañana</string>
     <string name="past">Pasado</string>
     <string name="noDate">Sin fecha</string>
     <string name="future">Futuro</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monólogo</string>
     <string name="noItemsToDisplayShort">No hay ítems para mostrar</string>
     <string name="Todo">Tareas pendientes</string>
+    <string name="TodoNew">Tareas pendientes</string>
     <string name="todoFilter">Filtrar las asignaturas</string>
     <string name="filterByEllipsis">Filtrar por...</string>
     <string name="favoriteCoursesLabel">Asignaturas favoritas</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupos</string>
     <string name="groupMembers">Miembros del grupo</string>
 
+    <string name="messageGroup">Mensaje al grupo</string>
     <string name="loading">Cargando&#8230;</string>
     <string name="select_item_to_display">Seleccionar desde la lista</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Tareas pendientes</string>
+    <string name="todoWidgetTitleNew">Tareas pendientes</string>
     <string name="gradesWidgetTitle">Notas</string>
     <string name="notificationWidgetTitle">Notificaciones</string>
     <string name="todoWidgetTitleLong">Canvas: tareas pendientes</string>
+    <string name="todoWidgetTitleLongNew">Canvas: tareas pendientes</string>
     <string name="gradesWidgetTitleLong">Canvas: Notas</string>
     <string name="gradeWidgetTitleLong">Canvas: nota</string>
     <string name="notificationWidgetTitleLong">Canvas: Notificaciones</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Asignaturas</string>
     <string name="toDoList">Lista de tareas pendientes</string>
+    <string name="toDoListNew">Lista de tareas pendientes</string>
+
     <string name="notifications">Notificaciones</string>
     <string name="pushNotifications">Notificaciones automáticas</string>
     <string name="pushNotificationsError">No se han registrado notificaciones automáticas para este dispositivo.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Abrir SpeedGrader</string>
 
-    <string name="search_todo">Lista de tareas pendientes</string>
     <string name="search_course">asignatura asignaturas clase clases</string>
     <string name="search_grades">evaluar notas</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Se debe establecer el título de la página.</string>
     <string name="pageDetails">Detalles de la página</string>
     <string name="saving">Guardando</string>
+    <string name="speedGraderSaving">Guardando</string>
+    <string name="speedGraderSaved">Guardado</string>
+    <string name="speedGraderFailed">Ha habido un error</string>
+    <string name="speedGraderSaveErrorTitle">Lo sentimos, algo ha salido mal</string>
+    <string name="speedGraderSaveErrorMessage">Se ha producido un error al guardar tu modificación de nota. Puedes volver a intentarlo o probar más tarde.</string>
+    <string name="speedGraderSaveErrorContentDescription">Se ha producido un error al guardar la nota. Toca para obtener detalles.</string>
+
     <string name="confirmDeleteEvent">¿Estás seguro de que quieres eliminar este evento?</string>
     <string name="conferencesNotSupported">Los teléfonos móviles aún no admiten conferencias.</string>
     <string name="filePreviewContentDescription">Imagen de vista previa del archivo</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Grabaciones</string>
     <string name="conferenceInProgress">Conferencia en curso</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferencias (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conferencia en curso</string>
+    <string name="conferencesWidgetDismissed">Conferencia descartada</string>
     <string name="a11y_criterion_content_description">Valoración del criterio %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">más información</string>
@@ -1377,6 +1395,10 @@
         <item quantity="one">%s ítem de tareas pendientes</item>
         <item quantity="other">%s ítems de tareas pendientes</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s ítem de tareas pendientes</item>
+        <item quantity="other">%s ítems de tareas pendientes</item>
+    </plurals>
     <string name="noAnnotationSelected">No se ha seleccionado ninguna anotación</string>
     <string name="emailNotifications">Notificaciones por correo electrónico</string>
     <string name="emailNotificationsImmediately">Inmediatamente</string>
@@ -1663,7 +1685,9 @@
     <string name="calendarNoEvents">¡Hoy no hay ningún evento!</string>
     <string name="calendarNoEventsDescription">Parece un día perfecto para descansar, relajarse y recobrar energías.</string>
     <string name="userCalendarToDo">Tareas pendientes</string>
+    <string name="userCalendarToDoNew">Tareas pendientes</string>
     <string name="courseToDo">%s tareas pendientes</string>
+    <string name="courseToDoNew">%s tareas pendientes</string>
     <string name="calendarEventExcused">Justificado</string>
     <string name="calendarEventMissing">No presentado</string>
     <string name="calendarEventGraded">Evaluado</string>
@@ -1688,21 +1712,30 @@
     <string name="a11y_eventCreatedAnnouncement">Se ha creado el evento %s.</string>
     <string name="a11y_eventUpdatedAnnouncement">Se ha actualizado el evento %s.</string>
     <string name="a11y_toDoCreatedAnnouncement">Se han creado las tareas pendientes %s.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Se han creado las tareas pendientes %s.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Se han actualizado las tareas pendientes %s.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Se han actualizado las tareas pendientes %s.</string>
     <string name="todoScreenTitle">Tareas pendientes</string>
+    <string name="todoScreenTitleNew">Tareas pendientes</string>
     <string name="todoDateLabel">Fecha</string>
     <string name="todoDescriptionLabel">Descripción</string>
     <string name="todoDeleteConfirmationTitle">¿Eliminar tareas pendientes?</string>
+    <string name="todoDeleteConfirmationTitleNew">¿Eliminar tarea pendiente?</string>
     <string name="todoDeleteConfirmationText">Esto eliminará permanentemente tu ítem de tareas pendientes.</string>
+    <string name="todoDeleteConfirmationTextNew">Esto eliminará permanentemente tu ítem de tareas pendientes.</string>
     <string name="todoDeleteErrorMessage">Se ha producido un error al eliminar esta tarea pendiente. Comprueba tu conexión y vuelve a intentarlo.</string>
+    <string name="todoDeleteErrorMessageNew">Se ha producido un error al eliminar esta tarea pendiente. Comprueba tu conexión y vuelve a intentarlo.</string>
     <string name="createTodoScreenTitle">Nueva tarea pendiente</string>
+    <string name="createTodoScreenTitleNew">Nueva tarea pendiente</string>
     <string name="editTodoScreenTitle">Editar tarea pendiente</string>
+    <string name="editTodoScreenTitleNew">Editar tarea pendiente</string>
     <string name="createToDoTitleHint">Añadir título</string>
     <string name="createToDoDateLabel">Fecha</string>
     <string name="createToDoTimeLabel">Hora</string>
     <string name="createToDoCalendarLabel">Calendario</string>
     <string name="createToDoDetailsLabel">Detalles</string>
     <string name="todoSaveErrorMessage">Se ha producido un error al guardar esta tarea pendiente. Comprueba tu conexión y vuelve a intentarlo.</string>
+    <string name="todoSaveErrorMessageNew">Se ha producido un error al guardar esta tarea pendiente. Comprueba tu conexión y vuelve a intentarlo.</string>
     <string name="selectCalendarScreenTitle">Seleccionar calendario</string>
     <string name="errorContentRetryButton">Reintentar</string>
     <string name="eventLocationLabel">Ubicación</string>
@@ -1710,6 +1743,7 @@
     <string name="eventDetailsLabel">Detalles</string>
     <string name="errorLoadingEvent">Ha surgido un problema al cargar este evento. Comprueba tu conexión y vuelve a intentarlo.</string>
     <string name="errorLoadingTodo">Ha surgido un problema al cargar estas tareas pendientes. Comprueba tu conexión y vuelve a intentarlo.</string>
+    <string name="errorLoadingTodoNew">Se ha producido un problema al cargar esta tarea pendiente. Comprueba tu conexión y vuelve a intentarlo.</string>
     <string name="eventDeleteConfirmationTitle">¿Eliminar el evento?</string>
     <string name="eventDeleteConfirmationText">Esto eliminará permanentemente tu evento.</string>
     <string name="eventDeleteErrorMessage">Se ha producido un error al eliminar este evento. Comprueba tu conexión y vuelve a intentarlo.</string>
@@ -1726,6 +1760,7 @@
     <string name="eventDeleteScopeAll">Todos los eventos</string>
     <string name="eventDeleteScopeFollowing">Este y todos los eventos siguientes</string>
     <string name="calendarAddToDo">Añadir tarea pendiente</string>
+    <string name="calendarAddToDoNew">Añadir tarea pendiente</string>
     <string name="calendarAddEvent">Añadir evento</string>
     <string name="createEventScreenTitle">Nuevo evento</string>
     <string name="editEventScreenTitle">Editar evento</string>
@@ -2104,7 +2139,9 @@
     <string name="widgetNotLoggedInTitle">¡Permítenos ayudarte a iniciar sesión!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Para ver tus tareas pendientes, inicia sesión en tu cuenta desde la aplicación. ¡Solo te llevará un segundo!</string>
     <string name="a11y_widgetToDoOpenToDoList">Abrir la pantalla de la lista de tareas pendientes</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Abrir la pantalla de la lista de tareas pendientes</string>
     <string name="a11y_widgetToDoCreateNewToDo">Crear nueva tarea pendiente</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Crear nueva tarea pendiente</string>
     <string name="widgetGradesErrorSubtitle">Estamos teniendo problemas para mostrar tus notas en este momento. Inténtalo de nuevo transcurridos unos instantes o dirígete a la aplicación.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Para ver tus notas, inicia sesión en tu cuenta desde la aplicación. ¡Solo te llevará un segundo!</string>
     <string name="widgetSingleGradeErrorSubtitle">Estamos teniendo problemas para mostrar tus notas en este momento.</string>
@@ -2112,6 +2149,19 @@
     <string name="widgetSingleGradeSelectCourse">Elijamos una asignatura</string>
     <string name="widgetGradesErrorLoadingCourses">Se ha producido un error al cargar las asignaturas.</string>
     <string name="settingsSwitchExperience">Cambiar a Canvas Career</string>
+    <string name="forecastWidgetTitle">Resumen semanal</string>
+    <string name="forecastWidgetWeekPeriod">Semana %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">No presentado</string>
+    <string name="forecastWidgetDue">Fecha de entrega</string>
+    <string name="forecastWidgetRecentGrades">Nuevas notas</string>
+    <string name="forecastWidgetGradeWeight">%d%% de la nota final</string>
+    <string name="forecastWidgetErrorMessage">Tenemos problemas para cargar tus actividades. Comprueba tu conexión y vuelve a intentarlo.</string>
+    <string name="forecastWidgetEmptyMissing">No falta ninguna actividad. ¡Ya estás al día!</string>
+    <string name="forecastWidgetEmptyDue">No hay ninguna actividad que entregar esta semana.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No hay notas nuevas esta semana.</string>
+    <string name="a11y_contentDescription_previousWeek">Semana anterior</string>
+    <string name="a11y_contentDescription_nextWeek">Semana siguiente</string>
+
     <string name="speedGraderGradeTabTitle">Nota y rúbrica</string>
     <string name="speedGraderDetailsTabTitle">Detalles</string>
     <string name="a11y_contentDescription_expandPanel">Expandir panel</string>
@@ -2190,6 +2240,7 @@
     <string name="errorLoadingToDos">Se ha producido un error al cargar tus ítems de tareas pendientes. Comprueba tu conexión y vuelve a intentarlo.</string>
     <string name="errorUpdatingToDo">Se ha producido un error al actualizar el ítem de tareas pendientes. Comprueba tu conexión y vuelve a intentarlo.</string>
     <string name="noToDosForNow">¡No hay ninguna tarea pendiente por ahora!</string>
+    <string name="noToDosForNowNew">¡No hay tareas pendientes de momento!</string>
     <string name="noToDosForNowSubtext">Parece un momento perfecto para descansar, relajarse y recobrar energías.</string>
     <string name="todoSwipeDone">Hecho</string>
     <string name="todoSwipeUndo">Deshacer</string>
@@ -2200,8 +2251,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferencias de la lista de tareas pendientes</string>
+    <string name="todoFilterPreferencesNew">Preferencias de la lista de tareas pendientes</string>
     <string name="todoFilterVisibleItems">Elementos visibles</string>
     <string name="todoFilterShowPersonalToDos">Mostrar tareas pendientes personales</string>
+    <string name="todoFilterShowPersonalToDosNew">Mostrar tareas pendientes personales</string>
     <string name="todoFilterShowCalendarEvents">Mostrar eventos del calendario</string>
     <string name="todoFilterShowCompleted">Mostrar lo completado</string>
     <string name="todoFilterFavoriteCoursesOnly">Solo asignaturas favoritas</string>
@@ -2228,6 +2281,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Rechazar invitación</string>
     <string name="courseInvitationDeclineConfirmMessage">¿Seguro que quieres rechazar la invitación a %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progreso</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">¡Buenos días, %s!</string>
@@ -2350,6 +2406,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hola, %s</string>
 
+    <string name="courses_and_groups">Asignaturas y grupos</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personalizar el panel de control</string>
     <string name="dashboard_widgets">Componentes</string>
@@ -2359,16 +2416,44 @@
     <string name="changing_dashboard_layout">Cambiar el diseño del panel de control</string>
     <string name="changing_dashboard_layout_message">Para cambiar el diseño del panel de control, debes reiniciar la aplicación</string>
     <string name="restart_now">Reiniciar ahora</string>
+    <string name="turn_on_new_dashboard">Activar el nuevo panel de control</string>
     <string name="switched_back">¿Has vuelto a cambiar?</string>
     <string name="switched_back_message">¡Gracias por probar el nuevo panel de control! ¿Podrías decirnos por qué has vuelto a cambiar?</string>
+    <string name="survey_option_hard_to_find">Es difícil encontrar las cosas</string>
+    <string name="survey_option_prefer_old_layout">Prefiero el diseño anterior</string>
+    <string name="survey_option_something_broken">Algo no ha funcionado bien</string>
     <string name="what_could_we_improve">¿Qué podríamos mejorar?</string>
+    <string name="what_do_you_think_of_new_dashboard">¿Qué te parece el nuevo panel de control?</string>
+    <string name="let_us_know">¡Cuéntanos!</string>
+    <string name="no_app_to_handle_link">No hay ninguna aplicación disponible para abrir este enlace</string>
     <string name="skip">Saltar</string>
     <string name="widget_setting_show_greeting">Mostrar saludo</string>
     <string name="background_color">Color de fondo</string>
+    <string name="widget_setting_show_grades">Notas de la asignatura</string>
+    <string name="widget_setting_show_color_overlay">Superposición de colores de la asignatura</string>
     <string name="offline_content_available">Contenido disponible sin conexión</string>
     <string name="a11y_contentDescription_moreOptions">Más opciones</string>
     <string name="customizeCourse">Personalizar asignatura</string>
     <string name="favoriteCoursesAndGroups">Asignaturas y grupos favoritos</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Las herramientas externas no están disponibles sin conexión.</string>
+    <string name="widget_weekly_summary">Resumen semanal</string>
+
+    <string name="dashboardCourseNickname">Apodo</string>
+    <string name="dashboardCourseNicknameHint">Escribe aquí el apodo de la asignatura</string>
+    <string name="dashboardCourseColor">Color de la asignatura</string>
+    <string name="widget_toDo">Tareas pendientes diarias</string>
+    <string name="dailyToDoWidgetTitle">Tareas pendientes diarias</string>
+    <string name="todoWidget_showCompleted">Mostrar lo completado</string>
+    <string name="todoWidget_emptyTitle">¡De momento, has terminado!</string>
+    <string name="todoWidget_emptyMessage">Parece que estás libre este día.\n¿Quieres añadir algunas tareas pendientes?</string>
+    <string name="todoWidget_addTodo">Añadir tarea pendiente</string>
+    <string name="todoWidget_errorTitle">Lo sentimos, algo ha salido mal</string>
+    <string name="todoWidget_errorMessage">No hemos podido cargar tus tareas pendientes.\nInténtalo de nuevo o vuelve más tarde.</string>
+    <string name="todoWidget_refresh">Actualizar</string>
+    <string name="todoWidget_today">Hoy</string>
+    <string name="a11y_todoWidget_jumpToToday">Ir a hoy</string>
+    <string name="widgetSettings_widgetsColor">Color principal del panel de control</string>
+    <string name="dashboard_globalAnnouncement">Anuncio global</string>
+    <string name="forecastWidget_currentWeek">Semana actual</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-es/strings.xml b/libs/pandares/src/main/res/values-es/strings.xml
index a523a70fc9..ce2750363b 100644
--- a/libs/pandares/src/main/res/values-es/strings.xml
+++ b/libs/pandares/src/main/res/values-es/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">No se pudo entregar</string>
     <string name="submissionStatusFailedSubtitle">Toca para ver los detalles</string>
     <string name="submissionAndRubric">Entrega y rúbrica</string>
+    <string name="submissionAndFeedback">Entrega y comentarios</string>
     <string name="commentsAndRubric">Comentarios y Rúbrica</string>
     <string name="errorLoadingAssignment">Se produjo un problema al cargar esta tarea. Compruebe su conexión y vuelva a intentarlo.</string>
     <string name="submitted">Entregado</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Hoy</string>
+    <string name="tomorrow">Mañana</string>
     <string name="past">Pasado</string>
     <string name="noDate">Sin fecha</string>
     <string name="future">Futuro</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monólogo</string>
     <string name="noItemsToDisplayShort">No hay items para mostrar</string>
     <string name="Todo">Por hacer</string>
+    <string name="TodoNew">Ítem Por hacer</string>
     <string name="todoFilter">Filtrar los cursos</string>
     <string name="filterByEllipsis">Filtrar por ...</string>
     <string name="favoriteCoursesLabel">Cursos favoritos</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupos</string>
     <string name="groupMembers">Miembros del grupo</string>
 
+    <string name="messageGroup">Mensaje al grupo</string>
     <string name="loading">Cargando&#8230;</string>
     <string name="select_item_to_display">Seleccionar desde la lista</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Por hacer</string>
+    <string name="todoWidgetTitleNew">Ítem Por hacer</string>
     <string name="gradesWidgetTitle">Calificaciones</string>
     <string name="notificationWidgetTitle">Notificaciones</string>
     <string name="todoWidgetTitleLong">Canvas: Por hacer</string>
+    <string name="todoWidgetTitleLongNew">Canvas: Ítem Por hacer</string>
     <string name="gradesWidgetTitleLong">Canvas: Calificaciones</string>
     <string name="gradeWidgetTitleLong">Canvas: calificación</string>
     <string name="notificationWidgetTitleLong">Canvas: Notificaciones</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Cursos</string>
     <string name="toDoList">Lista de cosas por hacer</string>
+    <string name="toDoListNew">Lista de ítems Por hacer</string>
+
     <string name="notifications">Notificaciones</string>
     <string name="pushNotifications">Notificaciones automáticas</string>
     <string name="pushNotificationsError">No se han registrado notificaciones automáticas para este dispositivo.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Abrir SpeedGrader</string>
 
-    <string name="search_todo">Lista de cosa o cosas por hacer</string>
     <string name="search_course">curso cursos clase clases</string>
     <string name="search_grades">calificación calificaciones</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Se debe establecer el título de la página.</string>
     <string name="pageDetails">Detalles de la página</string>
     <string name="saving">Guardando</string>
+    <string name="speedGraderSaving">Guardando</string>
+    <string name="speedGraderSaved">Guardado</string>
+    <string name="speedGraderFailed">No aprobado</string>
+    <string name="speedGraderSaveErrorTitle">Lo siento. Algo salió mal</string>
+    <string name="speedGraderSaveErrorMessage">Se produjo un error al guardar a modificación de la calificación. Puede volver a intentarlo o intentarlo más tarde.</string>
+    <string name="speedGraderSaveErrorContentDescription">No se pudo guardar la calificación. Toque aquí para obtener más información.</string>
+
     <string name="confirmDeleteEvent">¿Está seguro de que desea eliminar este evento?</string>
     <string name="conferencesNotSupported">Los teléfonos móviles aún no admiten conferencias.</string>
     <string name="filePreviewContentDescription">Imagen de vista previa del archivo</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Grabaciones</string>
     <string name="conferenceInProgress">Conferencia en curso</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferencias (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conferencia en curso</string>
+    <string name="conferencesWidgetDismissed">Conferencia suspendida</string>
     <string name="a11y_criterion_content_description">Valoración del criterio %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">más información</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s ítem Por hacer</item>
         <item quantity="other">%s ítems Por hacer</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s ítem Por hacer</item>
+        <item quantity="other">%s ítems Por hacer</item>
+    </plurals>
     <string name="noAnnotationSelected">No se seleccionó ninguna anotación</string>
     <string name="emailNotifications">Notificaciones por correo electrónico</string>
     <string name="emailNotificationsImmediately">Inmediatamente</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">¡No hay ningún evento hoy!</string>
     <string name="calendarNoEventsDescription">Este parece ser un día excelente para descansar, relajarse y recargar energías.</string>
     <string name="userCalendarToDo">Por hacer</string>
+    <string name="userCalendarToDoNew">Ítem Por hacer</string>
     <string name="courseToDo">Por hacer de %s</string>
+    <string name="courseToDoNew">%s ítem Por hacer</string>
     <string name="calendarEventExcused">Justificado</string>
     <string name="calendarEventMissing">Faltante</string>
     <string name="calendarEventGraded">Calificado</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">El evento %s se creó de forma satisfactoria.</string>
     <string name="a11y_eventUpdatedAnnouncement">El evento %s se actualizó de forma satisfactoria.</string>
     <string name="a11y_toDoCreatedAnnouncement">“Por hacer” %s se creó de forma satisfactoria.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">El ítem Por hacer %s se creó de manera satisfactoria.</string>
     <string name="a11y_toDoUpdatedAnnouncement">“Por hacer” %s se actualizó de forma satisfactoria.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">El ítem Por hacer %s se actualizó de manera satisfactoria.</string>
     <string name="todoScreenTitle">Por hacer</string>
+    <string name="todoScreenTitleNew">Ítem Por hacer</string>
     <string name="todoDateLabel">Fecha</string>
     <string name="todoDescriptionLabel">Descripción</string>
     <string name="todoDeleteConfirmationTitle">¿Quiere eliminar el elemento Por hacer?</string>
+    <string name="todoDeleteConfirmationTitleNew">¿Quiere eliminar el ítem Por hacer?</string>
     <string name="todoDeleteConfirmationText">Esto eliminará de manera permanente su elemento Por hacer.</string>
+    <string name="todoDeleteConfirmationTextNew">Esto eliminará de manera permanente el ítem Por hacer.</string>
     <string name="todoDeleteErrorMessage">Hubo un error al eliminar esta Tarea por hacer. Compruebe su conexión y vuelva a intentarlo.</string>
+    <string name="todoDeleteErrorMessageNew">Se produjo un error al eliminar este ítem Por hacer. Compruebe su conexión e inténtelo de nuevo.</string>
     <string name="createTodoScreenTitle">Nueva Tarea por hacer</string>
+    <string name="createTodoScreenTitleNew">Nuevo ítem Por hacer</string>
     <string name="editTodoScreenTitle">Editar Por hacer</string>
+    <string name="editTodoScreenTitleNew">Editar el ítem Por hacer</string>
     <string name="createToDoTitleHint">Agregar título</string>
     <string name="createToDoDateLabel">Fecha</string>
     <string name="createToDoTimeLabel">Hora</string>
     <string name="createToDoCalendarLabel">Calendario</string>
     <string name="createToDoDetailsLabel">Detalles</string>
     <string name="todoSaveErrorMessage">Hubo un error al guardar esta Tarea por hacer. Compruebe su conexión y vuelva a intentarlo.</string>
+    <string name="todoSaveErrorMessageNew">Se produjo un error al guardar este ítem Por hacer. Compruebe su conexión e inténtelo de nuevo.</string>
     <string name="selectCalendarScreenTitle">Seleccionar calendario</string>
     <string name="errorContentRetryButton">Reintentar</string>
     <string name="eventLocationLabel">Ubicación</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Detalles</string>
     <string name="errorLoadingEvent">Se produjo un problema al cargar este evento. Compruebe su conexión y vuelva a intentarlo.</string>
     <string name="errorLoadingTodo">Hubo un problema al cargar esta tarea pendiente. Compruebe su conexión e inténtelo de nuevo.</string>
+    <string name="errorLoadingTodoNew">Hubo un problema al cargar este ítem Por hacer. Compruebe su conexión e inténtelo de nuevo.</string>
     <string name="eventDeleteConfirmationTitle">¿Eliminar evento?</string>
     <string name="eventDeleteConfirmationText">Esto eliminará permanentemente su evento.</string>
     <string name="eventDeleteErrorMessage">Hubo un error al eliminar este evento. Compruebe su conexión y vuelva a intentarlo.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Todos los eventos</string>
     <string name="eventDeleteScopeFollowing">Este y todos los siguientes eventos</string>
     <string name="calendarAddToDo">Agregar tareas por hacer</string>
+    <string name="calendarAddToDoNew">Agregar ítem Por hacer</string>
     <string name="calendarAddEvent">Agregar evento</string>
     <string name="createEventScreenTitle">Nuevo evento</string>
     <string name="editEventScreenTitle">Editar el evento</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">¡Iniciemos sesión!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Para ver sus tareas por hacer, inicie sesión en su cuenta en la aplicación. ¡Será rápido!</string>
     <string name="a11y_widgetToDoOpenToDoList">Abrir pantalla de lista de tareas por hacer</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Abrir pantalla de lista de ítems Por hacer</string>
     <string name="a11y_widgetToDoCreateNewToDo">Crear nueva tarea por hacer</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Crear nuevo ítem Por hacer</string>
     <string name="widgetGradesErrorSubtitle">Tenemos problemas para mostrar sus calificaciones en este momento. Inténtelo de nuevo dentro de un rato o diríjase a la aplicación.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Para ver sus calificaciones, inicie sesión en su cuenta en la aplicación. ¡Será rápido!</string>
     <string name="widgetSingleGradeErrorSubtitle">Tenemos problemas para mostrar sus calificaciones en este momento.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Elijamos un curso.</string>
     <string name="widgetGradesErrorLoadingCourses">Se produjo un error al cargar los cursos.</string>
     <string name="settingsSwitchExperience">Cambiar a Canvas Career</string>
+    <string name="forecastWidgetTitle">Resumen semanal</string>
+    <string name="forecastWidgetWeekPeriod">Semana %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Faltantes</string>
+    <string name="forecastWidgetDue">Fecha de entrega</string>
+    <string name="forecastWidgetRecentGrades">Nuevas calificaciones</string>
+    <string name="forecastWidgetGradeWeight">%d%% de la calificación final</string>
+    <string name="forecastWidgetErrorMessage">Estamos teniendo problemas para cargar sus tareas. Compruebe su conexión e inténtelo de nuevo.</string>
+    <string name="forecastWidgetEmptyMissing">No hay tareas pendientes. ¡Está al día!</string>
+    <string name="forecastWidgetEmptyDue">No hay tareas que entregar esta semana.</string>
+    <string name="forecastWidgetEmptyRecentGrades">No hay nuevas calificaciones esta semana.</string>
+    <string name="a11y_contentDescription_previousWeek">Semana pasada</string>
+    <string name="a11y_contentDescription_nextWeek">Próxima semana</string>
+
     <string name="speedGraderGradeTabTitle">Calificación y rúbrica</string>
     <string name="speedGraderDetailsTabTitle">Detalles</string>
     <string name="a11y_contentDescription_expandPanel">Expandir panel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Se produjo un error al cargar los ítems Por hacer. Compruebe su conexión e inténtelo de nuevo.</string>
     <string name="errorUpdatingToDo">Se produjo un error al actualizar los ítems Por hacer. Compruebe su conexión e inténtelo de nuevo.</string>
     <string name="noToDosForNow">Por ahora, no hay ningún ítem Por hacer.</string>
+    <string name="noToDosForNowNew">Por ahora, no hay ningún ítem Por hacer.</string>
     <string name="noToDosForNowSubtext">Parece ser un buen momento para descansar, relajarse y recargar energías.</string>
     <string name="todoSwipeDone">Listo</string>
     <string name="todoSwipeUndo">Deshacer</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferencias de la lista de ítems Por hacer</string>
+    <string name="todoFilterPreferencesNew">Preferencias de la lista de ítems Por hacer</string>
     <string name="todoFilterVisibleItems">Ítems visibles</string>
     <string name="todoFilterShowPersonalToDos">Mostrar ítems Por hacer personales</string>
+    <string name="todoFilterShowPersonalToDosNew">Mostrar ítems Por hacer personales</string>
     <string name="todoFilterShowCalendarEvents">Mostrar eventos del calendario</string>
     <string name="todoFilterShowCompleted">Mostrar completados</string>
     <string name="todoFilterFavoriteCoursesOnly">Solo cursos favoritos</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Rechazar invitación</string>
     <string name="courseInvitationDeclineConfirmMessage">¿Confirma que quiere rechazar la invitación a %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progreso</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">¡Buenos días, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hola, %s</string>
 
+    <string name="courses_and_groups">Cursos y grupos</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personalizar tablero</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Cambiar el diseño del tablero</string>
     <string name="changing_dashboard_layout_message">Para cambiar el diseño del tablero, tiene que reiniciar la aplicación</string>
     <string name="restart_now">Reiniciar ahora</string>
+    <string name="turn_on_new_dashboard">Activar el nuevo tablero</string>
     <string name="switched_back">¿Volvió al diseño anterior?</string>
     <string name="switched_back_message">Gracias por probar el nuevo tablero. ¿Podría decirnos por qué volvió al diseño anterior?</string>
+    <string name="survey_option_hard_to_find">¿Le cuesta encontrar algo?</string>
+    <string name="survey_option_prefer_old_layout">Prefiero el diseño anterior</string>
+    <string name="survey_option_something_broken">Algo no funcionó bien.</string>
     <string name="what_could_we_improve">¿Qué mejoras podríamos hacer?</string>
+    <string name="what_do_you_think_of_new_dashboard">¿Qué opina del nuevo tablero?</string>
+    <string name="let_us_know">¡Háganoslo saber!</string>
+    <string name="no_app_to_handle_link">No hay ninguna aplicación disponible para abrir este enlace</string>
     <string name="skip">Saltar</string>
     <string name="widget_setting_show_greeting">Mostrar saludo</string>
     <string name="background_color">Color de fondo</string>
+    <string name="widget_setting_show_grades">Calificaciones del curso</string>
+    <string name="widget_setting_show_color_overlay">Superposición de colores del curso</string>
     <string name="offline_content_available">Contenido sin conexión disponible</string>
     <string name="a11y_contentDescription_moreOptions">Más opciones</string>
     <string name="customizeCourse">Personalizar curso</string>
     <string name="favoriteCoursesAndGroups">Cursos y grupos favoritos</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Las herramientas externas no están disponibles sin conexión.</string>
+    <string name="widget_weekly_summary">Resumen semanal</string>
+
+    <string name="dashboardCourseNickname">Apodo</string>
+    <string name="dashboardCourseNicknameHint">Escriba aquí el apodo del curso</string>
+    <string name="dashboardCourseColor">Color del curso</string>
+    <string name="widget_toDo">Tareas diarias</string>
+    <string name="dailyToDoWidgetTitle">Tareas diarias</string>
+    <string name="todoWidget_showCompleted">Mostrar completados</string>
+    <string name="todoWidget_emptyTitle">Ya terminó por ahora.</string>
+    <string name="todoWidget_emptyMessage">Parece que está libre hoy.\n¿Quiere agregar algunas tareas pendientes?</string>
+    <string name="todoWidget_addTodo">Agregar ítems Por hacer</string>
+    <string name="todoWidget_errorTitle">Lo siento. Algo salió mal</string>
+    <string name="todoWidget_errorMessage">No pudimos cargar las tareas pendientes.\nInténtelo de nuevo o vuelva más tarde.</string>
+    <string name="todoWidget_refresh">Actualizar</string>
+    <string name="todoWidget_today">Hoy</string>
+    <string name="a11y_todoWidget_jumpToToday">Saltar a hoy</string>
+    <string name="widgetSettings_widgetsColor">Color principal del tablero</string>
+    <string name="dashboard_globalAnnouncement">Anuncio global</string>
+    <string name="forecastWidget_currentWeek">Semana actual</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-fi/strings.xml b/libs/pandares/src/main/res/values-fi/strings.xml
index 2b687f1dc3..ffa2889783 100644
--- a/libs/pandares/src/main/res/values-fi/strings.xml
+++ b/libs/pandares/src/main/res/values-fi/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Lähetys epäonnistui</string>
     <string name="submissionStatusFailedSubtitle">Napauta tarkastellaksesi tietoja</string>
     <string name="submissionAndRubric">Lähetys &amp; Rubriikki</string>
+    <string name="submissionAndFeedback">Tehtävänpalautus &amp; Palaute</string>
     <string name="commentsAndRubric">Kommentit &amp; Rubriikki</string>
     <string name="errorLoadingAssignment">Tämän tehtävän lataamisessa ilmeni ongelma. Tarkasta yhteytesi ja yritä uudelleen.</string>
     <string name="submitted">Lähetetty</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Tänään</string>
+    <string name="tomorrow">Huomenna</string>
     <string name="past">Edelliset</string>
     <string name="noDate">Ei päivämäärää</string>
     <string name="future">Tulevaisuus</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologi</string>
     <string name="noItemsToDisplayShort">Ei näytettäviä kohteita</string>
     <string name="Todo">Tehtävä</string>
+    <string name="TodoNew">Tehtävälista</string>
     <string name="todoFilter">Suodata kursseja</string>
     <string name="filterByEllipsis">Suodatustapa...</string>
     <string name="favoriteCoursesLabel">Suosikkikurssit</string>
@@ -474,6 +477,7 @@
     <string name="groups">Ryhmät</string>
     <string name="groupMembers">Ryhmän jäsenet</string>
 
+    <string name="messageGroup">Lähetä viesti ryhmälle</string>
     <string name="loading">Ladataan&#8230;</string>
     <string name="select_item_to_display">Valitse luettelosta.</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Tehtävä</string>
+    <string name="todoWidgetTitleNew">Tehtävälista</string>
     <string name="gradesWidgetTitle">Arvosanat</string>
     <string name="notificationWidgetTitle">Ilmoitukset</string>
     <string name="todoWidgetTitleLong">Canvas - Tehtävälista</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Tehtävälista</string>
     <string name="gradesWidgetTitleLong">Canvas - Arvosanat</string>
     <string name="gradeWidgetTitleLong">Canvas - Arvosana</string>
     <string name="notificationWidgetTitleLong">Canvas - Ilmoitukset</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kurssit</string>
     <string name="toDoList">Tehtäväluettelo</string>
+    <string name="toDoListNew">Tehtävä-luettelo</string>
+
     <string name="notifications">Ilmoitukset</string>
     <string name="pushNotifications">Push-ilmoitukset</string>
     <string name="pushNotificationsError">Push-ilmoituksia ei ole rekisteröity tälle laitteelle.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Avaa Speedgrader</string>
 
-    <string name="search_todo">mitätehdä mitä tehdä mitä tehdä -luettelo</string>
     <string name="search_course">kurssi kurssit luokka luokat</string>
     <string name="search_grades">arvosanat arvosanat</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Sivun otsikko täytyy määrittää.</string>
     <string name="pageDetails">Sivun tiedot</string>
     <string name="saving">Tallennetaan</string>
+    <string name="speedGraderSaving">Tallennetaan</string>
+    <string name="speedGraderSaved">Tallennettu</string>
+    <string name="speedGraderFailed">Epäonnistui</string>
+    <string name="speedGraderSaveErrorTitle">Hups, jotakin meni pieleen</string>
+    <string name="speedGraderSaveErrorMessage">Arvosanojen antoasteikon muokkauksessa ilmeni virhe. Voit yrittää uudelleen tai yrittää uudelleen myöhemmin.</string>
+    <string name="speedGraderSaveErrorContentDescription">Arvosanan tallennus epäonnistui. Napauta saadaksesi lisätietoja.</string>
+
     <string name="confirmDeleteEvent">Haluatko varmasti poistaa tämän tapahtuman?</string>
     <string name="conferencesNotSupported">Konferensseja ei vielä tueta matkapuhelimessa.</string>
     <string name="filePreviewContentDescription">Tiedoston esikatselukuva</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Nauhoitukset</string>
     <string name="conferenceInProgress">Kokous käynnissä</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferenssit (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Kokous käynnissä</string>
+    <string name="conferencesWidgetDismissed">Konferenssi hylätty</string>
     <string name="a11y_criterion_content_description">Kriteerien luokitukset %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">lisätietoja</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s tehtävä</item>
         <item quantity="other">%s tehtävää</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s tehtävä</item>
+        <item quantity="other">%s tehtävää</item>
+    </plurals>
     <string name="noAnnotationSelected">Merkintää ei valittu</string>
     <string name="emailNotifications">Sähköposti-ilmoitukset</string>
     <string name="emailNotificationsImmediately">Välittömästi</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Ei tapahtumia tänään!</string>
     <string name="calendarNoEventsDescription">Näyttää olevan hyvä päivä levätä, rentoutua ja latautua.</string>
     <string name="userCalendarToDo">Tehtävälista</string>
+    <string name="userCalendarToDoNew">Tehtävälista</string>
     <string name="courseToDo">%s Tehtävä</string>
+    <string name="courseToDoNew">%s Tehtävä</string>
     <string name="calendarEventExcused">Vapautettu</string>
     <string name="calendarEventMissing">Puuttuu</string>
     <string name="calendarEventGraded">Arvioitu</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Tapahtuman %s luonti onnistui.</string>
     <string name="a11y_eventUpdatedAnnouncement">Tapahtuman %s päivitys onnistui.</string>
     <string name="a11y_toDoCreatedAnnouncement">Tehtävälistan %s luonti onnistui.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Tehtävälistan %s luonti onnistui.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Tehtävälistan %s päivitys onnistui.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Tehtävälistan %s päivitys onnistui.</string>
     <string name="todoScreenTitle">Tehtävälista</string>
+    <string name="todoScreenTitleNew">Tehtävälista</string>
     <string name="todoDateLabel">Päivämäärä</string>
     <string name="todoDescriptionLabel">Kuvaus</string>
     <string name="todoDeleteConfirmationTitle">Poistetaanko tehtävä?</string>
+    <string name="todoDeleteConfirmationTitleNew">Poistetaanko tehtävä?</string>
     <string name="todoDeleteConfirmationText">Tämä poistaa tehtävä-kohteesi pysyvästi.</string>
+    <string name="todoDeleteConfirmationTextNew">Tämä poistaa tehtävä-kohteesi pysyvästi.</string>
     <string name="todoDeleteErrorMessage">Tämän tehtävän tallennuksessa tapahtui virhe. Tarkasta yhteytesi ja yritä uudelleen.</string>
+    <string name="todoDeleteErrorMessageNew">Karttoja ladattaessa tapahtui virhe. Tarkista yhteys ja yritä uudelleen.</string>
     <string name="createTodoScreenTitle">Uusi tehtävä</string>
+    <string name="createTodoScreenTitleNew">Uusi tehtävä</string>
     <string name="editTodoScreenTitle">Muokkaa tehtävää</string>
+    <string name="editTodoScreenTitleNew">Muokkaa tehtävää</string>
     <string name="createToDoTitleHint">Lisää otsikko</string>
     <string name="createToDoDateLabel">Päivämäärä</string>
     <string name="createToDoTimeLabel">Aika</string>
     <string name="createToDoCalendarLabel">Kalenteri</string>
     <string name="createToDoDetailsLabel">Lisätiedot</string>
     <string name="todoSaveErrorMessage">Tehtävän tallennuksessa tapahtui virhe. Tarkasta yhteytesi ja yritä uudelleen.</string>
+    <string name="todoSaveErrorMessageNew">Karttoja ladattaessa tapahtui virhe. Tarkista yhteys ja yritä uudelleen.</string>
     <string name="selectCalendarScreenTitle">Valitse kalenteri</string>
     <string name="errorContentRetryButton">Yritä uudelleen</string>
     <string name="eventLocationLabel">Sijainti</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Lisätiedot</string>
     <string name="errorLoadingEvent">Tämän tapahtuman lataamisessa ilmeni ongelma. Tarkasta yhteytesi ja yritä uudelleen.</string>
     <string name="errorLoadingTodo">Tämän tehtävän lataamisessa ilmeni ongelma. Tarkasta yhteytesi ja yritä uudelleen.</string>
+    <string name="errorLoadingTodoNew">Tehtävää ladattaessa tapahtui virhe. Tarkista yhteys ja yritä uudelleen.</string>
     <string name="eventDeleteConfirmationTitle">Poistetaanko tapahtuma?</string>
     <string name="eventDeleteConfirmationText">Tämä poistaa tapahtuma-kohteesi pysyvästi.</string>
     <string name="eventDeleteErrorMessage">Tämän tehtävän tallennuksessa tapahtui virhe. Tarkasta yhteytesi ja yritä uudelleen.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Kaikki tapahtumat</string>
     <string name="eventDeleteScopeFollowing">Tämä ja kaikki seuraavat tapahtumat</string>
     <string name="calendarAddToDo">Lisää tehtäväluetteloon</string>
+    <string name="calendarAddToDoNew">Lisää tehtäväluetteloon</string>
     <string name="calendarAddEvent">Lisää tapahtuma</string>
     <string name="createEventScreenTitle">Uusi tapahtuma</string>
     <string name="editEventScreenTitle">Muokkaa tapahtumaa</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Kirjaudutaan sisään!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Nähdäksesi tehtävälistasi, kirjaudu tilillesi sovelluksessa. Se vie vain hetken!</string>
     <string name="a11y_widgetToDoOpenToDoList">Avaa tehtävälistanäyttö</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Avaa tehtävälistanäyttö</string>
     <string name="a11y_widgetToDoCreateNewToDo">Luo uusi tehtävälista</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Luo uusi tehtävä</string>
     <string name="widgetGradesErrorSubtitle">Arvosanojesi näyttämisessä on tällä hetkellä ongelmia. Yritä uudelleen hetken kuluttua tai siirry sovellukseen.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Nähdäksesi arvosanasi, kirjaudu tilillesi sovelluksessa.. Se vie vain hetken!</string>
     <string name="widgetSingleGradeErrorSubtitle">Arvosanojesi näyttämisessä on tällä hetkellä ongelmia.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Valitaan kurssi</string>
     <string name="widgetGradesErrorLoadingCourses">Kurssien lataamisen yhteydessä tapahtui virhe.</string>
     <string name="settingsSwitchExperience">Vaihda Canvas-uraan</string>
+    <string name="forecastWidgetTitle">Viikoittainen yhteenveto</string>
+    <string name="forecastWidgetWeekPeriod">Viikko %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Puuttuu</string>
+    <string name="forecastWidgetDue">Määräpäivä</string>
+    <string name="forecastWidgetRecentGrades">Uudet arvosanat</string>
+    <string name="forecastWidgetGradeWeight">%d%% lopullisesta arvosanasta</string>
+    <string name="forecastWidgetErrorMessage">Tehtäviesi latauksessa ilmeni virhe. Tarkasta yhteytesi ja yritä uudelleen.</string>
+    <string name="forecastWidgetEmptyMissing">Ei puuttuvia tehtäviä. Olet ajan tasalla!</string>
+    <string name="forecastWidgetEmptyDue">Ei tehtäväpalautusten määräpäivää tällä viikolla.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Ei uusia arvosanoja tällä viikolla.</string>
+    <string name="a11y_contentDescription_previousWeek">Edellinen viikko</string>
+    <string name="a11y_contentDescription_nextWeek">Seuraava viikko</string>
+
     <string name="speedGraderGradeTabTitle">Arvosana &amp; Rubriikki</string>
     <string name="speedGraderDetailsTabTitle">Lisätiedot</string>
     <string name="a11y_contentDescription_expandPanel">Laajenna paneelia</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Tehtäväkohteiden latauksessa ilmeni virhe. Tarkasta yhteytesi ja yritä uudelleen.</string>
     <string name="errorUpdatingToDo">Tehtävien päivittämisessä tapahtui virhe. Tarkasta yhteytesi ja yritä uudelleen.</string>
     <string name="noToDosForNow">Ei tehtäviä nyt!</string>
+    <string name="noToDosForNowNew">Ei tehtäviä nyt!</string>
     <string name="noToDosForNowSubtext">Näyttää olevan hyvä päivä levätä, rentoutua ja latautua.</string>
     <string name="todoSwipeDone">Valmis</string>
     <string name="todoSwipeUndo">Peruuta</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Tehtävälistan asetukset</string>
+    <string name="todoFilterPreferencesNew">Tehtävälistan asetukset</string>
     <string name="todoFilterVisibleItems">Näkyvät kohteet</string>
     <string name="todoFilterShowPersonalToDos">Näytä henkilökohtaiset tehtävät</string>
+    <string name="todoFilterShowPersonalToDosNew">Näytä henkilökohtaiset tehtävät</string>
     <string name="todoFilterShowCalendarEvents">Näytä kalenteritapahtumat</string>
     <string name="todoFilterShowCompleted">Näytä suoritetut</string>
     <string name="todoFilterFavoriteCoursesOnly">Vain suosikkikurssit</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Kieltäydy kutsusta</string>
     <string name="courseInvitationDeclineConfirmMessage">Haluatko varmasti kieltäytyä kutsusta kohteeseen %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Edistyminen</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Hyvää huomenta, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hei, %s</string>
 
+    <string name="courses_and_groups">Kurssit &amp; Ryhmät</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Mukauta koontinäyttöä</string>
     <string name="dashboard_widgets">Pienoisohjelmat</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Koontinäytön asettelun muuttaminen</string>
     <string name="changing_dashboard_layout_message">Jos haluat muuttaa koontinäytön asettelua, sinun täytyy käynnistää sovellus uudelleen</string>
     <string name="restart_now">Käynnistä nyt uudelleen</string>
+    <string name="turn_on_new_dashboard">Ota uusi kojelauta käyttöön</string>
     <string name="switched_back">Vaihdetaanko takaisin?</string>
     <string name="switched_back_message">Kiitos uuden koontinäytön kokeilemisesta! Voitko kertoa, miksi vaihdoit takaisin?</string>
+    <string name="survey_option_hard_to_find">Vaikea löytää asioita</string>
+    <string name="survey_option_prefer_old_layout">Pidän parempana vanhaa asettelua</string>
+    <string name="survey_option_something_broken">Jokin ei toiminut oikein</string>
     <string name="what_could_we_improve">Mitä voisimme parantaa?</string>
+    <string name="what_do_you_think_of_new_dashboard">Mitä mieltä olet uudesta koontinäytöstä?</string>
+    <string name="let_us_know">Kerro meille!</string>
+    <string name="no_app_to_handle_link">Tämän linkin avaamiseen ei ole sovellusta saatavilla</string>
     <string name="skip">Ohita</string>
     <string name="widget_setting_show_greeting">Näytä tervehdys</string>
     <string name="background_color">Taustaväri</string>
+    <string name="widget_setting_show_grades">Kurssin arvosanat</string>
+    <string name="widget_setting_show_color_overlay">Kurssin värikerros</string>
     <string name="offline_content_available">Offline-sisältöä saatavilla</string>
     <string name="a11y_contentDescription_moreOptions">Lisäasetukset</string>
     <string name="customizeCourse">Mukauta kurssi</string>
     <string name="favoriteCoursesAndGroups">Suosikkikurssit ja ryhmät</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Ulkoiset työkalut eivät ole saatavilla verkon ulkopuolella.</string>
+    <string name="widget_weekly_summary">Viikoittainen yhteenveto</string>
+
+    <string name="dashboardCourseNickname">Lempinimi</string>
+    <string name="dashboardCourseNicknameHint">Kirjoita kurssin lyhennys tähän</string>
+    <string name="dashboardCourseColor">Kurssiväri</string>
+    <string name="widget_toDo">Päivittäiset tehtävät</string>
+    <string name="dailyToDoWidgetTitle">Päivittäiset tehtävät</string>
+    <string name="todoWidget_showCompleted">Näytä suoritetut</string>
+    <string name="todoWidget_emptyTitle">Olet nyt valmis!</string>
+    <string name="todoWidget_emptyMessage">Näyttää siltä, että sinulla on vapaata tältä päivältä.\nHaluatko lisätä tehtäviä?</string>
+    <string name="todoWidget_addTodo">Lisää tehtäväluetteloon</string>
+    <string name="todoWidget_errorTitle">Hups, jotakin meni pieleen</string>
+    <string name="todoWidget_errorMessage">Tehtävälistan lataaminen epäonnistui.\nYritä uudelleen tai palaa myöhemmin.</string>
+    <string name="todoWidget_refresh">Päivitä</string>
+    <string name="todoWidget_today">Tänään</string>
+    <string name="a11y_todoWidget_jumpToToday">Siirry tähän päivään</string>
+    <string name="widgetSettings_widgetsColor">Mittariston pääväri</string>
+    <string name="dashboard_globalAnnouncement">Globaali ilmoitus</string>
+    <string name="forecastWidget_currentWeek">Nykyinen viikko</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-fr-rCA/strings.xml b/libs/pandares/src/main/res/values-fr-rCA/strings.xml
index 59c71c4fd0..97e125514a 100644
--- a/libs/pandares/src/main/res/values-fr-rCA/strings.xml
+++ b/libs/pandares/src/main/res/values-fr-rCA/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Échec de l’envoi</string>
     <string name="submissionStatusFailedSubtitle">Tapoter pour voir les détails</string>
     <string name="submissionAndRubric">Envoi et grille de notation</string>
+    <string name="submissionAndFeedback">Envoi et rétroactions</string>
     <string name="commentsAndRubric">Commentaires et grille de notation</string>
     <string name="errorLoadingAssignment">Un problème est survenu lors du chargement de ce travail. Veuillez vérifier votre connexion et réessayer.</string>
     <string name="submitted">Envoyé</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Aujourd\'hui</string>
+    <string name="tomorrow">Demain</string>
     <string name="past">En retard</string>
     <string name="noDate">Pas de date</string>
     <string name="future">Futur</string>
@@ -474,6 +476,7 @@
     <string name="groups">Groupes</string>
     <string name="groupMembers">Membres du groupe</string>
 
+    <string name="messageGroup">Groupe de messages</string>
     <string name="loading">Chargement de&#8230;</string>
     <string name="select_item_to_display">Choisir depuis la liste</string>
 
@@ -1077,6 +1080,13 @@
     <string name="pageTitleMustBeSet">Le titre de la page doit être défini.</string>
     <string name="pageDetails">Détails de la page</string>
     <string name="saving">Sauvegarde en cours</string>
+    <string name="speedGraderSaving">Enregistrement en cours</string>
+    <string name="speedGraderSaved">Enregistré</string>
+    <string name="speedGraderFailed">Échec</string>
+    <string name="speedGraderSaveErrorTitle">Oups, quelque chose n’a pas fonctionné</string>
+    <string name="speedGraderSaveErrorMessage">Une erreur s’est produite lors de l’enregistrement de votre modification de notation. Vous pouvez réessayer, ou réessayer plus tard.</string>
+    <string name="speedGraderSaveErrorContentDescription">L’enregistrement de la notation a échoué. Tapotez pour plus de détails.</string>
+
     <string name="confirmDeleteEvent">Voulez-vous vraiment supprimer cet événement?</string>
     <string name="conferencesNotSupported">Les conférences ne sont pas encore prises en charge sur mobile.</string>
     <string name="filePreviewContentDescription">Image de prévisualisation du fichier</string>
@@ -1225,6 +1235,10 @@
     <string name="recordings">Enregistrements</string>
     <string name="conferenceInProgress">Conférences en cours</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conférences (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conférences en cours</string>
+    <string name="conferencesWidgetDismissed">La conférence est annulée</string>
     <string name="a11y_criterion_content_description">Notes du critère %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">plus d\'informations</string>
@@ -2110,6 +2124,19 @@
     <string name="widgetSingleGradeSelectCourse">Choisissons un cours</string>
     <string name="widgetGradesErrorLoadingCourses">Une erreur s’est produite lors du chargement des cours</string>
     <string name="settingsSwitchExperience">Passer à Canvas Career</string>
+    <string name="forecastWidgetTitle">Résumé hebdomadaire</string>
+    <string name="forecastWidgetWeekPeriod">Semaine #%1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Manquant</string>
+    <string name="forecastWidgetDue">Échéance</string>
+    <string name="forecastWidgetRecentGrades">Nouvelles notes</string>
+    <string name="forecastWidgetGradeWeight">%d%% de la note finale</string>
+    <string name="forecastWidgetErrorMessage">Nous avons des difficultés à charger vos travaux. Veuillez vérifier votre connexion et réessayer.</string>
+    <string name="forecastWidgetEmptyMissing">Pas de travaux manquants. Vous êtes coincé!</string>
+    <string name="forecastWidgetEmptyDue">Aucun travail n’est à rendre cette semaine.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Pas de nouvelles notations cette semaine.</string>
+    <string name="a11y_contentDescription_previousWeek">Semaine précédente</string>
+    <string name="a11y_contentDescription_nextWeek">Semaine prochaine</string>
+
     <string name="speedGraderGradeTabTitle">Notation et Grille de notation</string>
     <string name="speedGraderDetailsTabTitle">Détails</string>
     <string name="a11y_contentDescription_expandPanel">Développer le panneau</string>
@@ -2226,6 +2253,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Refuser l’invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Voulez-vous vraiment décliner l’invitation à %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progrès</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Bonjour, %s!</string>
@@ -2348,6 +2378,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Bonjour, %s</string>
 
+    <string name="courses_and_groups">Cours et groupes</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personnaliser le tableau de bord</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2388,44 @@
     <string name="changing_dashboard_layout">Modifier la présentation du tableau de bord</string>
     <string name="changing_dashboard_layout_message">Pour modifier la présentation du tableau de bord, vous devez redémarrer l’application.</string>
     <string name="restart_now">Redémarrer maintenant</string>
+    <string name="turn_on_new_dashboard">Activer le nouveau tableau de bord</string>
     <string name="switched_back">Remise en place?</string>
     <string name="switched_back_message">Merci d’avoir essayé le nouveau tableau de bord! Pouvez-vous nous dire pourquoi vous avez changé d’avis?</string>
+    <string name="survey_option_hard_to_find">Des objets difficiles à trouver</string>
+    <string name="survey_option_prefer_old_layout">Préférer l’ancienne présentation</string>
+    <string name="survey_option_something_broken">Quelque chose n’a pas fonctionné correctement</string>
     <string name="what_could_we_improve">Que pourrions-nous améliorer?</string>
+    <string name="what_do_you_think_of_new_dashboard">Que pensez-vous du nouveau tableau de bord?</string>
+    <string name="let_us_know">Faites-nous le savoir!</string>
+    <string name="no_app_to_handle_link">Aucune application disponible pour ouvrir ce lien</string>
     <string name="skip">Omettre</string>
     <string name="widget_setting_show_greeting">Afficher le message d’accueil</string>
     <string name="background_color">Couleur d’arrière-plan</string>
+    <string name="widget_setting_show_grades">Notes du cours</string>
+    <string name="widget_setting_show_color_overlay">Superposition de couleurs de cours</string>
     <string name="offline_content_available">Contenu hors ligne disponible</string>
     <string name="a11y_contentDescription_moreOptions">Plus d’options</string>
     <string name="customizeCourse">Personnaliser le cours</string>
     <string name="favoriteCoursesAndGroups">Cours et groupes préférés</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Les outils externes ne sont pas disponibles hors ligne.</string>
+    <string name="widget_weekly_summary">Résumé hebdomadaire</string>
+
+    <string name="dashboardCourseNickname">Pseudonyme :</string>
+    <string name="dashboardCourseNicknameHint">Inscrivez ici le surnom du cours</string>
+    <string name="dashboardCourseColor">Couleur du cours</string>
+    <string name="widget_toDo">Tâches à faire quotidiennes</string>
+    <string name="dailyToDoWidgetTitle">Tâches à faire quotidiennes</string>
+    <string name="todoWidget_showCompleted">Afficher les points terminés</string>
+    <string name="todoWidget_emptyTitle">Vous avez terminé pour l’instant!</string>
+    <string name="todoWidget_emptyMessage">Il semble que vous soyez libre ce jour-là.\nVoulez-vous ajouter des tâches à faire?</string>
+    <string name="todoWidget_addTodo">Ajouter une tâche à accomplir</string>
+    <string name="todoWidget_errorTitle">Oups, quelque chose n’a pas fonctionné</string>
+    <string name="todoWidget_errorMessage">Nous n’avons pas pu charger vos tâches à faire.\nEssayez à nouveau ou revenez plus tard.</string>
+    <string name="todoWidget_refresh">Actualiser</string>
+    <string name="todoWidget_today">Aujourd’hui</string>
+    <string name="a11y_todoWidget_jumpToToday">Se déplacer à aujourd’hui</string>
+    <string name="widgetSettings_widgetsColor">Couleur principale du tableau de bord</string>
+    <string name="dashboard_globalAnnouncement">Annonces mondiales</string>
+    <string name="forecastWidget_currentWeek">Semaine en cours</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-fr/strings.xml b/libs/pandares/src/main/res/values-fr/strings.xml
index d158b75da6..5ca8d8c151 100644
--- a/libs/pandares/src/main/res/values-fr/strings.xml
+++ b/libs/pandares/src/main/res/values-fr/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Échec de l’envoi</string>
     <string name="submissionStatusFailedSubtitle">Tapez sur pour afficher les détails</string>
     <string name="submissionAndRubric">Soumission &amp; Rubrique</string>
+    <string name="submissionAndFeedback">Soumission et feedback</string>
     <string name="commentsAndRubric">Commentaires et rubrique</string>
     <string name="errorLoadingAssignment">Un problème est survenu lors du chargement de ce travail. Veuillez vérifier votre et réessayer.</string>
     <string name="submitted">Soumis</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Aujourd\'hui</string>
+    <string name="tomorrow">Demain</string>
     <string name="past">Passé</string>
     <string name="noDate">Pas de date</string>
     <string name="future">Futur</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">Pas d\'éléments à afficher</string>
     <string name="Todo">À faire</string>
+    <string name="TodoNew">À Faire</string>
     <string name="todoFilter">Filtrer les cours</string>
     <string name="filterByEllipsis">Filtrer par ....</string>
     <string name="favoriteCoursesLabel">Cours favoris</string>
@@ -474,6 +477,7 @@
     <string name="groups">Groupes</string>
     <string name="groupMembers">Membres du groupe</string>
 
+    <string name="messageGroup">Envoyer un message au groupe</string>
     <string name="loading">Chargement&#8230;</string>
     <string name="select_item_to_display">Choisir depuis la liste</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">À faire</string>
+    <string name="todoWidgetTitleNew">À Faire</string>
     <string name="gradesWidgetTitle">Notes</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas – À faire</string>
+    <string name="todoWidgetTitleLongNew">Canvas - À Faire</string>
     <string name="gradesWidgetTitleLong">Canvas - Notes</string>
     <string name="gradeWidgetTitleLong">Canvas - Note</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Cours</string>
     <string name="toDoList">Liste de choses à faire</string>
+    <string name="toDoListNew">Liste À Faire</string>
+
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Notifications push</string>
     <string name="pushNotificationsError">Les notifications push n’ont pas été enregistrées pour cet appareil.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Lancer Speedgrader</string>
 
-    <string name="search_todo">tâche à faire tâches à faire liste des tâches à faire</string>
     <string name="search_course">cours cours classe classes</string>
     <string name="search_grades">note notes</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Vous devez indiquer un titre de page.</string>
     <string name="pageDetails">Détails de la page</string>
     <string name="saving">Sauvegarde</string>
+    <string name="speedGraderSaving">Sauvegarde</string>
+    <string name="speedGraderSaved">Sauvegardé(e)</string>
+    <string name="speedGraderFailed">Échec</string>
+    <string name="speedGraderSaveErrorTitle">Un problème est survenu.</string>
+    <string name="speedGraderSaveErrorMessage">Une erreur est survenue lors de l’enregistrement de la modification de la note. Vous pouvez réessayer maintenant ou plus tard.</string>
+    <string name="speedGraderSaveErrorContentDescription">Échec de l’enregistrement de la note. Appuyer pour afficher les détails.</string>
+
     <string name="confirmDeleteEvent">Êtes-vous sûr de vouloir supprimer cet événement ?</string>
     <string name="conferencesNotSupported">Les conférences ne sont pas encore prises en charge sur mobile.</string>
     <string name="filePreviewContentDescription">Image de prévisualisation de fichier</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Enregistrements</string>
     <string name="conferenceInProgress">Conférence en cours</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conférences (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conférence en cours</string>
+    <string name="conferencesWidgetDismissed">Conférences ignorées</string>
     <string name="a11y_criterion_content_description">Notes du critère %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">Plus d\'informations</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s tâche à faire</item>
         <item quantity="other">%s tâches à faire</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s tâche À Faire</item>
+        <item quantity="other">%s tâches À Faire</item>
+    </plurals>
     <string name="noAnnotationSelected">Aucune annotation sélectionnée</string>
     <string name="emailNotifications">Notifications par courriel</string>
     <string name="emailNotificationsImmediately">Immédiatement</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Aucun événement aujourd\'hui !</string>
     <string name="calendarNoEventsDescription">Voilà une bien belle journée pour se reposer, se relaxer et faire le plein d\'énergie.</string>
     <string name="userCalendarToDo">À Faire</string>
+    <string name="userCalendarToDoNew">À Faire</string>
     <string name="courseToDo">%s À Faire</string>
+    <string name="courseToDoNew">%s À Faire</string>
     <string name="calendarEventExcused">Excusé</string>
     <string name="calendarEventMissing">Manquant</string>
     <string name="calendarEventGraded">Noté</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">L’événement %s a été créé.</string>
     <string name="a11y_eventUpdatedAnnouncement">L’événement %s a été mis à jour.</string>
     <string name="a11y_toDoCreatedAnnouncement">La liste Actions %s a été créée.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Tâche À Faire %s créée.</string>
     <string name="a11y_toDoUpdatedAnnouncement">La liste Actions %s a été mise à jour.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Tâche À Faire %s mise à jour.</string>
     <string name="todoScreenTitle">À Faire</string>
+    <string name="todoScreenTitleNew">À Faire</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Supprimer la tâche À Faire ?</string>
+    <string name="todoDeleteConfirmationTitleNew">Effacer la tâche À Faire ?</string>
     <string name="todoDeleteConfirmationText">Cette action supprimera définitivement votre tâche de la liste À Faire.</string>
+    <string name="todoDeleteConfirmationTextNew">Cette tâche À Faire sera définitivement supprimée.</string>
     <string name="todoDeleteErrorMessage">Une erreur est survenue lors de la suppression de cette tâche À Faire. Veuillez vérifier votre connexion, puis réessayez.</string>
+    <string name="todoDeleteErrorMessageNew">Une erreur s’est produite lors de la suppression de cette tâche À Faire. Vérifiez votre connexion et réessayez.</string>
     <string name="createTodoScreenTitle">Nouvelle tâche À Faire</string>
+    <string name="createTodoScreenTitleNew">Nouvelle tâche À Faire</string>
     <string name="editTodoScreenTitle">Modifier les tâches À Faire</string>
+    <string name="editTodoScreenTitleNew">Modifier la tâche À Faire</string>
     <string name="createToDoTitleHint">Ajouter un titre</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Temps</string>
     <string name="createToDoCalendarLabel">Agenda</string>
     <string name="createToDoDetailsLabel">Détails</string>
     <string name="todoSaveErrorMessage">Une erreur est survenue lors de l’enregistrement de cette tâche À Faire. Veuillez vérifier votre connexion, puis réessayez.</string>
+    <string name="todoSaveErrorMessageNew">Une erreur s’est produite lors de l’enregistrement de cette tâche À Faire. Vérifiez votre connexion et réessayez.</string>
     <string name="selectCalendarScreenTitle">Sélectionner un agenda</string>
     <string name="errorContentRetryButton">Réessayer</string>
     <string name="eventLocationLabel">Emplacement</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Détails</string>
     <string name="errorLoadingEvent">Un problème est survenu lors du chargement de cet événement. Veuillez vérifier votre connexion, puis réessayez.</string>
     <string name="errorLoadingTodo">Un problème est survenu lors du chargement de cette liste de Choses à faire. Veuillez vérifier votre connexion, puis réessayez.</string>
+    <string name="errorLoadingTodoNew">Un problème est survenu lors du chargement de cette tâche À Faire. Vérifiez votre connexion et réessayez.</string>
     <string name="eventDeleteConfirmationTitle">Supprimer l’événement ?</string>
     <string name="eventDeleteConfirmationText">Votre événement sera définitivement supprimé.</string>
     <string name="eventDeleteErrorMessage">Une erreur est survenue lors de la suppression de cet événement. Veuillez vérifier votre connexion, puis réessayez.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Tous les événements</string>
     <string name="eventDeleteScopeFollowing">Cet événement et tous les suivants</string>
     <string name="calendarAddToDo">Ajouter une tâche À faire</string>
+    <string name="calendarAddToDoNew">Ajouter une tâche À Faire</string>
     <string name="calendarAddEvent">Ajouter un événement</string>
     <string name="createEventScreenTitle">Nouvel événement</string>
     <string name="editEventScreenTitle">Modifier l’événement</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Connectez-vous !</string>
     <string name="widgetToDoNotLoggedInSubtitle">Pour afficher votre liste de choses à faire, veuillez vous connecter à votre compte dans l’application. Cela ne prendra que quelques secondes !</string>
     <string name="a11y_widgetToDoOpenToDoList">Ouvrir l’écran de la liste de choses à faire</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Ouvrir l’écran Liste de tâches À Faire</string>
     <string name="a11y_widgetToDoCreateNewToDo">Créer une liste de choses à faire</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Créer une tâche À Faire</string>
     <string name="widgetGradesErrorSubtitle">Nous ne parvenons pas à afficher vos notes pour le moment. Veuillez réessayer dans un moment ou accéder à l’application.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Pour afficher vos notes, veuillez vous connecter à votre compte dans l’application. Cela ne prendra que quelques secondes !</string>
     <string name="widgetSingleGradeErrorSubtitle">Nous ne parvenons pas à afficher vos notes pour le moment.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Choisissez un cours</string>
     <string name="widgetGradesErrorLoadingCourses">Une erreur s’est produite lors du chargement des cours.</string>
     <string name="settingsSwitchExperience">Passer à Canvas Career</string>
+    <string name="forecastWidgetTitle">Résumé hebdomadaire</string>
+    <string name="forecastWidgetWeekPeriod">Semaine %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Manquant</string>
+    <string name="forecastWidgetDue">Attendu le</string>
+    <string name="forecastWidgetRecentGrades">Nouvelles notes</string>
+    <string name="forecastWidgetGradeWeight">%d%% de la note finale</string>
+    <string name="forecastWidgetErrorMessage">Nous ne parvenons pas à charger vos travaux. Vérifiez la connexion et réessayez.</string>
+    <string name="forecastWidgetEmptyMissing">Aucun travail manquant Tout est à jour !</string>
+    <string name="forecastWidgetEmptyDue">Aucun travail attendu cette semaine.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Aucune nouvelle note cette semaine.</string>
+    <string name="a11y_contentDescription_previousWeek">Semaine précédente</string>
+    <string name="a11y_contentDescription_nextWeek">Semaine prochaine</string>
+
     <string name="speedGraderGradeTabTitle">Note &amp; Rubrique</string>
     <string name="speedGraderDetailsTabTitle">Détails</string>
     <string name="a11y_contentDescription_expandPanel">Développer le panneau</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Une erreur s’est produite lors du chargement de vos tâches à faire. Veuillez vérifier votre connexion, puis réessayez.</string>
     <string name="errorUpdatingToDo">Une erreur s’est produite lors de la mise à jour de la tâche à faire. Veuillez vérifier votre connexion, puis réessayez.</string>
     <string name="noToDosForNow">Aucune tâche à faire pour le moment !</string>
+    <string name="noToDosForNowNew">Aucune tâche À Faire pour le moment !</string>
     <string name="noToDosForNowSubtext">On dirait que c’est le moment idéal pour se reposer, se détendre et se ressourcer.</string>
     <string name="todoSwipeDone">Terminé</string>
     <string name="todoSwipeUndo">Annuler</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Préférences de liste de tâches À Faire</string>
+    <string name="todoFilterPreferencesNew">Préférences de la liste des tâches À Faire</string>
     <string name="todoFilterVisibleItems">Tâches visibles</string>
     <string name="todoFilterShowPersonalToDos">Afficher les tâches À Faire personnelles</string>
+    <string name="todoFilterShowPersonalToDosNew">Afficher les tâches À Faire personnelles</string>
     <string name="todoFilterShowCalendarEvents">Afficher les événements du calendrier</string>
     <string name="todoFilterShowCompleted">Afficher les tâches terminées</string>
     <string name="todoFilterFavoriteCoursesOnly">Cours favoris uniquement</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Refuser l’invitation</string>
     <string name="courseInvitationDeclineConfirmMessage">Voulez-vous vraiment refuser l’invitation à %s ?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progrès</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Bonjour, %s !</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Bonjour %s,</string>
 
+    <string name="courses_and_groups">Cours et groupes</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personnaliser le tableau de bord</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Modification de la disposition du tableau de bord</string>
     <string name="changing_dashboard_layout_message">Pour modifier la disposition du tableau de bord, vous devez redémarrer l’application.</string>
     <string name="restart_now">Redémarrer maintenant</string>
+    <string name="turn_on_new_dashboard">Activer le nouveau tableau de bord</string>
     <string name="switched_back">Revenir à la disposition initiale ?</string>
     <string name="switched_back_message">Merci d’avoir essayé le nouveau tableau de bord ! Pourriez-vous nous dire pourquoi vous avez décidé de revenir à la disposition initiale ?</string>
+    <string name="survey_option_hard_to_find">Difficile de retrouver les informations</string>
+    <string name="survey_option_prefer_old_layout">Préfère l’ancienne disposition</string>
+    <string name="survey_option_something_broken">Quelque chose ne s’est pas passé comme prévu</string>
     <string name="what_could_we_improve">Comment pourrions-nous améliorer les choses ?</string>
+    <string name="what_do_you_think_of_new_dashboard">Que pensez-vous du nouveau tableau de bord ?</string>
+    <string name="let_us_know">Dites-nous tout !</string>
+    <string name="no_app_to_handle_link">Aucune application disponible pour ouvrir ce lien</string>
     <string name="skip">Ignorer</string>
     <string name="widget_setting_show_greeting">Afficher le message de bienvenue</string>
     <string name="background_color">Couleur de fond</string>
+    <string name="widget_setting_show_grades">Notes des cours</string>
+    <string name="widget_setting_show_color_overlay">Superposition des couleurs du cours</string>
     <string name="offline_content_available">Contenu hors ligne disponible</string>
     <string name="a11y_contentDescription_moreOptions">Plus d’options</string>
     <string name="customizeCourse">Personnaliser le cours</string>
     <string name="favoriteCoursesAndGroups">Cours et groupes favoris</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Les outils externes ne sont pas disponibles hors ligne.</string>
+    <string name="widget_weekly_summary">Résumé hebdomadaire</string>
+
+    <string name="dashboardCourseNickname">Alias</string>
+    <string name="dashboardCourseNicknameHint">Tapez l’alias du cours ici</string>
+    <string name="dashboardCourseColor">Couleur du cours</string>
+    <string name="widget_toDo">À faire pour la journée</string>
+    <string name="dailyToDoWidgetTitle">À faire pour la journée</string>
+    <string name="todoWidget_showCompleted">Afficher les tâches terminées</string>
+    <string name="todoWidget_emptyTitle">Tout est fait !</string>
+    <string name="todoWidget_emptyMessage">Il semble que vous êtes libre pour aujourd’hui.\nVoulez-vous ajouter des tâches à faire ?</string>
+    <string name="todoWidget_addTodo">Ajouter une tâche À faire</string>
+    <string name="todoWidget_errorTitle">Un problème est survenu.</string>
+    <string name="todoWidget_errorMessage">Impossible de charger vos tâches À Faire.\nRéessayez ou revenez plus tard.</string>
+    <string name="todoWidget_refresh">Actualiser</string>
+    <string name="todoWidget_today">Aujourd’hui</string>
+    <string name="a11y_todoWidget_jumpToToday">Passer à aujourd’hui</string>
+    <string name="widgetSettings_widgetsColor">Couleur principale du tableau de bord</string>
+    <string name="dashboard_globalAnnouncement">Annonce générale</string>
+    <string name="forecastWidget_currentWeek">Semaine en cours</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-ga/strings.xml b/libs/pandares/src/main/res/values-ga/strings.xml
index 598fbbf40f..2fda5f6ed5 100644
--- a/libs/pandares/src/main/res/values-ga/strings.xml
+++ b/libs/pandares/src/main/res/values-ga/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Theip ar Uaslódáil</string>
     <string name="submissionStatusFailedSubtitle">Tapáil chun sonraí a fheiceáil</string>
     <string name="submissionAndRubric">Uaslódáil &amp; rúibric</string>
+    <string name="submissionAndFeedback">Uaslódáil agus Aiseolas</string>
     <string name="commentsAndRubric">Ráitis &amp; Rúibric</string>
     <string name="errorLoadingAssignment">Bhí fadhb ann agus an tasc seo á lódáil. Seiceáil do cheangal agus bain triail eile as.</string>
     <string name="submitted">Curtha isteach</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Inniu</string>
+    <string name="tomorrow">Amárach</string>
     <string name="past">Caite</string>
     <string name="noDate">Gan Dáta</string>
     <string name="future">Todhchaí</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monalóg</string>
     <string name="noItemsToDisplayShort">Níl aon mhíreanna le taispeáint</string>
     <string name="Todo">Le Déanamh</string>
+    <string name="TodoNew">Le Déanamh</string>
     <string name="todoFilter">Scag Cúrsaí</string>
     <string name="filterByEllipsis">Scag de réir&#8230;</string>
     <string name="favoriteCoursesLabel">Cúrsaí is Fearr</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grúpaí</string>
     <string name="groupMembers">Baill an Ghrúpa</string>
 
+    <string name="messageGroup">Grúpa teachtaireachtaí</string>
     <string name="loading">Ag lódáil&#8230;</string>
     <string name="select_item_to_display">Roghnaigh ón liosta</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Le Déanamh</string>
+    <string name="todoWidgetTitleNew">Le Déanamh</string>
     <string name="gradesWidgetTitle">Marcanna</string>
     <string name="notificationWidgetTitle">Fógraí</string>
     <string name="todoWidgetTitleLong">Canvas - Le Déanamh</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Le Déanamh</string>
     <string name="gradesWidgetTitleLong">Canvas - Marcanna</string>
     <string name="gradeWidgetTitleLong">Canvas - Marc</string>
     <string name="notificationWidgetTitleLong">Canvas- Fógraí</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Cúrsaí</string>
     <string name="toDoList">Liosta Le Déanamh</string>
+    <string name="toDoListNew">Liosta Le Déanamh</string>
+
     <string name="notifications">Fógraí</string>
     <string name="pushNotifications">Brúfhógraí</string>
     <string name="pushNotificationsError">Níor cláraíodh Brúfhógraí don ghléas seo.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Oscail SpeedGrader</string>
 
-    <string name="search_todo">le déanamh le déanamh le déanamh liosta le déanamh</string>
     <string name="search_course">cúrsaí cúrsa rang ranganna</string>
     <string name="search_grades">marc marcanna</string>
 
@@ -1078,6 +1085,13 @@
     <string name="pageTitleMustBeSet">Ní mór teideal an leathanaigh a shocrú.</string>
     <string name="pageDetails">Sonraí Leathanaigh</string>
     <string name="saving">Ag Sábháil</string>
+    <string name="speedGraderSaving">Ag Sábháil</string>
+    <string name="speedGraderSaved">Sábháilte</string>
+    <string name="speedGraderFailed">Theip air</string>
+    <string name="speedGraderSaveErrorTitle">Ó, chuaigh rud éigin mícheart.</string>
+    <string name="speedGraderSaveErrorMessage">Tharla earráid agus do mhodhnú mairc á shábháil. Is féidir leat iarracht eile a dhéanamh, nó iarracht eile a dhéanamh níos déanaí.</string>
+    <string name="speedGraderSaveErrorContentDescription">Theip ar shábháil an mhairc. Tapáil le haghaidh sonraí.</string>
+
     <string name="confirmDeleteEvent">An bhfuil tú cinnte gur mian leat an t-imeacht seo a scriosadh?</string>
     <string name="conferencesNotSupported">Ní thacaítear fós le comhdhálacha ar fhóin phóca.</string>
     <string name="filePreviewContentDescription">Íomhá réamhamharc comhaid</string>
@@ -1224,6 +1238,10 @@
     <string name="recordings">Taifeadtaí</string>
     <string name="conferenceInProgress">Comhdháil ar siúl</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Comhdhálacha (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Comhdháil ar siúl</string>
+    <string name="conferencesWidgetDismissed">Comhdháil curtha ar ceal</string>
     <string name="a11y_criterion_content_description">Rátáil critéir %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">Tuilleadh eolais</string>
@@ -1381,6 +1399,10 @@
         <item quantity="one">%s mír le déanamh</item>
         <item quantity="other">%s mír le déanamh</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s m(h)ír le déanamh</item>
+        <item quantity="other">%s m(h)ír le déanamh</item>
+    </plurals>
     <string name="noAnnotationSelected">Níl aon nóta mínithe roghnaithe</string>
 
     <string name="emailNotifications">Fógraí Ríomhphoist</string>
@@ -1671,7 +1693,9 @@
     <string name="calendarNoEvents">Níl aon Imeachtaí inniu!</string>
     <string name="calendarNoEventsDescription">Breathnaíonn sé cosúil le lá iontach chun sos a ghlacadh, scíth a ligean, agus d\'anáil a tharraingt.</string>
     <string name="userCalendarToDo">Le Déanamh</string>
+    <string name="userCalendarToDoNew">Le Déanamh</string>
     <string name="courseToDo">%s Le Déanamh</string>
+    <string name="courseToDoNew">%s Le déanamh</string>
     <string name="calendarEventExcused">Leithscéal faighte</string>
     <string name="calendarEventMissing">Ar iarraidh</string>
     <string name="calendarEventGraded">Marcáilte</string>
@@ -1697,21 +1721,30 @@
     <string name="a11y_eventCreatedAnnouncement">Cruthaíodh an t-imeacht seo go rathúil: %s.</string>
     <string name="a11y_eventUpdatedAnnouncement">Nuashonraíodh an t-imeacht seo go rathúil: %s.</string>
     <string name="a11y_toDoCreatedAnnouncement">Cruthaíodh an Le Déanamh seo go rathúil: %s.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">D’éirigh leis an Le Déanamh %s a chruthú.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Nuashonraíodh an Le Déanamh seo go rathúil: %s.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">D’éirigh leis an Le Déanamh %s a nuashonrú.</string>
     <string name="todoScreenTitle">Le Déanamh</string>
+    <string name="todoScreenTitleNew">Le Déanamh</string>
     <string name="todoDateLabel">Dáta</string>
     <string name="todoDescriptionLabel">Cur síos</string>
     <string name="todoDeleteConfirmationTitle">Scrios Le Déanamh?</string>
+    <string name="todoDeleteConfirmationTitleNew">Scrios an Rud le Déanamh?</string>
     <string name="todoDeleteConfirmationText">Scriosfaidh sé seo do mhír Le Déanamh go buan.</string>
+    <string name="todoDeleteConfirmationTextNew">Scriosfaidh sé seo do mhír Le Déanamh go buan.</string>
     <string name="todoDeleteErrorMessage">Tharla earráid agus an Le Déanamh seo á scriosadh. Seiceáil do cheangal agus bain triail eile as.</string>
+    <string name="todoDeleteErrorMessageNew">Tharla earráid agus an tasc seo á scriosadh. Seiceáil do nasc agus déan iarracht arís.</string>
     <string name="createTodoScreenTitle">Le Déanamh Nua</string>
+    <string name="createTodoScreenTitleNew">Rud le Déanamh Nua</string>
     <string name="editTodoScreenTitle">Cuir Le Déanamh in Eagar</string>
+    <string name="editTodoScreenTitleNew">Cuir an Rud le Déanamh in Eagar</string>
     <string name="createToDoTitleHint">Cuir teideal leis</string>
     <string name="createToDoDateLabel">Dáta</string>
     <string name="createToDoTimeLabel">Am</string>
     <string name="createToDoCalendarLabel">Féilire</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">Tharla earráid agus an Le Déanamh seo á shábháil. Seiceáil do cheangal agus bain triail eile as.</string>
+    <string name="todoSaveErrorMessageNew">Tharla earráid agus an tasc seo á shábháil. Seiceáil do nasc agus déan iarracht arís.</string>
     <string name="selectCalendarScreenTitle">Roghnaigh Féilire</string>
 
     <string name="errorContentRetryButton">Bain triail eile as</string>
@@ -1721,6 +1754,7 @@
     <string name="eventDetailsLabel">Sonraí</string>
     <string name="errorLoadingEvent">Tharla fadhb agus an t-imeacht seo á lódáil. Seiceáil do cheangal agus bain triail eile as.</string>
     <string name="errorLoadingTodo">Tharla fadhb agus an le déanamh seo á lódáil. Seiceáil do cheangal agus bain triail eile as.</string>
+    <string name="errorLoadingTodoNew">Bhí fadhb ann an tasc seo a luchtú. Seiceáil do nasc agus déan iarracht arís.</string>
     <string name="eventDeleteConfirmationTitle">Scrios Imeacht?</string>
     <string name="eventDeleteConfirmationText">Scriosfaidh sé seo d\'imeacht go buan.</string>
     <string name="eventDeleteErrorMessage">Tharla earráid agus an t-imeacht seo á scriosadh. Seiceáil do cheangal agus bain triail eile as.</string>
@@ -1737,6 +1771,7 @@
     <string name="eventDeleteScopeAll">Imeachtaí ar fad</string>
     <string name="eventDeleteScopeFollowing">Seo agus gach imeacht ina dhiaidh</string>
     <string name="calendarAddToDo">Cuir Le Déanamh</string>
+    <string name="calendarAddToDoNew">Cuir \'Le Déanamh\' leis</string>
     <string name="calendarAddEvent">Cuir Imeacht leis</string>
 
     <string name="createEventScreenTitle">Imeacht Nua</string>
@@ -2117,7 +2152,9 @@
     <string name="widgetNotLoggedInTitle">Lig dúinn tú a logáil isteach!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Chun do liosta le déanamh a fheiceáil, logáil isteach i do chuntas san aip le do thoil. Ní thógfaidh sé ach soicind!</string>
     <string name="a11y_widgetToDoOpenToDoList">Oscail scáileán Liosta Le Déanamh</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Oscail an scáileán liosta le déanamh</string>
     <string name="a11y_widgetToDoCreateNewToDo">Cruthaigh Tasc Nua</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Cruthaigh Tasc Nua</string>
     <string name="widgetGradesErrorSubtitle">Tá deacrachtaí againn do mharcanna a thaispeáint faoi láthair. Bain triail eile as ar ball nó téigh chuig an aip.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Chun do mharcanna a fheiceáil, logáil isteach i do chuntas san aip le do thoil. Ní thógfaidh sé ach soicind!</string>
     <string name="widgetSingleGradeErrorSubtitle">Tá deacrachtaí againn do mharcanna a thaispeáint faoi láthair.</string>
@@ -2125,6 +2162,19 @@
     <string name="widgetSingleGradeSelectCourse">Roghnaímis cúrsa</string>
     <string name="widgetGradesErrorLoadingCourses">Tharla earráid agus cúrsaí á lódáil.</string>
     <string name="settingsSwitchExperience">Téigh go Canvas Career</string>
+    <string name="forecastWidgetTitle">Achoimre Sheachtainiúil</string>
+    <string name="forecastWidgetWeekPeriod">Seachtain %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Ar iarraidh</string>
+    <string name="forecastWidgetDue">Dlite</string>
+    <string name="forecastWidgetRecentGrades">Marcanna Nua</string>
+    <string name="forecastWidgetGradeWeight">%d%% den mharc deiridh</string>
+    <string name="forecastWidgetErrorMessage">Tá deacracht againn do chuid tascanna a lódáil. Seiceáil do cheangal agus bain triail eile as.</string>
+    <string name="forecastWidgetEmptyMissing">Gan aon tascanna ar iarraidh. Tá tú suas chun dáta ar fad!</string>
+    <string name="forecastWidgetEmptyDue">Níl aon obair bhaile le déanamh an tseachtain seo.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Níl aon mharc nua ann an tseachtain seo.</string>
+    <string name="a11y_contentDescription_previousWeek">An tseachtain roimhe sin</string>
+    <string name="a11y_contentDescription_nextWeek">An tseachtain seo chugainn</string>
+
     <string name="speedGraderGradeTabTitle">Marc &amp; Rúibric</string>
     <string name="speedGraderDetailsTabTitle">Sonraí</string>
     <string name="a11y_contentDescription_expandPanel">Leathnaigh an painéal</string>
@@ -2203,6 +2253,7 @@
     <string name="errorLoadingToDos">Tharla earráid agus do chuid míreanna le déanamh á lódáil. Seiceáil do cheangal agus bain triail eile as.</string>
     <string name="errorUpdatingToDo">Tharla earráid agus an mhír le déanamh á nuashonrú. Seiceáil do cheangal agus bain triail eile as.</string>
     <string name="noToDosForNow">Gan aon Rudaí le Déanamh faoi láthair!</string>
+    <string name="noToDosForNowNew">Gan aon Rud le Déanamh faoi láthair!</string>
     <string name="noToDosForNowSubtext">Dealraíonn sé gur am iontach é chun scíth a ligean, suaimhneas a ligean agus athlódáil.</string>
     <string name="todoSwipeDone">Déanta</string>
     <string name="todoSwipeUndo">Cealaigh</string>
@@ -2213,8 +2264,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Roghanna liosta le déanamh</string>
+    <string name="todoFilterPreferencesNew">Roghanna liosta le déanamh</string>
     <string name="todoFilterVisibleItems">Míreanna Infheicthe</string>
     <string name="todoFilterShowPersonalToDos">Taispeáin Rudaí Pearsanta le Déanamh</string>
+    <string name="todoFilterShowPersonalToDosNew">Taispeáin Leideanna Pearsanta</string>
     <string name="todoFilterShowCalendarEvents">Taispeáin Imeachtaí Féilire</string>
     <string name="todoFilterShowCompleted">Taispeáin Críochnaithe</string>
     <string name="todoFilterFavoriteCoursesOnly">Cúrsaí is Fearr Leat Amháin</string>
@@ -2241,6 +2294,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Diúltaigh don Chuireadh</string>
     <string name="courseInvitationDeclineConfirmMessage">An bhfuil tú cinnte gur mian leat an cuireadh a dhiúltú chuig %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Dul chun cinn</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Maidin mhaith, %s!</string>
@@ -2363,6 +2419,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Haigh, %s</string>
 
+    <string name="courses_and_groups">Cúrsaí agus Grúpaí</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Saincheap an Deais</string>
     <string name="dashboard_widgets">Giuirléidí</string>
@@ -2372,16 +2429,44 @@
     <string name="changing_dashboard_layout">Leagan amach an deais rialaithe a athrú</string>
     <string name="changing_dashboard_layout_message">Chun leagan amach an deais rialaithe a athrú, ní mór duit an feidhmchlár a atosú.</string>
     <string name="restart_now">Atosaigh anois</string>
+    <string name="turn_on_new_dashboard">Cuir an deais nua ar siúl</string>
     <string name="switched_back">Ar athraigh tú ar ais?</string>
     <string name="switched_back_message">Go raibh maith agat as an deais nua a thriail! An bhféadfá a insint dúinn cén fáth ar athraigh tú ar ais?</string>
+    <string name="survey_option_hard_to_find">Deacair rudaí a aimsiú</string>
+    <string name="survey_option_prefer_old_layout">Is fearr liom an seanleagan amach</string>
+    <string name="survey_option_something_broken">Níor oibrigh rud éigin i gceart</string>
     <string name="what_could_we_improve">Cad a d’fhéadfaimis a fheabhsú?</string>
+    <string name="what_do_you_think_of_new_dashboard">Cad a cheapann tú faoin bpainéal nua?</string>
+    <string name="let_us_know">Cuir in iúl dúinn!</string>
+    <string name="no_app_to_handle_link">Níl aon aip ar fáil chun an nasc seo a oscailt</string>
     <string name="skip">Scipeáil</string>
     <string name="widget_setting_show_greeting">Taispeáin beannú</string>
     <string name="background_color">Dath an chúlra</string>
+    <string name="widget_setting_show_grades">Marcanna an Chúrsa</string>
+    <string name="widget_setting_show_color_overlay">Forleagan Dathanna Cúrsa</string>
     <string name="offline_content_available">Ábhar as líne ar fáil</string>
     <string name="a11y_contentDescription_moreOptions">Tuilleadh roghanna</string>
     <string name="customizeCourse">Saincheap an Cúrsa</string>
     <string name="favoriteCoursesAndGroups">Cúrsaí agus Grúpaí is Fearr Leat</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Níl Uirlisí Seachtracha ar fáil as líne.</string>
+    <string name="widget_weekly_summary">Achoimre Sheachtainiúil</string>
+
+    <string name="dashboardCourseNickname">Leasainm</string>
+    <string name="dashboardCourseNicknameHint">Scríobh leasainm an chúrsa anseo</string>
+    <string name="dashboardCourseColor">Dath an Chúrsa</string>
+    <string name="widget_toDo">Le déanamh laethúil</string>
+    <string name="dailyToDoWidgetTitle">Le déanamh laethúil</string>
+    <string name="todoWidget_showCompleted">Taispeáin Críochnaithe</string>
+    <string name="todoWidget_emptyTitle">Tá tú críochnaithe anois!</string>
+    <string name="todoWidget_emptyMessage">Is cosúil go bhfuil tú saor don lá seo.\nAr mhaith leat roinnt Tascanna a chur leis?</string>
+    <string name="todoWidget_addTodo">Cuir \'Le Déanamh\' leis</string>
+    <string name="todoWidget_errorTitle">Ó, chuaigh rud éigin mícheart.</string>
+    <string name="todoWidget_errorMessage">Ní raibh muid in ann do Chur le Déanamh a luchtú.\nDéan iarracht arís, nó tar ar ais níos déanaí.</string>
+    <string name="todoWidget_refresh">Athnuaigh</string>
+    <string name="todoWidget_today">Inniu</string>
+    <string name="a11y_todoWidget_jumpToToday">Léim go dtí an lá inniu</string>
+    <string name="widgetSettings_widgetsColor">Príomh-Dath an Phainéal</string>
+    <string name="dashboard_globalAnnouncement">Fógra Uilíoch</string>
+    <string name="forecastWidget_currentWeek">An tseachtain reatha</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-hi/strings.xml b/libs/pandares/src/main/res/values-hi/strings.xml
index c9af0f1fa0..b7916e55c3 100644
--- a/libs/pandares/src/main/res/values-hi/strings.xml
+++ b/libs/pandares/src/main/res/values-hi/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">सबमिशन विफल रहा</string>
     <string name="submissionStatusFailedSubtitle">विवरण देखने के लिए टैप करें</string>
     <string name="submissionAndRubric">सबमिशन और रुब्रिक</string>
+    <string name="submissionAndFeedback">सबमिशन और फ़ीडबैक</string>
     <string name="commentsAndRubric">टिप्पणियां और रुब्रिक</string>
     <string name="errorLoadingAssignment">यह असाइनमेंट लोड करने में समस्या आई थी। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
     <string name="submitted">सबमिट किया गया</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">आज</string>
+    <string name="tomorrow">आने वाला कल</string>
     <string name="past">अतीत</string>
     <string name="noDate">कोई तिथि नहीं</string>
     <string name="future">भविष्य</string>
@@ -291,6 +293,7 @@
     <string name="monologue">एकालाप</string>
     <string name="noItemsToDisplayShort">दिखाने के लिए कोई आइटम नहीं</string>
     <string name="Todo">करने के लिए</string>
+    <string name="TodoNew">करने के लिए</string>
     <string name="todoFilter">पाठ्यक्रम फ़िल्टर करें</string>
     <string name="filterByEllipsis">इसके अनुसार फ़िल्टर करें...</string>
     <string name="favoriteCoursesLabel">पसंदीदा पाठ्यक्रम</string>
@@ -474,6 +477,7 @@
     <string name="groups">ग्रुप्स</string>
     <string name="groupMembers">ग्रुप सदस्य</string>
 
+    <string name="messageGroup">संदेश ग्रुप</string>
     <string name="loading">लोड किया जा रहा है&#8230;</string>
     <string name="select_item_to_display">सूची से चयन करें</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">करने के लिए</string>
+    <string name="todoWidgetTitleNew">करने के लिए</string>
     <string name="gradesWidgetTitle">ग्रेड</string>
     <string name="notificationWidgetTitle">सूचनाएं</string>
     <string name="todoWidgetTitleLong">Canvas - करने के लिए</string>
+    <string name="todoWidgetTitleLongNew">Canvas - करने के लिए</string>
     <string name="gradesWidgetTitleLong">Canvas - ग्रेड</string>
     <string name="gradeWidgetTitleLong">Canvas - ग्रेड</string>
     <string name="notificationWidgetTitleLong">Canvas - सूचनाएं</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">पाठ्यक्रम</string>
     <string name="toDoList">करने के लिए सूची</string>
+    <string name="toDoListNew">\'करने के लिए\' सूची</string>
+
     <string name="notifications">सूचनाएं</string>
     <string name="pushNotifications">पुश सूचनाएं</string>
     <string name="pushNotificationsError">इस डिवाइस के लिए पुश सूचनाएं पंजीकृत नहीं की गई हैं।</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">SpeedGrader खोलें</string>
 
-    <string name="search_todo">करने के लिए करने के लिए करने के लिए करने के लिए सूची</string>
     <string name="search_course">पाठ्यक्रम पाठ्यक्रम कक्षा कक्षाएं</string>
     <string name="search_grades">ग्रेड ग्रेड</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">पेज का शीर्षक सेट होना चाहिए।</string>
     <string name="pageDetails">पेज का ब्यौरा</string>
     <string name="saving">सहेजा जा रहा है</string>
+    <string name="speedGraderSaving">सहेजा जा रहा है</string>
+    <string name="speedGraderSaved">सहेजा गया</string>
+    <string name="speedGraderFailed">विफल हुआ</string>
+    <string name="speedGraderSaveErrorTitle">ओह कुछ गड़बड़ी हुई है</string>
+    <string name="speedGraderSaveErrorMessage">आपका ग्रेड संशोधन सहेजते समय एक त्रुटि हुई। आप पुन: कोशिश कर सकते हैं, या बाद में कोशिश करें।</string>
+    <string name="speedGraderSaveErrorContentDescription">ग्रेड सहेजा नहीं जा सका। विवरण के लिए टैप करें।</string>
+
     <string name="confirmDeleteEvent">क्या आप सच में इस घटना को मिटाना चाहते हैं?</string>
     <string name="conferencesNotSupported">मोबाइल पर कॉन्फ़्रेंस अभी तक समर्थित नहीं हैं।</string>
     <string name="filePreviewContentDescription">फ़ाइल पूर्वावलोकन छवि</string>
@@ -1223,6 +1237,10 @@
     <string name="recordings">रिकॉर्डिंग</string>
     <string name="conferenceInProgress">कॉन्फ़्रेंस प्रगति में</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">कॉन्फ़्रेंस (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">कॉन्फ़्रेंस चल रही है</string>
+    <string name="conferencesWidgetDismissed">कॉन्फ़्रेंस खारिज की गई</string>
     <string name="a11y_criterion_content_description">मानदंड रेटिंग %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">अधिक जानकारी</string>
@@ -1380,6 +1398,10 @@
         <item quantity="one">करने के लिए %s आइटम</item>
         <item quantity="other">करने के लिए %s आइटमें</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s \'करने के लिए\' आइटम</item>
+        <item quantity="other">%s \'करने के लिए\' आइटमें</item>
+    </plurals>
     <string name="noAnnotationSelected">कोई एनोटेशन चयनित नहीं</string>
 
     <string name="emailNotifications">ईमेल सूचनाएं</string>
@@ -1669,7 +1691,9 @@
     <string name="calendarNoEvents">आज कोई घटना नहीं है!</string>
     <string name="calendarNoEventsDescription">आज का दिन आराम, विश्राम करने और नई ऊर्जा पाने के लिए अच्छा लग रहा है।</string>
     <string name="userCalendarToDo">करने के लिए</string>
+    <string name="userCalendarToDoNew">करने के लिए</string>
     <string name="courseToDo">%s करने के लिए</string>
+    <string name="courseToDoNew">%s करने के लिए</string>
     <string name="calendarEventExcused">माफ़ किया</string>
     <string name="calendarEventMissing">लापता</string>
     <string name="calendarEventGraded">ग्रेड किए गए</string>
@@ -1694,21 +1718,30 @@
     <string name="a11y_eventCreatedAnnouncement">घटना %s सफलतापूर्वक बनाई गई।</string>
     <string name="a11y_eventUpdatedAnnouncement">घटना %s सफलतापूर्वक अपडेट की गई।</string>
     <string name="a11y_toDoCreatedAnnouncement">करने के लिए %s सफलतापूर्वक बनाया गया।</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">\'करने के लिए\' %s सफलतापूर्वक बनाई गई।</string>
     <string name="a11y_toDoUpdatedAnnouncement">करने के लिए %s सफलतापूर्वक अपडेट किया गया।</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">\'करने के लिए\' %s सफलतापूर्वक अपडेट की गई।</string>
     <string name="todoScreenTitle">करने के लिए</string>
+    <string name="todoScreenTitleNew">करने के लिए</string>
     <string name="todoDateLabel">तिथि</string>
     <string name="todoDescriptionLabel">विवरण</string>
     <string name="todoDeleteConfirmationTitle">करने के लिए मिटाएं?</string>
+    <string name="todoDeleteConfirmationTitleNew">\'करने के लिए\' मिटाएं?</string>
     <string name="todoDeleteConfirmationText">इस तरह से आपकी करने के लिए आइटम स्थायी रूप से मिट जाएगी।</string>
+    <string name="todoDeleteConfirmationTextNew">इससे आपका \'करने के लिए\' आइटम स्थायी रूप से हट जाएगा।</string>
     <string name="todoDeleteErrorMessage">इस करने के लिए को सहेजने में त्रुटि आई थी। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
+    <string name="todoDeleteErrorMessageNew">इस \'करने के लिए\' को मिटाने में त्रुटि हुई। कृपया अपना कनेक्शन जांचें और पुनः प्रयास करें।</string>
     <string name="createTodoScreenTitle">नया करने के लिए</string>
+    <string name="createTodoScreenTitleNew">नया \'करने के लिए\'</string>
     <string name="editTodoScreenTitle">करने के लिए संपादित करें</string>
+    <string name="editTodoScreenTitleNew">\'करने के लिए\' संपादित करें</string>
     <string name="createToDoTitleHint">शीर्षक जोड़ें</string>
     <string name="createToDoDateLabel">तिथि</string>
     <string name="createToDoTimeLabel">समय</string>
     <string name="createToDoCalendarLabel">कैलेंडर</string>
     <string name="createToDoDetailsLabel">विवरण</string>
     <string name="todoSaveErrorMessage">इस करने के लिए सहेजने में त्रुटि हुई। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
+    <string name="todoSaveErrorMessageNew">इस \'करने के लिए\' को सहेजने में त्रुटि हुई। कृपया अपना कनेक्शन जांचें और पुनः प्रयास करें।</string>
     <string name="selectCalendarScreenTitle">कैलेंडर चुनें</string>
     <string name="errorContentRetryButton">फिर से कोशिश करें</string>
     <string name="eventLocationLabel">लोकेशन</string>
@@ -1716,6 +1749,7 @@
     <string name="eventDetailsLabel">विवरण</string>
     <string name="errorLoadingEvent">यह घटना लोड करने में समस्या आई थी। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
     <string name="errorLoadingTodo">यह \'करने के लिए\' लोड करने में समस्या आई थी। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
+    <string name="errorLoadingTodoNew">इस \'करने के लिए\' को लोड करने में समस्या हुई। कृपया अपना कनेक्शन जांचें और पुनः प्रयास करें।</string>
     <string name="eventDeleteConfirmationTitle">घटाना मिटाएँ?</string>
     <string name="eventDeleteConfirmationText">इस तरह से आपकी घटना स्थायी रूप से मिट जाएगी।</string>
     <string name="eventDeleteErrorMessage">इस घटना को मिटाने में त्रुटि आई थी। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
@@ -1732,6 +1766,7 @@
     <string name="eventDeleteScopeAll">सभी घटनाएं</string>
     <string name="eventDeleteScopeFollowing">यह और निम्नलिखित सभी घटनाएं</string>
     <string name="calendarAddToDo">करने के लिए जोड़ें</string>
+    <string name="calendarAddToDoNew">\'करने के लिए\' जोड़ें</string>
     <string name="calendarAddEvent">घटना जोड़ें</string>
     <string name="createEventScreenTitle">नई घटना</string>
     <string name="editEventScreenTitle">घटना संपादित करें</string>
@@ -2110,7 +2145,9 @@
     <string name="widgetNotLoggedInTitle">आइए, आपको लॉग इन करते हैं!</string>
     <string name="widgetToDoNotLoggedInSubtitle">अपने कार्य देखने के लिए कृपया ऐप में अपने खाते में लॉग इन करें। इसमें बस एक सेकंड का समय लगेगा!</string>
     <string name="a11y_widgetToDoOpenToDoList">करने के लिए सूची स्क्रीन खोलें</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">\'करने के लिए\' स्क्रीन खोलें</string>
     <string name="a11y_widgetToDoCreateNewToDo">नया करने के लिए बनाएं</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">नया \'करने के लिए\' बनाएं</string>
     <string name="widgetGradesErrorSubtitle">हमें अभी आपके ग्रेड दिखाने में समस्या हो रही है। कृपया थोड़ी देर में फिर से कोशिश करें या ऐप पर जाएं।</string>
     <string name="widgetGradesNotLoggedInSubtitle">अपने ग्रेड देखने के लिए कृपया ऐप में अपने खाते में लॉग इन करें। इसमें बस एक सेकंड का समय लगेगा!</string>
     <string name="widgetSingleGradeErrorSubtitle">हमें अभी आपके ग्रेड दिखाने में समस्या हो रही है।</string>
@@ -2118,6 +2155,19 @@
     <string name="widgetSingleGradeSelectCourse">आइए, एक पाठ्यक्रम चुनें</string>
     <string name="widgetGradesErrorLoadingCourses">पाठ्यक्रम लोड करते समय त्रुटि उत्पन्न हुई।</string>
     <string name="settingsSwitchExperience">Canvas कैरियर पर स्विच करें</string>
+    <string name="forecastWidgetTitle">साप्ताहिक सारांश</string>
+    <string name="forecastWidgetWeekPeriod">सप्ताह %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">गायब</string>
+    <string name="forecastWidgetDue">नियत</string>
+    <string name="forecastWidgetRecentGrades">नए ग्रेड</string>
+    <string name="forecastWidgetGradeWeight">अंतिम ग्रेड का %d%%</string>
+    <string name="forecastWidgetErrorMessage">हमें आपके असाइनमेंट लोड करने में समस्या हो रही है। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
+    <string name="forecastWidgetEmptyMissing">कोई गायब असाइनमेंट नहीं। आपका काम पूरा हुआ!</string>
+    <string name="forecastWidgetEmptyDue">इस सप्ताह कोई असाइनमेंट नियत नहीं है।</string>
+    <string name="forecastWidgetEmptyRecentGrades">इस सप्ताह कोई नया ग्रेड नहीं।</string>
+    <string name="a11y_contentDescription_previousWeek">पिछला सप्ताह</string>
+    <string name="a11y_contentDescription_nextWeek">अगला सप्ताह</string>
+
     <string name="speedGraderGradeTabTitle">ग्रेड और रुब्रिक</string>
     <string name="speedGraderDetailsTabTitle">विवरण</string>
     <string name="a11y_contentDescription_expandPanel">पैनल बढ़ाएं</string>
@@ -2196,6 +2246,7 @@
     <string name="errorLoadingToDos">आपके \'करने के लिए\' आइटम लोड करते समय एक त्रुटि आई। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
     <string name="errorUpdatingToDo">\'करने के लिए\' आइटम अपडेट करते समय एक त्रुटि आई। कृपया अपने कनेक्शन की जांच करें और फिर से कोशिश करें।</string>
     <string name="noToDosForNow">अभी के लिए कुछ \'करने के लिए\' नहीं है!</string>
+    <string name="noToDosForNowNew">अभी के लिए कोई \'करने के लिए\' नहीं है!</string>
     <string name="noToDosForNowSubtext">यह आराम करने, विश्राम करने और ऊर्जा प्राप्त करने का एक बढ़िया समय लग रहा है।</string>
     <string name="todoSwipeDone">हो गया</string>
     <string name="todoSwipeUndo">पूर्ववत करें</string>
@@ -2206,8 +2257,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">\'करने के लिए\' सूची प्राथमिकताएं</string>
+    <string name="todoFilterPreferencesNew">\'करने के लिए\' सूची प्राथमिकताएं</string>
     <string name="todoFilterVisibleItems">दृश्यमान आइटमें</string>
     <string name="todoFilterShowPersonalToDos">व्यक्तिगत \'करने के लिए\' दिखाएं</string>
+    <string name="todoFilterShowPersonalToDosNew">व्यक्तिगत \'करने के लिए\' दिखाएं</string>
     <string name="todoFilterShowCalendarEvents">कैलेंडर घटनाएं दिखाएं</string>
     <string name="todoFilterShowCompleted">पूरे हुए दिखाएं</string>
     <string name="todoFilterFavoriteCoursesOnly">केवल पसंदीदा पाठ्यक्रम</string>
@@ -2234,6 +2287,9 @@
     <string name="courseInvitationDeclineConfirmTitle">आमंत्रण अस्वीकार करें</string>
     <string name="courseInvitationDeclineConfirmMessage">क्या आप वाकई %s का आमंत्रण अस्वीकार करना चाहते हैं?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">प्रगति</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">शुभ प्रभात, %s!</string>
@@ -2356,6 +2412,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">नमस्कार, %s</string>
 
+    <string name="courses_and_groups">पाठ्यक्रम और ग्रुप्स</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">डैशबोर्ड कस्टमाइज़ करें</string>
     <string name="dashboard_widgets">विजेट</string>
@@ -2365,16 +2422,44 @@
     <string name="changing_dashboard_layout">डैशबोर्ड लेआउट बदलना</string>
     <string name="changing_dashboard_layout_message">डैशबोर्ड लेआउट बदलने के लिए आपको ऐप्लिकेशन को रीस्टार्ट करना होगा</string>
     <string name="restart_now">अभी रीस्टार्ट करें</string>
+    <string name="turn_on_new_dashboard">नया डैशबोर्ड चालू करें</string>
     <string name="switched_back">वापस स्विच किया?</string>
     <string name="switched_back_message">नया डैशबोर्ड आज़माने के लिए शुक्रिया! क्या आप बता सकते हैं कि आपने वापस स्विच क्यों किया?</string>
+    <string name="survey_option_hard_to_find">चीज़ें ढूंढना मुश्किल है</string>
+    <string name="survey_option_prefer_old_layout">पुराना लेआउट पसंद है</string>
+    <string name="survey_option_something_broken">कुछ ठीक से काम नहीं कर रहा है</string>
     <string name="what_could_we_improve">हम क्या सुधार कर सकते हैं?</string>
+    <string name="what_do_you_think_of_new_dashboard">नये डैशबोर्ड के बारे में आप क्या सोचते हैं?</string>
+    <string name="let_us_know">आइए, जानते हैं!</string>
+    <string name="no_app_to_handle_link">इस लिंक को खोलने के लिए कोई ऐप उपलब्ध नहीं है</string>
     <string name="skip">छोड़ें</string>
     <string name="widget_setting_show_greeting">अभिवादन दिखाएं</string>
     <string name="background_color">पृष्ठभूमि रंग</string>
+    <string name="widget_setting_show_grades">पाठ्यक्रम ग्रेड</string>
+    <string name="widget_setting_show_color_overlay">पाठ्यक्रम कलर ओवरले</string>
     <string name="offline_content_available">ऑफ़लाइन सामग्री उपलब्ध है</string>
     <string name="a11y_contentDescription_moreOptions">अधिक विकल्प</string>
     <string name="customizeCourse">पाठ्यक्रम कास्टमाइज़ करें</string>
     <string name="favoriteCoursesAndGroups">पसंदीदा पाठ्यक्रम और ग्रुप्स</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">बाहरी उपकरण ऑफ़लाइन उपलब्ध नहीं हैं।</string>
+    <string name="widget_weekly_summary">साप्ताहिक सारांश</string>
+
+    <string name="dashboardCourseNickname">उपनाम</string>
+    <string name="dashboardCourseNicknameHint">पाठ्यक्रम उपनाम यहाँ लिखें</string>
+    <string name="dashboardCourseColor">पाठ्यक्रम का रंग</string>
+    <string name="widget_toDo">दैनिक \'करने के लिए\'</string>
+    <string name="dailyToDoWidgetTitle">दैनिक \'करने के लिए\'</string>
+    <string name="todoWidget_showCompleted">पूरे हुए दिखाएं</string>
+    <string name="todoWidget_emptyTitle">अभी के लिए आपका काम पूरा हो गया है!</string>
+    <string name="todoWidget_emptyMessage">ऐसा लगता है कि आज के दिन आप खाली हैं।\nक्या आप कुछ \'करने के लिए\' जोड़ना चाहते हैं?</string>
+    <string name="todoWidget_addTodo">\'करने के लिए\' जोड़ें</string>
+    <string name="todoWidget_errorTitle">ओह, कुछ गड़बड़ी हुई है</string>
+    <string name="todoWidget_errorMessage">हम आपके \'करने के लिए\' लोड नहीं कर सके।\nपुनः कोशिश करें, या बाद में वापस आएं।</string>
+    <string name="todoWidget_refresh">रीफ़्रेश करें</string>
+    <string name="todoWidget_today">आज</string>
+    <string name="a11y_todoWidget_jumpToToday">आज पर जाएं</string>
+    <string name="widgetSettings_widgetsColor">डैशबोर्ड मुख्य रंग</string>
+    <string name="dashboard_globalAnnouncement">वैश्विक घोषणा</string>
+    <string name="forecastWidget_currentWeek">वर्तमान सप्ताह</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-ht/strings.xml b/libs/pandares/src/main/res/values-ht/strings.xml
index 058a8b22e3..6f10568838 100644
--- a/libs/pandares/src/main/res/values-ht/strings.xml
+++ b/libs/pandares/src/main/res/values-ht/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Soumisyon Echwe</string>
     <string name="submissionStatusFailedSubtitle">Tape pou afiche detay</string>
     <string name="submissionAndRubric">Soumisyon &amp; Ribrik</string>
+    <string name="submissionAndFeedback">Soumisyon &amp; Fidbak</string>
     <string name="commentsAndRubric">Kòmantè &amp; Ribrik</string>
     <string name="errorLoadingAssignment">Te gen yon pwobl pouchaje devwa sa a. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
     <string name="submitted">Soumèt</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Jodi a</string>
+    <string name="tomorrow">Demen</string>
     <string name="past">Pase</string>
     <string name="noDate">San Dat</string>
     <string name="future">Fiti</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monològ</string>
     <string name="noItemsToDisplayShort">Pa gen atik pou afiche</string>
     <string name="Todo">Pou Fè</string>
+    <string name="TodoNew">Pou fè</string>
     <string name="todoFilter">Filtè Kou</string>
     <string name="filterByEllipsis">Filtre pa</string>
     <string name="favoriteCoursesLabel">Kou Prefere</string>
@@ -474,6 +477,7 @@
     <string name="groups">Gwoup</string>
     <string name="groupMembers">Manm Gwoup</string>
 
+    <string name="messageGroup">Gwoup mesaj</string>
     <string name="loading">Chajman&#8230;</string>
     <string name="select_item_to_display">Chwazi nan lis la</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Pou Fè</string>
+    <string name="todoWidgetTitleNew">Pou fè</string>
     <string name="gradesWidgetTitle">Nòt</string>
     <string name="notificationWidgetTitle">Notifikasyon</string>
     <string name="todoWidgetTitleLong">Canvas - Pou Fè</string>
+    <string name="todoWidgetTitleLongNew">Canvas Pou fè</string>
     <string name="gradesWidgetTitleLong">Canvas - Klas</string>
     <string name="gradeWidgetTitleLong">Canvas - Klas</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifikasyon</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kou</string>
     <string name="toDoList">Lis sa Pou Fè</string>
+    <string name="toDoListNew">List Tach Pou fè</string>
+
     <string name="notifications">Notifikasyon</string>
     <string name="pushNotifications">Notifikasyon Push</string>
     <string name="pushNotificationsError">Avètisman Push yo pa t anrejistre pou aparèy sa a.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Ouvri Speedgrader</string>
 
-    <string name="search_todo">lis tout sa pou fè</string>
     <string name="search_course">kou kou klas klas</string>
     <string name="search_grades">klas klas</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Tit paj la dwe defini.</string>
     <string name="pageDetails">Detay Paj</string>
     <string name="saving">Anrejistreman</string>
+    <string name="speedGraderSaving">Anrejistreman</string>
+    <string name="speedGraderSaved">Anrejistre</string>
+    <string name="speedGraderFailed">Echèk</string>
+    <string name="speedGraderSaveErrorTitle">Oups, gen yon bagay ki pa mache.</string>
+    <string name="speedGraderSaveErrorMessage">Te gen yon erè pandan w t ap anrejistre modifikasyon nòt ou a. Ou ka eseye ankò, oswa eseye ankò pita.</string>
+    <string name="speedGraderSaveErrorContentDescription">Sovgade nòt la echwe. Peze pou detay.</string>
+
     <string name="confirmDeleteEvent">Èske vrèman ou swete elemine aktivite sa a?</string>
     <string name="conferencesNotSupported">Konferans yo pa posib sou aparèy mobil.</string>
     <string name="filePreviewContentDescription">Fichye apèsi imaj</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Anrejistreman</string>
     <string name="conferenceInProgress">Konferans ap fèt</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferans (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Konferans ap fèt</string>
+    <string name="conferencesWidgetDismissed">Konferans lan pa t aksepte</string>
     <string name="a11y_criterion_content_description">Evalyasyon kritè %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">plis enfòmasyon</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s tach pou fè</item>
         <item quantity="other">%s tach pou fè yo</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s bagay pou fè</item>
+        <item quantity="other">%s bagay pou fè</item>
+    </plurals>
     <string name="noAnnotationSelected">Pa gen anotasyon ki seleksyone</string>
     <string name="emailNotifications">Avètisman Imèl</string>
     <string name="emailNotificationsImmediately">Kounye a menm</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Pa gen Aktivite Jodi a!</string>
     <string name="calendarNoEventsDescription">Sanble yon bon jou pou repoze w, amize w epi mete enèji.</string>
     <string name="userCalendarToDo">Pou Fè</string>
+    <string name="userCalendarToDoNew">Pou fè</string>
     <string name="courseToDo">%s Tach</string>
+    <string name="courseToDoNew">%s Pou Fè</string>
     <string name="calendarEventExcused">Egzante</string>
     <string name="calendarEventMissing">Manke</string>
     <string name="calendarEventGraded">Klase</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Evènman %s kreye avèk siksè.</string>
     <string name="a11y_eventUpdatedAnnouncement">Evènman %s aktyalize avèk siksè.</string>
     <string name="a11y_toDoCreatedAnnouncement">Tach %s kreye avèk siksè.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Tach pou fè %s kreye avèk siksè.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Tach %s aktyalize avèk siksè.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Tach pou fè %s aktyalize avèk siksè.</string>
     <string name="todoScreenTitle">Pou Fè</string>
+    <string name="todoScreenTitleNew">Pou fè</string>
     <string name="todoDateLabel">Dat</string>
     <string name="todoDescriptionLabel">Deskripsyon</string>
     <string name="todoDeleteConfirmationTitle">Elimine Lis Tach la?</string>
+    <string name="todoDeleteConfirmationTitleNew">Efase Tach pou Fè?</string>
     <string name="todoDeleteConfirmationText">Sa ap elimine Lis Tach ou yo definitivman.</string>
+    <string name="todoDeleteConfirmationTextNew">Sa ap elimine Tâche pou Fè ou a definitivman.</string>
     <string name="todoDeleteErrorMessage">Te gen erè pou efase Tach sa a. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
+    <string name="todoDeleteErrorMessageNew">Te gen yon erè lè w t ap efase sa pou w fè a. Tanpri verifye koneksyon ou epi eseye ankò.</string>
     <string name="createTodoScreenTitle">Nouvo Tach</string>
+    <string name="createTodoScreenTitleNew">Nouvo Tach pou Fè</string>
     <string name="editTodoScreenTitle">Chanje Tach</string>
+    <string name="editTodoScreenTitleNew">Modifye Tach pou Fè</string>
     <string name="createToDoTitleHint">Ajoute tit</string>
     <string name="createToDoDateLabel">Dat</string>
     <string name="createToDoTimeLabel">Tan</string>
     <string name="createToDoCalendarLabel">Kalandriye</string>
     <string name="createToDoDetailsLabel">Detay</string>
     <string name="todoSaveErrorMessage">Te gen erè pou anrejistre Tach sa a. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
+    <string name="todoSaveErrorMessageNew">Te gen yon erè pou sovgade sa pou w fè a. Tanpri verifye koneksyon w lan epi eseye ankò.</string>
     <string name="selectCalendarScreenTitle">Seleksyone Kalandriye</string>
     <string name="errorContentRetryButton">Re eseye</string>
     <string name="eventLocationLabel">Anplasman</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Detay</string>
     <string name="errorLoadingEvent">Te gen yon pwoblèm nan chajman evènman sa a. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
     <string name="errorLoadingTodo">Te gen yon pwoblèm nan chajman aktivite sa a. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
+    <string name="errorLoadingTodoNew">Te gen yon pwoblèm pou chaje sa pou w fè a sa a. Tanpri verifye koneksyon w lan epi eseye ankò.</string>
     <string name="eventDeleteConfirmationTitle">Elimine Evènman?</string>
     <string name="eventDeleteConfirmationText">Sa ap elimine aktivite w la definitivman.</string>
     <string name="eventDeleteErrorMessage">Te gen yon erè pou efase evènman sa a. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Tout evènman yo</string>
     <string name="eventDeleteScopeFollowing">Sa a ak tout pwochen aktivite yo</string>
     <string name="calendarAddToDo">Ajoute Lis Tach</string>
+    <string name="calendarAddToDoNew">Ajoute Lis tach</string>
     <string name="calendarAddEvent">Ajoute Evènman</string>
     <string name="createEventScreenTitle">Nouvo Aktivite</string>
     <string name="editEventScreenTitle">Modifye Aktivite</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">An n Konekte w!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Pou w wè sa w gen pou w fè yo, tanpri konekte sou kont ou nan aplikasyon an. L ap pran yon segonn!</string>
     <string name="a11y_widgetToDoOpenToDoList">Ouvri ekran Sa w Gen Pou w Fè</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Ouvri ekran Lis Sa Pou Fè a</string>
     <string name="a11y_widgetToDoCreateNewToDo">Kreye nouvo Bagay pou w Fè</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Kreye nouvo Tach</string>
     <string name="widgetGradesErrorSubtitle">Nou gen difikilte pou montre nòt ou yo pou kounye a. Eseye ankò apre yon ti tan oswa ale sou aplikasyon an.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Pou w wè nòt ou yo, tanpri konekte sou kont ou nan aplikasyon an. L ap pran yon segonn!</string>
     <string name="widgetSingleGradeErrorSubtitle">Nou gen difikilte pou montre nòt ou yo pou kounye a.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">An n chwazi yon kou</string>
     <string name="widgetGradesErrorLoadingCourses">Yon erè fèt pandan chajman kou yo:</string>
     <string name="settingsSwitchExperience">Chanje a Karyè Canvas</string>
+    <string name="forecastWidgetTitle">Rezime Semèn</string>
+    <string name="forecastWidgetWeekPeriod">Semèn %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Manke</string>
+    <string name="forecastWidgetDue">Delè</string>
+    <string name="forecastWidgetRecentGrades">Nouvo Nòt</string>
+    <string name="forecastWidgetGradeWeight">%d%% nan nòt final la</string>
+    <string name="forecastWidgetErrorMessage">Nou\ gen pwoblèm pou chaje devwa ou yo. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
+    <string name="forecastWidgetEmptyMissing">Pa gen okenn devwa ki manke. Yo pran w!</string>
+    <string name="forecastWidgetEmptyDue">Pa gen devwa pou semèn sa a.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Pa gen nouvo nòt semèn sa a.</string>
+    <string name="a11y_contentDescription_previousWeek">Semèn pase</string>
+    <string name="a11y_contentDescription_nextWeek">Semèn pwochen</string>
+
     <string name="speedGraderGradeTabTitle">Nòt &amp; Ribrik</string>
     <string name="speedGraderDetailsTabTitle">Detay</string>
     <string name="a11y_contentDescription_expandPanel">Elaji Panèl</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Te gen yon erè pandan y ap chaje tach pou w fè yo. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
     <string name="errorUpdatingToDo">Te gen yon erè nan aktyalizasyon tach pou w fè yo. Tanpri verifye koneksyon ou a epi eseye ankò.</string>
     <string name="noToDosForNow">Sa pou Pa Fè Kounye a!</string>
+    <string name="noToDosForNowNew">Pa gen Tach pou Fè pou kounye a!</string>
     <string name="noToDosForNowSubtext">Sanble se yon bon moman pou repoze, detann, epi rekipere enèji.</string>
     <string name="todoSwipeDone">Fini</string>
     <string name="todoSwipeUndo">Defèt</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferans Lis Tach pou Fè</string>
+    <string name="todoFilterPreferencesNew">Preferans Lis Tach yo</string>
     <string name="todoFilterVisibleItems">Atik Vizib</string>
     <string name="todoFilterShowPersonalToDos">Montre Tach Pèsonèl pou Fè yo</string>
+    <string name="todoFilterShowPersonalToDosNew">Montre Tach Pèsonèl pou Fè yo</string>
     <string name="todoFilterShowCalendarEvents">Montre Evènman ki nan Kalandriye yo</string>
     <string name="todoFilterShowCompleted">Montre sa ki Fini</string>
     <string name="todoFilterFavoriteCoursesOnly">Kou Favori yo Sèlman</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Refize Envitasyon</string>
     <string name="courseInvitationDeclineConfirmMessage">Èske ou sèten ou vle refize envitasyon an pou %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Pwogrè</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Bonjou, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Bonjou, %s</string>
 
+    <string name="courses_and_groups">Kou &amp; Gwoup</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Pèsonalize Tablodbò</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Chanje aranjman tablodbò</string>
     <string name="changing_dashboard_layout_message">Pou chanje aranjman tablodbò a fòk ou redemare aplikasyon an</string>
     <string name="restart_now">Redemare kounye a</string>
+    <string name="turn_on_new_dashboard">Mete nouvo tablodbò a an sèvis.</string>
     <string name="switched_back">Tounen sou sa anvan an?</string>
     <string name="switched_back_message">Mèsi paske w eseye nouvo tablodbò a! Èske ou ka di nou poukisa ou tounen sou sa anvan an?</string>
+    <string name="survey_option_hard_to_find">Bagay ki difisil pou jwenn</string>
+    <string name="survey_option_prefer_old_layout">Mwen prefere ansyen aranjman an</string>
+    <string name="survey_option_something_broken">Yon bagay pa t mache kòrèkteman</string>
     <string name="what_could_we_improve">Kisa nou ta ka amelyore?</string>
+    <string name="what_do_you_think_of_new_dashboard">Kisa w panse de nouvo a tablodbò?</string>
+    <string name="let_us_know">Fè nou konnen!</string>
+    <string name="no_app_to_handle_link">Pa gen okenn aplikasyon ki disponib pou ouvri lyen sa a</string>
     <string name="skip">Sote</string>
     <string name="widget_setting_show_greeting">Montre salitasyon an</string>
     <string name="background_color">Koulè fon</string>
+    <string name="widget_setting_show_grades">Kategori Kou</string>
+    <string name="widget_setting_show_color_overlay">Kouvèti Koulè nan Kou yo</string>
     <string name="offline_content_available">Kontni disponib san entènèt</string>
     <string name="a11y_contentDescription_moreOptions">Plis opsyon</string>
     <string name="customizeCourse">Pèsonalize Kou</string>
     <string name="favoriteCoursesAndGroups">Kou ak Gwoup Prefere</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Zouti Ekstèn yo pa disponib san entènèt.</string>
+    <string name="widget_weekly_summary">Rezime Semèn</string>
+
+    <string name="dashboardCourseNickname">Ti Non Jwèt</string>
+    <string name="dashboardCourseNicknameHint">Ekri ti non kou a isit la</string>
+    <string name="dashboardCourseColor">Koulè Kou</string>
+    <string name="widget_toDo">Lis bagay pou fè chak jou</string>
+    <string name="dailyToDoWidgetTitle">Lis bagay pou fè chak jou</string>
+    <string name="todoWidget_showCompleted">Montre sa ki Fini</string>
+    <string name="todoWidget_emptyTitle">Ou fini pou kounye a!</string>
+    <string name="todoWidget_emptyMessage">Sanble ou lib jodi a.\nÈske w vle ajoute kèk bagay pou fè?</string>
+    <string name="todoWidget_addTodo">Ajoute Lis tach</string>
+    <string name="todoWidget_errorTitle">Oups, gen yon bagay ki pa mache</string>
+    <string name="todoWidget_errorMessage">Nou pa t kapab chaje devwa ou yo.\nEseye ankò, oswa tounen pita.</string>
+    <string name="todoWidget_refresh">Aktyalize</string>
+    <string name="todoWidget_today">Jodi a</string>
+    <string name="a11y_todoWidget_jumpToToday">Ale nan jodi a</string>
+    <string name="widgetSettings_widgetsColor">Koulè prensipal tablodbò a</string>
+    <string name="dashboard_globalAnnouncement">Anons Global</string>
+    <string name="forecastWidget_currentWeek">Semèn aktyèl</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-id/strings.xml b/libs/pandares/src/main/res/values-id/strings.xml
index 7c5bbf5b28..d7f21457d1 100644
--- a/libs/pandares/src/main/res/values-id/strings.xml
+++ b/libs/pandares/src/main/res/values-id/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Penyerahan Gagal</string>
     <string name="submissionStatusFailedSubtitle">Ketuk untuk melihat detail</string>
     <string name="submissionAndRubric">Penyerahan &amp; Rubrik</string>
+    <string name="submissionAndFeedback">Penyerahan &amp; Umpan Balik</string>
     <string name="commentsAndRubric">Komentar &amp; Rubrik</string>
     <string name="errorLoadingAssignment">Ada masalah saat memuat tugas ini. Silakan periksa sambungan internet Anda dan coba lagi.</string>
     <string name="submitted">Diserahkan</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Hari Ini</string>
+    <string name="tomorrow">Besok</string>
     <string name="past">Masa Lalu</string>
     <string name="noDate">Tidak Ada Tanggal</string>
     <string name="future">Mendatang</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Tidak ada item untuk ditampilkan</string>
     <string name="Todo">Harus Dilakukan</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Kursus</string>
     <string name="filterByEllipsis">Filter menurut...</string>
     <string name="favoriteCoursesLabel">Kursus Favorit</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grup</string>
     <string name="groupMembers">Anggota Grup</string>
 
+    <string name="messageGroup">Kirim Pesan ke Grup</string>
     <string name="loading">Memuat&#8230;</string>
     <string name="select_item_to_display">Pilih dari daftar</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Harus Dilakukan</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Nilai</string>
     <string name="notificationWidgetTitle">Notifikasi</string>
     <string name="todoWidgetTitleLong">Canvas - To Do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Nilai</string>
     <string name="gradeWidgetTitleLong">Canvas - Nilai</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifikasi</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kursus</string>
     <string name="toDoList">Daftar To Do</string>
+    <string name="toDoListNew">Daftar To-do</string>
+
     <string name="notifications">Notifikasi</string>
     <string name="pushNotifications">Notifikasi Push</string>
     <string name="pushNotificationsError">Notifikasi Push belum didaftarkan untuk perangkat ini.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Buka SpeedGrader</string>
 
-    <string name="search_todo">todo to do todos todo daftar</string>
     <string name="search_course">kursus kursus kelas kelas</string>
     <string name="search_grades">nilai nilai</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Judul halaman harus ditetapkan.</string>
     <string name="pageDetails">Detail Halaman</string>
     <string name="saving">Sedang menyimpan</string>
+    <string name="speedGraderSaving">Sedang menyimpan</string>
+    <string name="speedGraderSaved">Disimpan</string>
+    <string name="speedGraderFailed">Gagal</string>
+    <string name="speedGraderSaveErrorTitle">Ups, terjadi kesalahan</string>
+    <string name="speedGraderSaveErrorMessage">Terjadi kesalahan saat menyimpan perubahan nilai Anda. Anda dapat mencoba lagi, atau coba lagi nanti.</string>
+    <string name="speedGraderSaveErrorContentDescription">Penyimpanan nilai gagal. Ketuk untuk detail.</string>
+
     <string name="confirmDeleteEvent">Anda yakin mau menghapus acara ini?</string>
     <string name="conferencesNotSupported">Konferensi belum didukung di seluler.</string>
     <string name="filePreviewContentDescription">Gambar pratinjau file</string>
@@ -1223,6 +1237,10 @@
     <string name="recordings">Rekaman</string>
     <string name="conferenceInProgress">Konferensi sedang berlangsung</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferensi (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Konferensi sedang berlangsung</string>
+    <string name="conferencesWidgetDismissed">Konferensi dibatalkan</string>
     <string name="a11y_criterion_content_description">Peringkat kriteria %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">informasi selengkapnya</string>
@@ -1380,6 +1398,10 @@
         <item quantity="one">%s item harus dilakukan</item>
         <item quantity="other">%s item harus dilakukan</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s item harus dilakukan</item>
+        <item quantity="other">%s item harus dilakukan</item>
+    </plurals>
     <string name="noAnnotationSelected">Anotasi tidak dipilih</string>
 
     <string name="emailNotifications">Notifikasi Email</string>
@@ -1664,7 +1686,9 @@
     <string name="calendarNoEvents">Tidak Ada Acara Hari Ini!</string>
     <string name="calendarNoEventsDescription">Sepertinya hari ini sangat cocok untuk beristirahat, santai, dan menyegarkan diri.</string>
     <string name="userCalendarToDo">To Do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">To Do %s</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Dibolehkan</string>
     <string name="calendarEventMissing">Tidak Ada</string>
     <string name="calendarEventGraded">Dinilai</string>
@@ -1689,21 +1713,30 @@
     <string name="a11y_eventCreatedAnnouncement">Acara %s berhasil dibuat.</string>
     <string name="a11y_eventUpdatedAnnouncement">Acara %s berhasil diperbarui.</string>
     <string name="a11y_toDoCreatedAnnouncement">Harus Dilakukan %s berhasil dibuat.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Harus dilakukan %s berhasil dibuat.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Harus Dilakukan %s berhasil diperbarui.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Harus dilakukan %s berhasil diperbarui.</string>
     <string name="todoScreenTitle">To Do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Tanggal</string>
     <string name="todoDescriptionLabel">Deskripsi</string>
     <string name="todoDeleteConfirmationTitle">Harus Dilakukan/To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Hapus To-do?</string>
     <string name="todoDeleteConfirmationText">Ini akan secara permanen menghapus butir To Do/Harus Dilakukan Anda.</string>
+    <string name="todoDeleteConfirmationTextNew">Ini akan menghapus item To-do Anda secara permanen.</string>
     <string name="todoDeleteErrorMessage">Terjadi kesalahan saat menghapus To Do ini. Silakan periksa sambungan internet Anda dan coba lagi.</string>
+    <string name="todoDeleteErrorMessageNew">Terjadi kesalahan saat menghapus tugas ini. Silakan periksa koneksi Anda dan coba lagi.</string>
     <string name="createTodoScreenTitle">To Do Baru</string>
+    <string name="createTodoScreenTitleNew">To-do Baru</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Tambah judul</string>
     <string name="createToDoDateLabel">Tanggal</string>
     <string name="createToDoTimeLabel">Waktu</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Detail</string>
     <string name="todoSaveErrorMessage">Terjadi kesalahan saat menyimpan To Do ini. Silakan periksa sambungan internet Anda dan coba lagi.</string>
+    <string name="todoSaveErrorMessageNew">Terjadi kesalahan saat menyimpan tugas ini. Silakan periksa koneksi Anda dan coba lagi.</string>
     <string name="selectCalendarScreenTitle">Pilih Kalender</string>
     <string name="errorContentRetryButton">Coba lagi</string>
     <string name="eventLocationLabel">Lokasi</string>
@@ -1711,6 +1744,7 @@
     <string name="eventDetailsLabel">Detail</string>
     <string name="errorLoadingEvent">Ada masalah saat memuat acara ini. Silakan periksa sambungan internet Anda dan coba lagi.</string>
     <string name="errorLoadingTodo">Ada masalah saat memuat to do ini. Silakan periksa sambungan internet Anda dan coba lagi.</string>
+    <string name="errorLoadingTodoNew">Terjadi kesalahan saat memuat daftar to-do. Silakan periksa koneksi Anda dan coba lagi.</string>
     <string name="eventDeleteConfirmationTitle">Hapus Acara?</string>
     <string name="eventDeleteConfirmationText">Ini akan secara permanen menghapus acara Anda.</string>
     <string name="eventDeleteErrorMessage">Terjadi kesalahan saat menghapus acara ini. Silakan periksa sambungan internet Anda dan coba lagi.</string>
@@ -1727,6 +1761,7 @@
     <string name="eventDeleteScopeAll">Semua acara</string>
     <string name="eventDeleteScopeFollowing">Ini dan semua peristiwa berikutnya</string>
     <string name="calendarAddToDo">Tambah To-Do</string>
+    <string name="calendarAddToDoNew">Tambah To-Do</string>
     <string name="calendarAddEvent">Tambah Acara</string>
     <string name="createEventScreenTitle">Acara Baru</string>
     <string name="editEventScreenTitle">Edit Acara</string>
@@ -2105,7 +2140,9 @@
     <string name="widgetNotLoggedInTitle">Ayo Kita Log In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Untuk melihat to-do Anda, silakan login ke akun Anda di aplikasi. Hanya butuh waktu sebentar!</string>
     <string name="a11y_widgetToDoOpenToDoList">Buka layar To Do</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Buka layar daftar To-do</string>
     <string name="a11y_widgetToDoCreateNewToDo">Buat To Do baru</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Buat To-do baru</string>
     <string name="widgetGradesErrorSubtitle">Kami kesulitan menampilkan nilai Anda saat ini. Silakan coba lagi sebentar lagi atau pergi ke app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Untuk melihat nilai Anda, silakan login ke akun Anda di aplikasi. Hanya butuh waktu sebentar!</string>
     <string name="widgetSingleGradeErrorSubtitle">Kami kesulitan menampilkan nilai Anda saat ini.</string>
@@ -2113,6 +2150,19 @@
     <string name="widgetSingleGradeSelectCourse">Ayo pilih kursus</string>
     <string name="widgetGradesErrorLoadingCourses">Kesalahan terjadi saat memuat kursus.</string>
     <string name="settingsSwitchExperience">Alihkan ke Canvas Career</string>
+    <string name="forecastWidgetTitle">Rangkuman Mingguan</string>
+    <string name="forecastWidgetWeekPeriod">Minggu %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Tidak Ada</string>
+    <string name="forecastWidgetDue">Batas Waktu</string>
+    <string name="forecastWidgetRecentGrades">Nilai Baru</string>
+    <string name="forecastWidgetGradeWeight">%d%% dari nilai final</string>
+    <string name="forecastWidgetErrorMessage">Kami kesulitan memuat nilai tugas Anda. Silakan periksa sambungan internet Anda dan coba lagi.</string>
+    <string name="forecastWidgetEmptyMissing">Tidak ada tugas yang hilang. Anda berhasil menyusul!</string>
+    <string name="forecastWidgetEmptyDue">Tidak ada tugas jatuh tempo minggu ini</string>
+    <string name="forecastWidgetEmptyRecentGrades">Tidak ada nilai baru minggu ini.</string>
+    <string name="a11y_contentDescription_previousWeek">Minggu sebelumnya</string>
+    <string name="a11y_contentDescription_nextWeek">Minggu depan</string>
+
     <string name="speedGraderGradeTabTitle">Nilai &amp; Rubrik</string>
     <string name="speedGraderDetailsTabTitle">Detail</string>
     <string name="a11y_contentDescription_expandPanel">Perluas panel</string>
@@ -2191,6 +2241,7 @@
     <string name="errorLoadingToDos">Terjadi kesalahan saat memuat item harus dilakukan Anda. Silakan periksa sambungan internet Anda dan coba lagi.</string>
     <string name="errorUpdatingToDo">Terjadi kesalahan saat memperbarui item harus dilakukan. Silakan periksa sambungan internet Anda dan coba lagi.</string>
     <string name="noToDosForNow">Tidak ada yang harus dilakukan sekarang!</string>
+    <string name="noToDosForNowNew">Tidak ada To-do untuk sekarang!</string>
     <string name="noToDosForNowSubtext">Sepertinya waktu yang tepat untuk beristirahat, bersantai, dan memulihkan tenaga.</string>
     <string name="todoSwipeDone">Selesai</string>
     <string name="todoSwipeUndo">Urungkan</string>
@@ -2201,8 +2252,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferensi Daftar Yang Harus Dilakukan</string>
+    <string name="todoFilterPreferencesNew">Preferensi daftar To-do</string>
     <string name="todoFilterVisibleItems">Item Tampak</string>
     <string name="todoFilterShowPersonalToDos">Tampilkan Daftar Harus Dilakukan Pribadi</string>
+    <string name="todoFilterShowPersonalToDosNew">Tampilkan Daftar To Do</string>
     <string name="todoFilterShowCalendarEvents">Tampilkan Acara Kalender</string>
     <string name="todoFilterShowCompleted">Tampilkan Selesai</string>
     <string name="todoFilterFavoriteCoursesOnly">Kursus Favorit Saja</string>
@@ -2229,6 +2282,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Tolak Undangan</string>
     <string name="courseInvitationDeclineConfirmMessage">Anda yakin mau menolak undangan dari %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Kemajuan</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Selamat pagi, %s!</string>
@@ -2351,6 +2407,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Halo, %s</string>
 
+    <string name="courses_and_groups">Kursus &amp; Grup</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Sesuaikan Dashboard</string>
     <string name="dashboard_widgets">Widget</string>
@@ -2360,16 +2417,44 @@
     <string name="changing_dashboard_layout">Mengubah tata letak dashboard</string>
     <string name="changing_dashboard_layout_message">Untuk mengubah tata letak dashboard, Anda harus memulai ulang aplikasi.</string>
     <string name="restart_now">Mulai ulang sekarang</string>
+    <string name="turn_on_new_dashboard">Aktifkan dasbor baru</string>
     <string name="switched_back">Beralih kembali?</string>
     <string name="switched_back_message">Terima kasih telah mencoba dashboard baru! Bisakah Anda memberi tahu kami mengapa Anda beralih kembali?</string>
+    <string name="survey_option_hard_to_find">Sulit menemukan sesuatu</string>
+    <string name="survey_option_prefer_old_layout">Lebih suka tata letak lama</string>
+    <string name="survey_option_something_broken">Ada yang tidak berfungsi dengan benar</string>
     <string name="what_could_we_improve">Apa yang dapat kami tingkatkan?</string>
+    <string name="what_do_you_think_of_new_dashboard">Apa pendapat Anda tentang dashboard yang baru?</string>
+    <string name="let_us_know">Beri tahu kami!</string>
+    <string name="no_app_to_handle_link">Tidak ada aplikasi yang tersedia untuk membuka tautan ini</string>
     <string name="skip">Lewati</string>
     <string name="widget_setting_show_greeting">Tampilkan sapaan</string>
     <string name="background_color">Warna latar belakang</string>
+    <string name="widget_setting_show_grades">Peringkat Kursus</string>
+    <string name="widget_setting_show_color_overlay">Overlay Warna Kursus</string>
     <string name="offline_content_available">Konten offline tersedia</string>
     <string name="a11y_contentDescription_moreOptions">Opsi lain</string>
     <string name="customizeCourse">Kustomisasikan Kursus</string>
     <string name="favoriteCoursesAndGroups">Favoritkan Kursus dan Grup</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Alat Eksternal tidak tersedia offline.</string>
+    <string name="widget_weekly_summary">Rangkuman Mingguan</string>
+
+    <string name="dashboardCourseNickname">Nama panggilan</string>
+    <string name="dashboardCourseNicknameHint">Tulis nama kursus di sini</string>
+    <string name="dashboardCourseColor">Warna Kursus</string>
+    <string name="widget_toDo">Daftar Tugas Harian</string>
+    <string name="dailyToDoWidgetTitle">Daftar Tugas Harian</string>
+    <string name="todoWidget_showCompleted">Tampilkan Selesai</string>
+    <string name="todoWidget_emptyTitle">Anda sudah selesai untuk saat ini!</string>
+    <string name="todoWidget_emptyMessage">Sepertinya Anda bebas untuk hari ini.\nApakah Anda ingin menambahkan beberapa tugas?</string>
+    <string name="todoWidget_addTodo">Tambah To-Do</string>
+    <string name="todoWidget_errorTitle">Ups, terjadi kesalahan</string>
+    <string name="todoWidget_errorMessage">Kami tidak dapat memuat tugas Anda.\nCoba lagi, atau kembali lagi nanti.</string>
+    <string name="todoWidget_refresh">Muat Ulang</string>
+    <string name="todoWidget_today">Hari Ini</string>
+    <string name="a11y_todoWidget_jumpToToday">Lompat ke hari ini</string>
+    <string name="widgetSettings_widgetsColor">Warna Utama Dasbor</string>
+    <string name="dashboard_globalAnnouncement">Pengumuman Global</string>
+    <string name="forecastWidget_currentWeek">Minggu ini</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-is/strings.xml b/libs/pandares/src/main/res/values-is/strings.xml
index f12bda9541..57bebb5f9a 100644
--- a/libs/pandares/src/main/res/values-is/strings.xml
+++ b/libs/pandares/src/main/res/values-is/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Ekki tókst að skila</string>
     <string name="submissionStatusFailedSubtitle">Smelltu til að skoða upplýsingar</string>
     <string name="submissionAndRubric">Skil &amp; matsviðmið</string>
+    <string name="submissionAndFeedback">Skil &amp; endurgjöf</string>
     <string name="commentsAndRubric">Athugasemdir og matsviðmið</string>
     <string name="errorLoadingAssignment">Það kom upp vandamál við að hlaða inn þessu verkefni. Athugaðu tengingu þína og reyndu aftur.</string>
     <string name="submitted">Skilað</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Í dag</string>
+    <string name="tomorrow">Á morgun</string>
     <string name="past">Fyrri</string>
     <string name="noDate">Engin dagsetning</string>
     <string name="future">Framtíðar</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Einræða</string>
     <string name="noItemsToDisplayShort">Engin hlutir til að sýna</string>
     <string name="Todo">Verkefni</string>
+    <string name="TodoNew">Verkefnalisti</string>
     <string name="todoFilter">Sía námskeið</string>
     <string name="filterByEllipsis">Sía eftir&#8230;</string>
     <string name="favoriteCoursesLabel">Uppáhalds námskeið</string>
@@ -474,6 +477,7 @@
     <string name="groups">Hópar</string>
     <string name="groupMembers">Hópmeðlimir</string>
 
+    <string name="messageGroup">Skilaboð til hóps</string>
     <string name="loading">Sæki&#8230;</string>
     <string name="select_item_to_display">Veldu úr lista</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Verkefni</string>
+    <string name="todoWidgetTitleNew">Verkefnalisti</string>
     <string name="gradesWidgetTitle">Einkunnir</string>
     <string name="notificationWidgetTitle">Tilkynningar</string>
     <string name="todoWidgetTitleLong">Canvas - verkefni</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Verkefnalisti</string>
     <string name="gradesWidgetTitleLong">Canvas - einkunnir</string>
     <string name="gradeWidgetTitleLong">Canvas - einkunn</string>
     <string name="notificationWidgetTitleLong">Canvas - tilkynningar</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Námskeið</string>
     <string name="toDoList">Verkefnalisti</string>
+    <string name="toDoListNew">Verkefnalisti</string>
+
     <string name="notifications">Tilkynningar</string>
     <string name="pushNotifications">Þrýstar tilkynningar</string>
     <string name="pushNotificationsError">Þrýstar tilkynningar hafa ekki verið skráðar fyrir þetta tæki.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Opna Speedgrader</string>
 
-    <string name="search_todo">verkefni verkefnalisti</string>
     <string name="search_course">námskeið bekkur bekkir</string>
     <string name="search_grades">einkunn einkunnir</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Síðutitill þarf að vera stilltur inn.</string>
     <string name="pageDetails">Upplýsingar um síðu</string>
     <string name="saving">Vistar</string>
+    <string name="speedGraderSaving">Vistar</string>
+    <string name="speedGraderSaved">Vistað</string>
+    <string name="speedGraderFailed">Tókst ekki</string>
+    <string name="speedGraderSaveErrorTitle">Úbbs, eitthvað fór úrskeiðis</string>
+    <string name="speedGraderSaveErrorMessage">Villa kom upp við að vista breytinguna á einkunn. Þú getur reynt aftur eða reynt aftur síðar.</string>
+    <string name="speedGraderSaveErrorContentDescription">Vistun einkunnar mistókst. Smelltu til að fá upplýsingar.</string>
+
     <string name="confirmDeleteEvent">Viltu örugglega eyða þessum viðburði?</string>
     <string name="conferencesNotSupported">Ráðstefnur eru ekki enn studdar á farsíma.</string>
     <string name="filePreviewContentDescription">Forskoðun skráar mynd</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Upptökur</string>
     <string name="conferenceInProgress">Ráðstefna í gangi</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Ráðstefnur (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Ráðstefna í gangi</string>
+    <string name="conferencesWidgetDismissed">Ráðstefna hunsuð</string>
     <string name="a11y_criterion_content_description">Viðmiðunarmat %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">frekari upplýsingar</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s verkefni á verkefnalista</item>
         <item quantity="other">%s verkefni á verkefnalista</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s verkefni á verkefnalista</item>
+        <item quantity="other">%s verkefni á verkefnalista</item>
+    </plurals>
     <string name="noAnnotationSelected">Engin athugasemd valin</string>
     <string name="emailNotifications">Tilkynningar í tölvupósti</string>
     <string name="emailNotificationsImmediately">Tafarlaust</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Engir viðburðir í dag!</string>
     <string name="calendarNoEventsDescription">Þetta virðist vera góður dagur til að hvílast, slaka á og hlaða batteríin.</string>
     <string name="userCalendarToDo">Verkefnalisti</string>
+    <string name="userCalendarToDoNew">Verkefnalisti</string>
     <string name="courseToDo">%s Verkefni</string>
+    <string name="courseToDoNew">%s verkefnalisti</string>
     <string name="calendarEventExcused">Undanþegið</string>
     <string name="calendarEventMissing">Vantar</string>
     <string name="calendarEventGraded">Metið</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Viðburður %s stofnaður.</string>
     <string name="a11y_eventUpdatedAnnouncement">Viðburður %s uppfærður.</string>
     <string name="a11y_toDoCreatedAnnouncement">Verkefni %s stofnað.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Verkefnalisti %s búinn til.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Verkefni %s uppfært.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Verkefnalisti %s uppfærður.</string>
     <string name="todoScreenTitle">Verkefnalisti</string>
+    <string name="todoScreenTitleNew">Verkefnalisti</string>
     <string name="todoDateLabel">Dagsetning</string>
     <string name="todoDescriptionLabel">Lýsing</string>
     <string name="todoDeleteConfirmationTitle">Eyða verkefni?</string>
+    <string name="todoDeleteConfirmationTitleNew">Eyða verkefnalista?</string>
     <string name="todoDeleteConfirmationText">Þú munt varanlega eyða verkefni þínu.</string>
+    <string name="todoDeleteConfirmationTextNew">Þú munt varanlega eyða verkefnalista þínum.</string>
     <string name="todoDeleteErrorMessage">Villa kom upp við að eyða þessu verkefni. Athugaðu tengingu þína og reyndu aftur.</string>
+    <string name="todoDeleteErrorMessageNew">Villa kom upp við að eyða þessum verkefnalista. Athugaðu tengingu þína og reyndu aftur.</string>
     <string name="createTodoScreenTitle">Nýtt verkefni</string>
+    <string name="createTodoScreenTitleNew">Nýr verkefnalisti</string>
     <string name="editTodoScreenTitle">Breyta verkefni</string>
+    <string name="editTodoScreenTitleNew">Breyta verkefnalista</string>
     <string name="createToDoTitleHint">Bæta við titli</string>
     <string name="createToDoDateLabel">Dagsetning</string>
     <string name="createToDoTimeLabel">Tími</string>
     <string name="createToDoCalendarLabel">Dagatal</string>
     <string name="createToDoDetailsLabel">Upplýsingar</string>
     <string name="todoSaveErrorMessage">Villa kom upp við að vista þetta verkefni. Athugaðu tengingu þína og reyndu aftur.</string>
+    <string name="todoSaveErrorMessageNew">Villa kom upp við að vista þennan verkefnalista. Athugaðu tengingu þína og reyndu aftur.</string>
     <string name="selectCalendarScreenTitle">Velja dagatal</string>
     <string name="errorContentRetryButton">Reyna aftur</string>
     <string name="eventLocationLabel">Staðsetning</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Upplýsingar</string>
     <string name="errorLoadingEvent">Það kom upp vandamál við að hlaða inn þessum viðburði. Athugaðu tengingu þína og reyndu aftur.</string>
     <string name="errorLoadingTodo">Það kom upp vandamál við að hlaða inn þessu verkefni. Athugaðu tengingu þína og reyndu aftur.</string>
+    <string name="errorLoadingTodoNew">Villa kom upp við að hlaða þessum verkefnalista. Athugaðu tengingu þína og reyndu aftur.</string>
     <string name="eventDeleteConfirmationTitle">Eyða viðburði?</string>
     <string name="eventDeleteConfirmationText">Þú munt varanlega eyða viðburði þínum.</string>
     <string name="eventDeleteErrorMessage">Villa kom upp við að eyða þessum viðburði. Athugaðu tengingu þína og reyndu aftur.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Allir viðburðir</string>
     <string name="eventDeleteScopeFollowing">Þessi og allir eftirfarandi viðburðir</string>
     <string name="calendarAddToDo">Bæta við Verkefni</string>
+    <string name="calendarAddToDoNew">Bæta við verkefnalista</string>
     <string name="calendarAddEvent">Bæta við viðburði</string>
     <string name="createEventScreenTitle">Nýr viðburður</string>
     <string name="editEventScreenTitle">Breyta viðburði</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Við skulum skrá þig inn!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Skráðu þig inn á reikninginn þinn í appinu til að sjá verkefnalistana þína. Það tekur stutta stund!</string>
     <string name="a11y_widgetToDoOpenToDoList">Opna skjáinn fyrir verkefnalista</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Opna skjáinn fyrir verkefnalista</string>
     <string name="a11y_widgetToDoCreateNewToDo">Búa til nýjan verkefnalista</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Búa til nýjan verkefnalista</string>
     <string name="widgetGradesErrorSubtitle">Við eigum í vandræðum með að sýna einkunnirnar þínar núna. Reyndu aftur eftir smá stund eða farðu í appið.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Skráðu þig inn á reikninginn þinn í appinu til að sjá einkunnirnar þínar. Það tekur stutta stund!</string>
     <string name="widgetSingleGradeErrorSubtitle">Við eigum í vandræðum með að sýna einkunnirnar þínar núna.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Við skulum velja námskeið</string>
     <string name="widgetGradesErrorLoadingCourses">Villa við sókn á námskeiðum.</string>
     <string name="settingsSwitchExperience">Skiptu yfir í Canvas Career</string>
+    <string name="forecastWidgetTitle">Vikuleg samantekt</string>
+    <string name="forecastWidgetWeekPeriod">Vika %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Vantar</string>
+    <string name="forecastWidgetDue">Skilafrestur</string>
+    <string name="forecastWidgetRecentGrades">Nýjar einkunnir</string>
+    <string name="forecastWidgetGradeWeight">%d%% af lokaeinkunn</string>
+    <string name="forecastWidgetErrorMessage">Við eigum erfitt með að hlaða inn verkefnum þínum. Athugaðu tengingu þína og reyndu aftur.</string>
+    <string name="forecastWidgetEmptyMissing">Engin verkefni vantar. Þú ert búin(n) með allt!</string>
+    <string name="forecastWidgetEmptyDue">Engin verkefnaskil þessa viku.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Engar nýjar einkunnir í þessari viku.</string>
+    <string name="a11y_contentDescription_previousWeek">Fyrri vika</string>
+    <string name="a11y_contentDescription_nextWeek">Næsta vika</string>
+
     <string name="speedGraderGradeTabTitle">Einkunn og matskvarði</string>
     <string name="speedGraderDetailsTabTitle">Upplýsingar</string>
     <string name="a11y_contentDescription_expandPanel">Stækka svæði</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Villa við að hlaða verkefnalista þínum. Athugaðu tengingu þína og reyndu aftur.</string>
     <string name="errorUpdatingToDo">Það var villa við að uppfæra verkefnalistann. Athugaðu tengingu þína og reyndu aftur.</string>
     <string name="noToDosForNow">Engir verkefnalistar í bili!</string>
+    <string name="noToDosForNowNew">Engir verkefnalistar í bili</string>
     <string name="noToDosForNowSubtext">Þetta virðist vera góður tími til að hvílast, slaka á og hlaða batteríin.</string>
     <string name="todoSwipeDone">Lokið</string>
     <string name="todoSwipeUndo">Hætta við</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Kjörstillingar varðandi verkefnalista</string>
+    <string name="todoFilterPreferencesNew">Kjörstillingar varðandi verkefnalista</string>
     <string name="todoFilterVisibleItems">Sýnileg atriði</string>
     <string name="todoFilterShowPersonalToDos">Sýna persónulega verkefnalista</string>
+    <string name="todoFilterShowPersonalToDosNew">Sýna persónulega verkefnalista</string>
     <string name="todoFilterShowCalendarEvents">Sýna viðburði dagatals</string>
     <string name="todoFilterShowCompleted">Sýna lokið</string>
     <string name="todoFilterFavoriteCoursesOnly">Aðeins eftirlætis námskeið</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Hafna boði</string>
     <string name="courseInvitationDeclineConfirmMessage">Ertu viss um að þú viljir hafna boðinu í %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Framvinda</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Góðan daginn, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Halló, %s</string>
 
+    <string name="courses_and_groups">Námskeið og hópar</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Sérsníða stjórnborð</string>
     <string name="dashboard_widgets">Græjur</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Breyta skipulagi stjórnborðs</string>
     <string name="changing_dashboard_layout_message">Þú verður að endurræsa forritið til að breyta skipulagi stjórnborðs</string>
     <string name="restart_now">Endurræsa núna</string>
+    <string name="turn_on_new_dashboard">Kveikja á nýja stjórnborðinu</string>
     <string name="switched_back">Skipta til baka?</string>
     <string name="switched_back_message">Takk fyrir að prufa nýja stjórnborðið! Geturðu útskýrt af hverju þú skiptir til baka?</string>
+    <string name="survey_option_hard_to_find">Hlutir sem erfitt er að finna</string>
+    <string name="survey_option_prefer_old_layout">Kýs frekar fyrra útlitið</string>
+    <string name="survey_option_something_broken">Eitthvað virkaði ekki sem skildi</string>
     <string name="what_could_we_improve">Hvað getum við gert betur?</string>
+    <string name="what_do_you_think_of_new_dashboard">Hvað finnst þér um nýja stjórnborðið?</string>
+    <string name="let_us_know">Láttu okkur vita!</string>
+    <string name="no_app_to_handle_link">Ekkert app í boði til að opna þennan tengil</string>
     <string name="skip">Sleppa</string>
     <string name="widget_setting_show_greeting">Sýna kveðju</string>
     <string name="background_color">Bakgrunnslitur</string>
+    <string name="widget_setting_show_grades">Námskeiðseinkunnir</string>
+    <string name="widget_setting_show_color_overlay">Yfirlag litar námskeiðs</string>
     <string name="offline_content_available">Efni án nettengingar tiltækt</string>
     <string name="a11y_contentDescription_moreOptions">Fleiri valkostir</string>
     <string name="customizeCourse">Sérsníða námskeið</string>
     <string name="favoriteCoursesAndGroups">Uppáhalds námskeið og hópar</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Ytri tæki eru ekki fáanleg án nettengingar.</string>
+    <string name="widget_weekly_summary">Vikuleg samantekt</string>
+
+    <string name="dashboardCourseNickname">Gælunafn</string>
+    <string name="dashboardCourseNicknameHint">Skrifaðu gælunafn námskeiðs hér</string>
+    <string name="dashboardCourseColor">Litur námskeiðs</string>
+    <string name="widget_toDo">Daglegur verkefnalisti</string>
+    <string name="dailyToDoWidgetTitle">Daglegur verkefnalisti</string>
+    <string name="todoWidget_showCompleted">Sýna lokið</string>
+    <string name="todoWidget_emptyTitle">Þetta er komið að sinni!</string>
+    <string name="todoWidget_emptyMessage">Þú virðist vera laus þennan dag.\nViltu bæta við nokkrum verkefnalistum?</string>
+    <string name="todoWidget_addTodo">Bæta við verkefnalista</string>
+    <string name="todoWidget_errorTitle">Úbbs, eitthvað fór úrskeiðis</string>
+    <string name="todoWidget_errorMessage">Við gátum ekki hlaðið inn verkefnalistum þínum.\nReyndu aftur eða komdu aftur síðar.</string>
+    <string name="todoWidget_refresh">Glæða</string>
+    <string name="todoWidget_today">Í dag</string>
+    <string name="a11y_todoWidget_jumpToToday">Fara á daginn í dag</string>
+    <string name="widgetSettings_widgetsColor">Aðallitur stjórnborðs</string>
+    <string name="dashboard_globalAnnouncement">Almenn tilkynning</string>
+    <string name="forecastWidget_currentWeek">Núverandi vika</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-it/strings.xml b/libs/pandares/src/main/res/values-it/strings.xml
index 7c15191657..7974383f9f 100644
--- a/libs/pandares/src/main/res/values-it/strings.xml
+++ b/libs/pandares/src/main/res/values-it/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Consegna non riuscita</string>
     <string name="submissionStatusFailedSubtitle">Tocca per visualizzare dettagli</string>
     <string name="submissionAndRubric">Consegna e Rubrica</string>
+    <string name="submissionAndFeedback">Consegna e feedback</string>
     <string name="commentsAndRubric">Commenti e Rubrica</string>
     <string name="errorLoadingAssignment">Si è verificato un problema durante il caricamento di questo compito. Verificare la connessione e riprovare.</string>
     <string name="submitted">Inviato</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Oggi</string>
+    <string name="tomorrow">Domani</string>
     <string name="past">Precedente</string>
     <string name="noDate">Nessuna data</string>
     <string name="future">Futuro</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monologo</string>
     <string name="noItemsToDisplayShort">Nessun elemento da visualizzare</string>
     <string name="Todo">Elenco attività</string>
+    <string name="TodoNew">Attività da fare</string>
     <string name="todoFilter">Filtra corsi</string>
     <string name="filterByEllipsis">Filtra per...</string>
     <string name="favoriteCoursesLabel">Corsi preferiti</string>
@@ -474,6 +477,7 @@
     <string name="groups">Gruppi</string>
     <string name="groupMembers">Membri del gruppo</string>
 
+    <string name="messageGroup">Invia messaggio a gruppo</string>
     <string name="loading">Caricamento&#8230;</string>
     <string name="select_item_to_display">Seleziona dall’elenco</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Elenco attività</string>
+    <string name="todoWidgetTitleNew">Attività da fare</string>
     <string name="gradesWidgetTitle">Voti</string>
     <string name="notificationWidgetTitle">Notifiche</string>
     <string name="todoWidgetTitleLong">Canvas - Elenco attività</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Attività da fare</string>
     <string name="gradesWidgetTitleLong">Canvas - Voti</string>
     <string name="gradeWidgetTitleLong">Canvas - Voto</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifiche</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Corsi</string>
     <string name="toDoList">Elenco delle attività</string>
+    <string name="toDoListNew">Elenco delle attività da fare</string>
+
     <string name="notifications">Notifiche</string>
     <string name="pushNotifications">Notifiche push</string>
     <string name="pushNotificationsError">Le notifiche push non sono state registrare per questo dispositivo.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Apri SpeedGrader</string>
 
-    <string name="search_todo">elenco attività attività attività attività</string>
     <string name="search_course">corso corsi classe classi</string>
     <string name="search_grades">voto voti</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Il titolo pagina deve essere impostato.</string>
     <string name="pageDetails">Dettagli pagina</string>
     <string name="saving">Salvataggio</string>
+    <string name="speedGraderSaving">Salvataggio</string>
+    <string name="speedGraderSaved">Salvato</string>
+    <string name="speedGraderFailed">Non riuscito</string>
+    <string name="speedGraderSaveErrorTitle">Ops, si è verificato un errore</string>
+    <string name="speedGraderSaveErrorMessage">Si è verificato un errore durante il salvataggio della modifica del voto. Riprova subito o più tardi.</string>
+    <string name="speedGraderSaveErrorContentDescription">Errore salvataggio voto. Tocca per i dettagli.</string>
+
     <string name="confirmDeleteEvent">Eliminare questo evento?</string>
     <string name="conferencesNotSupported">Le conferenze non sono ancora supportate sul dispositivo mobile.</string>
     <string name="filePreviewContentDescription">Immagine anteprima file</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Registrazioni</string>
     <string name="conferenceInProgress">Conferenza in corso</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferenze (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conferenza in corso</string>
+    <string name="conferencesWidgetDismissed">Conferenza ignorata</string>
     <string name="a11y_criterion_content_description">Valutazione basata su criterio %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">maggiori informazioni</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s elemento cose da fare</item>
         <item quantity="other">%s elementi cose da fare</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s elemento da fare</item>
+        <item quantity="other">%s elementi da fare</item>
+    </plurals>
     <string name="noAnnotationSelected">Nessuna annotazione selezionata</string>
     <string name="emailNotifications">Notifiche email</string>
     <string name="emailNotificationsImmediately">Immediatamente</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Nessun evento oggi!</string>
     <string name="calendarNoEventsDescription">Ottima occasione per riposarsi, rilassarsi e ricaricare le batterie.</string>
     <string name="userCalendarToDo">Elenco attività</string>
+    <string name="userCalendarToDoNew">Attività da fare</string>
     <string name="courseToDo">%s Elenco azioni</string>
+    <string name="courseToDoNew">%s attività da fare</string>
     <string name="calendarEventExcused">Giustificato</string>
     <string name="calendarEventMissing">Mancante</string>
     <string name="calendarEventGraded">Valutato</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Evento %s creato correttamente.</string>
     <string name="a11y_eventUpdatedAnnouncement">Evento %s aggiornato correttamente.</string>
     <string name="a11y_toDoCreatedAnnouncement">Elenco attività %s creato correttamente.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Attività da fare %s creata correttamente.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Elenco attività %s aggiornato correttamente.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Attività da fare %s aggiornata correttamente.</string>
     <string name="todoScreenTitle">Elenco attività</string>
+    <string name="todoScreenTitleNew">Attività da fare</string>
     <string name="todoDateLabel">Data</string>
     <string name="todoDescriptionLabel">Descrizione</string>
     <string name="todoDeleteConfirmationTitle">Eliminare Da fare?</string>
+    <string name="todoDeleteConfirmationTitleNew">Eliminare elenco attività?</string>
     <string name="todoDeleteConfirmationText">In questo modo si elimina definitivamente la voce Da fare.</string>
+    <string name="todoDeleteConfirmationTextNew">Questa operazione eliminerà in modo permanente il tuo elemento dell’elenco attività.</string>
     <string name="todoDeleteErrorMessage">Si è verificato un errore di eliminazione di questo elenco azioni. Verifica la connessione e riprova.</string>
+    <string name="todoDeleteErrorMessageNew">Si è verificato un errore durante l\'eliminazione di questa attività da fare. Controllare la connessione e riprovare.</string>
     <string name="createTodoScreenTitle">Nuovo elenco azioni</string>
+    <string name="createTodoScreenTitleNew">Nuovo elenco attività</string>
     <string name="editTodoScreenTitle">Modifica elenco azioni</string>
+    <string name="editTodoScreenTitleNew">Modifica elenco attività</string>
     <string name="createToDoTitleHint">Aggiungi titolo</string>
     <string name="createToDoDateLabel">Data</string>
     <string name="createToDoTimeLabel">Ora</string>
     <string name="createToDoCalendarLabel">Calendario</string>
     <string name="createToDoDetailsLabel">Dettagli</string>
     <string name="todoSaveErrorMessage">Si è verificato un errore durante il salvataggio dell’elenco azioni. Verifica la connessione e riprova.</string>
+    <string name="todoSaveErrorMessageNew">Si è verificato un errore durante il salvataggio di questa attività da fare. Controllare la connessione e riprovare.</string>
     <string name="selectCalendarScreenTitle">Seleziona calendario</string>
     <string name="errorContentRetryButton">Riprova</string>
     <string name="eventLocationLabel">Posizione</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Dettagli</string>
     <string name="errorLoadingEvent">Si è verificato un problema durante il caricamento di questo evento. Verifica la connessione e riprova.</string>
     <string name="errorLoadingTodo">Si è verificato un problema durante il caricamento di queste cosa da fare. Verifica la connessione e riprova.</string>
+    <string name="errorLoadingTodoNew">Si è verificato un problema durante il caricamento di questa attività da fare. Controllare la connessione e riprovare.</string>
     <string name="eventDeleteConfirmationTitle">Eliminare evento?</string>
     <string name="eventDeleteConfirmationText">Questa operazione eliminerà in modo permanente il tuo evento.</string>
     <string name="eventDeleteErrorMessage">Si è verificato un errore di eliminazione di questo elenco. Verifica la connessione e riprova.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Tutti gli eventi</string>
     <string name="eventDeleteScopeFollowing">Questo evento e tutti gli eventi successivi</string>
     <string name="calendarAddToDo">Aggiungi elenco attività</string>
+    <string name="calendarAddToDoNew">Aggiungi attività da fare</string>
     <string name="calendarAddEvent">Aggiungi evento</string>
     <string name="createEventScreenTitle">Nuovo evento</string>
     <string name="editEventScreenTitle">Modifica eventi</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Accedi!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Per vedere la attività da fare, accedi al tuo account nell’app. Ci vorrà un attimo!</string>
     <string name="a11y_widgetToDoOpenToDoList">Schermata Apri attività da fare</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Apri schermata di elenco attività da fare</string>
     <string name="a11y_widgetToDoCreateNewToDo">Crea nuova attività da fare</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Crea nuova attività da fare</string>
     <string name="widgetGradesErrorSubtitle">Abbiamo dei problemi a visualizzare subito i tuoi voti. Riprova tra un attimo o vai all’app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Per vedere i tuoi voti, accedi al tuo account nell’app. Ci vorrà un attimo!</string>
     <string name="widgetSingleGradeErrorSubtitle">Abbiamo dei problemi a visualizzare subito i tuoi voti.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Scegli un corso</string>
     <string name="widgetGradesErrorLoadingCourses">Si è verificato un errore durante il caricamento dei corsi.</string>
     <string name="settingsSwitchExperience">Passa a Canvas Career</string>
+    <string name="forecastWidgetTitle">Riepilogo settimanale</string>
+    <string name="forecastWidgetWeekPeriod">Settimana %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Mancante</string>
+    <string name="forecastWidgetDue">Scadenza</string>
+    <string name="forecastWidgetRecentGrades">Nuovi voti</string>
+    <string name="forecastWidgetGradeWeight">%d%% di voto finale</string>
+    <string name="forecastWidgetErrorMessage">Si sono verificati dei problemi nel caricamento dei compiti. Verifica la connessione e riprova.</string>
+    <string name="forecastWidgetEmptyMissing">Nessun compito mancante. Sei in pari!</string>
+    <string name="forecastWidgetEmptyDue">Nessun compito in scadenza questa settimana.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Nessun voto questa settimana</string>
+    <string name="a11y_contentDescription_previousWeek">Settimana precedente</string>
+    <string name="a11y_contentDescription_nextWeek">Settimana prossima </string>
+
     <string name="speedGraderGradeTabTitle">Voto e Rubrica</string>
     <string name="speedGraderDetailsTabTitle">Dettagli</string>
     <string name="a11y_contentDescription_expandPanel">Espandi pannello</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">SI è verificato un errore durante il caricamento degli elementi cose da fare. Verifica la connessione e riprova.</string>
     <string name="errorUpdatingToDo">SI è verificato un errore durante il caricamento dell’elemento cose da fare. Verifica la connessione e riprova.</string>
     <string name="noToDosForNow">Nessun a cosa da fare per ora!</string>
+    <string name="noToDosForNowNew">Nessun elenco attività per adesso!</string>
     <string name="noToDosForNowSubtext">Sembra un ottimo momento per riposarsi, rilassarsi e ricaricarsi.</string>
     <string name="todoSwipeDone">Fatto</string>
     <string name="todoSwipeUndo">Annulla</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferenze elenco cose da fare</string>
+    <string name="todoFilterPreferencesNew">Preferenze elenco attività da fare</string>
     <string name="todoFilterVisibleItems">Elementi visibili</string>
     <string name="todoFilterShowPersonalToDos">Mostra cose da fare personali</string>
+    <string name="todoFilterShowPersonalToDosNew">Mostra attività personali</string>
     <string name="todoFilterShowCalendarEvents">Mostra eventi calendario</string>
     <string name="todoFilterShowCompleted">Mostra completato</string>
     <string name="todoFilterFavoriteCoursesOnly">Solo corsi preferiti</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Rifiuta invito</string>
     <string name="courseInvitationDeclineConfirmMessage">Vuoi rifiutare l\'invito a %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Avanzamento</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Buongiorno, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Ciao, %s</string>
 
+    <string name="courses_and_groups">Corsi e Gruppi</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personalizza dashboard</string>
     <string name="dashboard_widgets">Widget</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Modifica layout dashboard</string>
     <string name="changing_dashboard_layout_message">Per cambiare il layout della dashboard devi riavviare l’applicazione</string>
     <string name="restart_now">Riavvia adesso</string>
+    <string name="turn_on_new_dashboard">Passa alla nuova dashboard</string>
     <string name="switched_back">Cambiato idea?</string>
     <string name="switched_back_message">Grazie per aver provato la nuova dashboard! Puoi raccontarci perché hai cambiato idea?</string>
+    <string name="survey_option_hard_to_find">Non è facile trovare quello che cerchi</string>
+    <string name="survey_option_prefer_old_layout">Preferisco il layout precedente</string>
+    <string name="survey_option_something_broken">Qualcosa non ha funzionato</string>
     <string name="what_could_we_improve">Cosa possiamo migliorare?</string>
+    <string name="what_do_you_think_of_new_dashboard">Cosa ne pensi della nuova dashboard?</string>
+    <string name="let_us_know">Faccelo sapere!</string>
+    <string name="no_app_to_handle_link">Nessuna app trovata per aprire questo link</string>
     <string name="skip">Ignora</string>
     <string name="widget_setting_show_greeting">Mostra saluto</string>
     <string name="background_color">Colore sfondo</string>
+    <string name="widget_setting_show_grades">Voti corso</string>
+    <string name="widget_setting_show_color_overlay">Sovrapposizione colore corso</string>
     <string name="offline_content_available">Contenuto offline disponibile</string>
     <string name="a11y_contentDescription_moreOptions">Altre opzioni</string>
     <string name="customizeCourse">Personalizza corso</string>
     <string name="favoriteCoursesAndGroups">Corsi e gruppi preferiti</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Gli strumeti esterni non sono disponibili offline.</string>
+    <string name="widget_weekly_summary">Riepilogo settimanale</string>
+
+    <string name="dashboardCourseNickname">Soprannome</string>
+    <string name="dashboardCourseNicknameHint">Scrivi qui il soprannome corso</string>
+    <string name="dashboardCourseColor">Colore corso</string>
+    <string name="widget_toDo">Attività giornaliere</string>
+    <string name="dailyToDoWidgetTitle">Attività giornaliere</string>
+    <string name="todoWidget_showCompleted">Mostra completato</string>
+    <string name="todoWidget_emptyTitle">Hai completato il processo per adesso!</string>
+    <string name="todoWidget_emptyMessage">Sembra che per oggi non ci siano attività.\nVuoi aggiungerne qualcuna?</string>
+    <string name="todoWidget_addTodo">Aggiungi attività da fare</string>
+    <string name="todoWidget_errorTitle">Ops, si è verificato un errore</string>
+    <string name="todoWidget_errorMessage">Impossibile caricare le tue attività.\nRiprova subito oppure più tardi.</string>
+    <string name="todoWidget_refresh">Aggiorna</string>
+    <string name="todoWidget_today">Oggi</string>
+    <string name="a11y_todoWidget_jumpToToday">Passa a oggi</string>
+    <string name="widgetSettings_widgetsColor">Colore principale dashboard</string>
+    <string name="dashboard_globalAnnouncement">Annuncio globale</string>
+    <string name="forecastWidget_currentWeek">Settimana attuale</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-ja/strings.xml b/libs/pandares/src/main/res/values-ja/strings.xml
index e1849046ba..f4a406ac59 100644
--- a/libs/pandares/src/main/res/values-ja/strings.xml
+++ b/libs/pandares/src/main/res/values-ja/strings.xml
@@ -45,6 +45,7 @@
     <string name="submissionStatusFailedTitle">提出に失敗しました</string>
     <string name="submissionStatusFailedSubtitle">タップして詳細を表示する</string>
     <string name="submissionAndRubric">課題提出とルーブリック</string>
+    <string name="submissionAndFeedback">提出＆amp;フィードバック</string>
     <string name="commentsAndRubric">コメント &amp; ルブリック</string>
     <string name="errorLoadingAssignment">この課題の読み込み中、問題がありました。接続を確認して、もう一度お試しください。</string>
     <string name="submitted">タスクの評定を送信</string>
@@ -214,6 +215,7 @@
 
     <!-- Date strings -->
     <string name="today">今日</string>
+    <string name="tomorrow">明日</string>
     <string name="past">過去</string>
     <string name="noDate">日付なし</string>
     <string name="future">未来</string>
@@ -286,6 +288,7 @@
     <string name="monologue">モノローグ</string>
     <string name="noItemsToDisplayShort">表示するアイテムがありません</string>
     <string name="Todo">タスク</string>
+    <string name="TodoNew">するべきこと</string>
     <string name="todoFilter">コースをフィルタする</string>
     <string name="filterByEllipsis">フィルタの基準</string>
     <string name="favoriteCoursesLabel">お気に入りのコース</string>
@@ -463,6 +466,7 @@
     <string name="groups">グループ</string>
     <string name="groupMembers">グループメンバー</string>
 
+    <string name="messageGroup">メッセージグループ</string>
     <string name="loading">&#8230;を読み込み中</string>
     <string name="select_item_to_display">リストから選択</string>
 
@@ -679,9 +683,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">タスク</string>
+    <string name="todoWidgetTitleNew">するべきこと</string>
     <string name="gradesWidgetTitle">評定</string>
     <string name="notificationWidgetTitle">通知</string>
     <string name="todoWidgetTitleLong">Canvas - タスク</string>
+    <string name="todoWidgetTitleLongNew">Canvas - するべきこと</string>
     <string name="gradesWidgetTitleLong">Canvas - 採点</string>
     <string name="gradeWidgetTitleLong">Canvas - 評定</string>
     <string name="notificationWidgetTitleLong">Canvas - 通知</string>
@@ -717,6 +723,8 @@
     <!-- Tablet Strings -->
     <string name="courses">コース</string>
     <string name="toDoList">タスクリスト</string>
+    <string name="toDoListNew">するべきことリスト</string>
+
     <string name="notifications">通知</string>
     <string name="pushNotifications">プッシュ通知</string>
     <string name="pushNotificationsError">プッシュ通知はこのデバイスには登録されていません。</string>
@@ -731,7 +739,6 @@
 
     <string name="launchSpeedgrader">SpeedGraderを開く</string>
 
-    <string name="search_todo">するべきこと するべきこと するべきことリスト</string>
     <string name="search_course">コース コース クラス クラス</string>
     <string name="search_grades">採点 採点</string>
 
@@ -1059,6 +1066,13 @@
     <string name="pageTitleMustBeSet">ページのタイトルを設定しなければなりません。</string>
     <string name="pageDetails">ページ詳細</string>
     <string name="saving">保存</string>
+    <string name="speedGraderSaving">保存</string>
+    <string name="speedGraderSaved">保存済み</string>
+    <string name="speedGraderFailed">失敗</string>
+    <string name="speedGraderSaveErrorTitle">おっと、何か問題が発生しました</string>
+    <string name="speedGraderSaveErrorMessage">評定の修正を保存中にエラーが発生しました。再試行するか、後でまた試しください。</string>
+    <string name="speedGraderSaveErrorContentDescription">評定が保存されました。タップして詳細を表示する。</string>
+
     <string name="confirmDeleteEvent">このイベントを削除してもよろしいですか？</string>
     <string name="conferencesNotSupported">会議はまだモバイルではサポートされていません。</string>
     <string name="filePreviewContentDescription">ファイルプレビュー画像</string>
@@ -1204,6 +1218,10 @@
     <string name="recordings">録画</string>
     <string name="conferenceInProgress">会議進行中</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">会議 (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">会議進行中</string>
+    <string name="conferencesWidgetDismissed">会議終了</string>
     <string name="a11y_criterion_content_description">基準の評価 %s</string>
     <string name="a11y_criterion_description_content_description">%s、%s</string>
     <string name="a11y_criterion_button_click_description">詳細はこちら</string>
@@ -1351,6 +1369,9 @@
     <plurals name="a11y_todoBadgeCount">
         <item quantity="other">%sのするべきこと項目</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="other">%sのするべきこと項目</item>
+    </plurals>
     <string name="noAnnotationSelected">注釈が選択されていません</string>
     <string name="emailNotifications">メール通知</string>
     <string name="emailNotificationsImmediately">ただちに</string>
@@ -1632,7 +1653,9 @@
     <string name="calendarNoEvents">今日イベントはありません！</string>
     <string name="calendarNoEventsDescription">休息をとってリラックスし、充電するためにぴったりな日のようです。</string>
     <string name="userCalendarToDo">タスク</string>
+    <string name="userCalendarToDoNew">するべきこと</string>
     <string name="courseToDo">%s  To Do</string>
+    <string name="courseToDoNew">%s のするべきこと</string>
     <string name="calendarEventExcused">評価対象外(免除)</string>
     <string name="calendarEventMissing">提出なし</string>
     <string name="calendarEventGraded">採点済み</string>
@@ -1657,21 +1680,30 @@
     <string name="a11y_eventCreatedAnnouncement">イベント%sの作成に成功しました。</string>
     <string name="a11y_eventUpdatedAnnouncement">イベント%sが更新されました。</string>
     <string name="a11y_toDoCreatedAnnouncement">ToDo%sが正常に作成されました。</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">するべきこと%sが正常に作成されました。</string>
     <string name="a11y_toDoUpdatedAnnouncement">ToDo%sが正常に更新されました。</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">するべきこと%sが正常に更新されました。</string>
     <string name="todoScreenTitle">タスク</string>
+    <string name="todoScreenTitleNew">するべきこと</string>
     <string name="todoDateLabel">日付</string>
     <string name="todoDescriptionLabel">説明</string>
     <string name="todoDeleteConfirmationTitle">削除しますか？</string>
+    <string name="todoDeleteConfirmationTitleNew">するべきことを削除しますか？</string>
     <string name="todoDeleteConfirmationText">この場合、To Do項目は永久に削除されます。</string>
+    <string name="todoDeleteConfirmationTextNew">この場合、するべきことの項目は永久に削除されます。</string>
     <string name="todoDeleteErrorMessage">この To Do を削除中にエラーが起こりました。接続を確認して、もう一度お試しください。</string>
+    <string name="todoDeleteErrorMessageNew">このするべきことの削除中にエラーが発生しました。接続を確認して、もう一度やり直してください。</string>
     <string name="createTodoScreenTitle">新しい To Do</string>
+    <string name="createTodoScreenTitleNew">新しいするべきこと</string>
     <string name="editTodoScreenTitle">To Do を編集</string>
+    <string name="editTodoScreenTitleNew">するべきこと を編集する</string>
     <string name="createToDoTitleHint">タイトルを追加</string>
     <string name="createToDoDateLabel">日付</string>
     <string name="createToDoTimeLabel">制限時間</string>
     <string name="createToDoCalendarLabel">カレンダー</string>
     <string name="createToDoDetailsLabel">詳細</string>
     <string name="todoSaveErrorMessage">この To Do を保存中にエラーが起こりました。接続を確認して、もう一度お試しください。</string>
+    <string name="todoSaveErrorMessageNew">このするべきことの保存中にエラーが発生しました。接続を確認して、もう一度やり直してください。</string>
     <string name="selectCalendarScreenTitle">予定表を選択する</string>
     <string name="errorContentRetryButton">再試行</string>
     <string name="eventLocationLabel">場所</string>
@@ -1679,6 +1711,7 @@
     <string name="eventDetailsLabel">詳細</string>
     <string name="errorLoadingEvent">このイベントの読み込み中、問題がありました。接続を確認して、もう一度お試しください。</string>
     <string name="errorLoadingTodo">このTodoの読み込み中、問題がありました。接続を確認して、もう一度お試しください。</string>
+    <string name="errorLoadingTodoNew">このするべきことの読み込み中に問題が発生しました。接続を確認して、もう一度やり直してください。</string>
     <string name="eventDeleteConfirmationTitle">イベントを削除しますか？</string>
     <string name="eventDeleteConfirmationText">これにより、イベントは永久に削除されます。</string>
     <string name="eventDeleteErrorMessage">この イベント を削除中にエラーが起こりました。接続を確認して、もう一度お試しください。</string>
@@ -1694,6 +1727,7 @@
     <string name="eventDeleteScopeAll">すべてのイベント</string>
     <string name="eventDeleteScopeFollowing">このイベントと次のすべてのイベント</string>
     <string name="calendarAddToDo">タスクに追加</string>
+    <string name="calendarAddToDoNew">するべきことを追加する</string>
     <string name="calendarAddEvent">イベントの追加</string>
     <string name="createEventScreenTitle">新しいイベント</string>
     <string name="editEventScreenTitle">イベントの編集</string>
@@ -2066,7 +2100,9 @@
     <string name="widgetNotLoggedInTitle">ログインしましょう！</string>
     <string name="widgetToDoNotLoggedInSubtitle">するべきことを表示するには、アプリでアカウントにログインしてください。すぐに完了します！</string>
     <string name="a11y_widgetToDoOpenToDoList">するべきことリスト画面を開く</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">するべきことリスト画面を開く</string>
     <string name="a11y_widgetToDoCreateNewToDo">新しいするべきことを作成する</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">新しいするべきことを作成する</string>
     <string name="widgetGradesErrorSubtitle">現在、評定を表示できません。しばらくしてからもういちどやり直すか、アプリに移動してください。</string>
     <string name="widgetGradesNotLoggedInSubtitle">評定を表示するには、アプリでアカウントにログインしてください。すぐに完了します！</string>
     <string name="widgetSingleGradeErrorSubtitle">現在、評定を表示できません。</string>
@@ -2074,6 +2110,19 @@
     <string name="widgetSingleGradeSelectCourse">コースを選択しましょう</string>
     <string name="widgetGradesErrorLoadingCourses">コースの読み込み中にエラーが発生しました。</string>
     <string name="settingsSwitchExperience">Canvas Career に切り替える</string>
+    <string name="forecastWidgetTitle">週間サマリー</string>
+    <string name="forecastWidgetWeekPeriod">週 %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">欠如</string>
+    <string name="forecastWidgetDue">期限</string>
+    <string name="forecastWidgetRecentGrades">新規評定</string>
+    <string name="forecastWidgetGradeWeight">%d%% 最終的な評定</string>
+    <string name="forecastWidgetErrorMessage">課題の読み込みに問題が発生しました。接続を確認して、もう一度お試しください。</string>
+    <string name="forecastWidgetEmptyMissing">未提出の課題はありませんあなたは深くかかわっています！</string>
+    <string name="forecastWidgetEmptyDue">今週提出期限の課題はありません。 </string>
+    <string name="forecastWidgetEmptyRecentGrades">今週の新しい成績はありません。</string>
+    <string name="a11y_contentDescription_previousWeek">前週</string>
+    <string name="a11y_contentDescription_nextWeek">来週</string>
+
     <string name="speedGraderGradeTabTitle">学年 &amp; ルブリック</string>
     <string name="speedGraderDetailsTabTitle">詳細</string>
     <string name="a11y_contentDescription_expandPanel">パネルを展開する</string>
@@ -2150,6 +2199,7 @@
     <string name="errorLoadingToDos">するべきこと項目のロード中にエラーが発生しました。接続を確認して、もう一度お試しください。</string>
     <string name="errorUpdatingToDo">するべきこと項目の更新中にエラーが発生しました。接続を確認して、もう一度お試しください。</string>
     <string name="noToDosForNow">現在するべきことはありません！</string>
+    <string name="noToDosForNowNew">現在するべきことはありません！</string>
     <string name="noToDosForNowSubtext">少し休んでリラックスして英気を養うのにちょうどいい時間のようです。</string>
     <string name="todoSwipeDone">終了</string>
     <string name="todoSwipeUndo">アンドゥーする</string>
@@ -2160,8 +2210,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">するべきことリスト設定</string>
+    <string name="todoFilterPreferencesNew">するべきことリストの設定</string>
     <string name="todoFilterVisibleItems">表示項目</string>
     <string name="todoFilterShowPersonalToDos">個人のするべきことを表示</string>
+    <string name="todoFilterShowPersonalToDosNew">個人のするべきことを表示</string>
     <string name="todoFilterShowCalendarEvents">カレンダーイベントを表示</string>
     <string name="todoFilterShowCompleted">完了項目を表示</string>
     <string name="todoFilterFavoriteCoursesOnly">お気に入りのコースのみ</string>
@@ -2188,6 +2240,9 @@
     <string name="courseInvitationDeclineConfirmTitle">招待を辞退する</string>
     <string name="courseInvitationDeclineConfirmMessage">%sへの招待を辞退してよろしいですか？</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">進歩</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">おはようございます、%sさん！</string>
@@ -2310,6 +2365,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">こんにちは、%sさん</string>
 
+    <string name="courses_and_groups">コース &amp; グループ</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">ダッシュボードカスタマイズ</string>
     <string name="dashboard_widgets">ウィジェット</string>
@@ -2319,16 +2375,44 @@
     <string name="changing_dashboard_layout">ダッシュボードのレイアウトを変更する</string>
     <string name="changing_dashboard_layout_message">ダッシュボードのレイアウトを変更するには、アプリケーションを再起動する必要があります。</string>
     <string name="restart_now">今すぐ再起動する</string>
+    <string name="turn_on_new_dashboard">新しいダッシュボードをオンにする</string>
     <string name="switched_back">元に戻しましたか？</string>
     <string name="switched_back_message">新しいダッシュボードをお試しいただき、ありがとうございます！元に戻した理由をお聞かせいただけますか？</string>
+    <string name="survey_option_hard_to_find">見つけるのが難しい</string>
+    <string name="survey_option_prefer_old_layout">古いレイアウトのほうがよかった</string>
+    <string name="survey_option_something_broken">なにかがうまくいかなかった</string>
     <string name="what_could_we_improve">改善すべき点は何でしょうか？</string>
+    <string name="what_do_you_think_of_new_dashboard">新しいダッシュボードについてどう思いますか？</string>
+    <string name="let_us_know">お知らせください！</string>
+    <string name="no_app_to_handle_link">このリンクを開くためのアプリがありません</string>
     <string name="skip">スキップ</string>
     <string name="widget_setting_show_greeting">挨拶を表示する</string>
     <string name="background_color">背景色</string>
+    <string name="widget_setting_show_grades">コース評定</string>
+    <string name="widget_setting_show_color_overlay">コースカラーオーバーレイ</string>
     <string name="offline_content_available">オフラインコンテンツが利用可能</string>
     <string name="a11y_contentDescription_moreOptions">その他のオプション</string>
     <string name="customizeCourse">コースをカスタマイズ</string>
     <string name="favoriteCoursesAndGroups">お気に入りのコースとグループ</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">外部のツールは、オフラインでは使用できません。</string>
+    <string name="widget_weekly_summary">週間サマリー</string>
+
+    <string name="dashboardCourseNickname">ニックネーム</string>
+    <string name="dashboardCourseNicknameHint">コースニックネームをここに書く</string>
+    <string name="dashboardCourseColor">コースの色</string>
+    <string name="widget_toDo">毎日のするべきこと</string>
+    <string name="dailyToDoWidgetTitle">毎日のするべきこと</string>
+    <string name="todoWidget_showCompleted">完了項目を表示</string>
+    <string name="todoWidget_emptyTitle">今のところすべて完了です！</string>
+    <string name="todoWidget_emptyMessage">今日は空き時間のようです。\nするべきことを追加しますか？</string>
+    <string name="todoWidget_addTodo">するべきことを追加する</string>
+    <string name="todoWidget_errorTitle">おっと、何か問題が発生しました</string>
+    <string name="todoWidget_errorMessage">するべきことの読み込みができませんでした。\n再試行するか、また後で戻ってきてください。</string>
+    <string name="todoWidget_refresh">更新</string>
+    <string name="todoWidget_today">今日</string>
+    <string name="a11y_todoWidget_jumpToToday">今日にジャンプ</string>
+    <string name="widgetSettings_widgetsColor">ダッシュボードのメインカラー</string>
+    <string name="dashboard_globalAnnouncement">グローバル アナウンスメント</string>
+    <string name="forecastWidget_currentWeek">今週</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-ko/strings.xml b/libs/pandares/src/main/res/values-ko/strings.xml
index 6275e3bd95..71c5f3f6e4 100644
--- a/libs/pandares/src/main/res/values-ko/strings.xml
+++ b/libs/pandares/src/main/res/values-ko/strings.xml
@@ -45,6 +45,7 @@
     <string name="submissionStatusFailedTitle">제출 실패</string>
     <string name="submissionStatusFailedSubtitle">탭하여 세부 정보 보기</string>
     <string name="submissionAndRubric">제출 및 루브릭</string>
+    <string name="submissionAndFeedback">제출 및 피드백</string>
     <string name="commentsAndRubric">댓글 및 루브릭</string>
     <string name="errorLoadingAssignment">이 과제를 로드하는 데 문제가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="submitted">제출됨</string>
@@ -214,6 +215,7 @@
 
     <!-- Date strings -->
     <string name="today">오늘</string>
+    <string name="tomorrow">내일</string>
     <string name="past">과거</string>
     <string name="noDate">날짜 없음</string>
     <string name="future">미래</string>
@@ -273,6 +275,7 @@
     <string name="checkBoxWhatIfGradeOption">가상 점수 표시</string>
     <string name="whatIfDialogText">가상 점수</string>
     <string name="whatIfScoreExceedsMaximum">점수는 최대 점수를 초과할 수 없습니다</string>
+    <string name="whatIfScoreExceedsMaximumWarning">점수가 최대 점수를 초과합니다</string>
     <string name="formattedScoreWithPointsPossibleAndGrade">%1$s/%2$s (%3$s)</string>
     <string name="contentDescriptionScoreWithPointsPossibleAndGrade">%1$s/%2$s점, %3$s</string>
     <string name="inbox">수신함</string>
@@ -285,6 +288,7 @@
     <string name="monologue">독백</string>
     <string name="noItemsToDisplayShort">표시할 항목 없음</string>
     <string name="Todo">할 일</string>
+    <string name="TodoNew">할 일</string>
     <string name="todoFilter">과목 필터링</string>
     <string name="filterByEllipsis">필터링 기준</string>
     <string name="favoriteCoursesLabel">즐겨 찾는 과목</string>
@@ -462,6 +466,7 @@
     <string name="groups">그룹</string>
     <string name="groupMembers">그룹 구성원</string>
 
+    <string name="messageGroup">메시지 그룹</string>
     <string name="loading">로드&#8230;</string>
     <string name="select_item_to_display">목록에서 선택</string>
 
@@ -678,9 +683,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">할 일</string>
+    <string name="todoWidgetTitleNew">할 일</string>
     <string name="gradesWidgetTitle">성적</string>
     <string name="notificationWidgetTitle">알림</string>
     <string name="todoWidgetTitleLong">Canvas - 할 일</string>
+    <string name="todoWidgetTitleLongNew">Canvas - 할 일</string>
     <string name="gradesWidgetTitleLong">Canvas - 성적</string>
     <string name="gradeWidgetTitleLong">Canvas - 성적</string>
     <string name="notificationWidgetTitleLong">Canvas - 알림</string>
@@ -716,6 +723,8 @@
     <!-- Tablet Strings -->
     <string name="courses">과목</string>
     <string name="toDoList">할 일 목록</string>
+    <string name="toDoListNew">할 일 목록</string>
+
     <string name="notifications">알림</string>
     <string name="pushNotifications">푸시 알림</string>
     <string name="pushNotificationsError">이 장치에는 푸시 알림이 등록되지 않았습니다.</string>
@@ -730,7 +739,6 @@
 
     <string name="launchSpeedgrader">SpeedGrader 열기</string>
 
-    <string name="search_todo">할일 할 일 할일 할일 목록</string>
     <string name="search_course">과목 과목 수업 수업</string>
     <string name="search_grades">성적 성적</string>
 
@@ -1059,6 +1067,13 @@
     <string name="pageTitleMustBeSet">페이지 제목을 설정해야 합니다.</string>
     <string name="pageDetails">페이지 세부 정보</string>
     <string name="saving">저장</string>
+    <string name="speedGraderSaving">저장</string>
+    <string name="speedGraderSaved">저장됨</string>
+    <string name="speedGraderFailed">실패</string>
+    <string name="speedGraderSaveErrorTitle">죄송합니다. 문제가 발생했습니다</string>
+    <string name="speedGraderSaveErrorMessage">성적 수정을 저장하는 동안 오류가 있었습니다. 다시 시도하거나 나중에 다시 시도할 수 있습니다.</string>
+    <string name="speedGraderSaveErrorContentDescription">성적을 저장하지 못했습니다. 탭하여 세부 정보를 확인합니다.</string>
+
     <string name="confirmDeleteEvent">이 이벤트를 삭제하시겠습니까?</string>
     <string name="conferencesNotSupported">모바일에서는 아직 컨퍼런스를 지원하지 않습니다.</string>
     <string name="filePreviewContentDescription">파일 미리 보기 이미지</string>
@@ -1202,6 +1217,10 @@
     <string name="recordings">녹화</string>
     <string name="conferenceInProgress">진행 중인 컨퍼런스</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">컨퍼런스(%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">진행 중인 컨퍼런스</string>
+    <string name="conferencesWidgetDismissed">해제된 컨퍼런스</string>
     <string name="a11y_criterion_content_description">조건 등급 %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">자세한 정보</string>
@@ -1357,6 +1376,9 @@
     <plurals name="a11y_todoBadgeCount">
         <item quantity="other">%s 할 일 항목</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="other">%s개 할 일 항목</item>
+    </plurals>
     <string name="noAnnotationSelected">선택된 알림 없음</string>
 
     <string name="emailNotifications">이메일 알림</string>
@@ -1642,7 +1664,9 @@
     <string name="calendarNoEvents">오늘 이벤트가 없습니다.</string>
     <string name="calendarNoEventsDescription">오늘은 편하게 쉬고 활력을 충전하기 좋은 날입니다.</string>
     <string name="userCalendarToDo">할 일</string>
+    <string name="userCalendarToDoNew">할 일</string>
     <string name="courseToDo">%s 할 일</string>
+    <string name="courseToDoNew">%s 할 일</string>
     <string name="calendarEventExcused">인정됨</string>
     <string name="calendarEventMissing">누락됨</string>
     <string name="calendarEventGraded">채점됨</string>
@@ -1667,22 +1691,31 @@
     <string name="a11y_eventCreatedAnnouncement">이벤트 %s을(를) 만들었습니다.</string>
     <string name="a11y_eventUpdatedAnnouncement">이벤트 %s을(를) 업데이트했습니다.</string>
     <string name="a11y_toDoCreatedAnnouncement">할 일 %s을(를) 만들었습니다.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">할 일 %s을(를) 만들었습니다.</string>
     <string name="a11y_toDoUpdatedAnnouncement">할 일 %s을(를) 업데이트했습니다.</string>
 
+    <string name="a11y_toDoUpdatedAnnouncementNew">할 일 %s을(를) 업데이트했습니다.</string>
     <string name="todoScreenTitle">할 일</string>
+    <string name="todoScreenTitleNew">할 일</string>
     <string name="todoDateLabel">날짜</string>
     <string name="todoDescriptionLabel">설명</string>
     <string name="todoDeleteConfirmationTitle">할 일을 삭제하시겠습니까?</string>
+    <string name="todoDeleteConfirmationTitleNew">할 일을 삭제하시겠습니까?</string>
     <string name="todoDeleteConfirmationText">이렇게 하면 할 일 항목이 영구적으로 삭제됩니다.</string>
+    <string name="todoDeleteConfirmationTextNew">이렇게 하면 할 일 항목이 영구적으로 삭제됩니다.</string>
     <string name="todoDeleteErrorMessage">이 할 일 목록을 삭제하는 데 오류가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
+    <string name="todoDeleteErrorMessageNew">이 할 일을 삭제하는 데 오류가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="createTodoScreenTitle">새 할 일</string>
+    <string name="createTodoScreenTitleNew">새 할 일</string>
     <string name="editTodoScreenTitle">할 일 편집</string>
+    <string name="editTodoScreenTitleNew">할 일 편집</string>
     <string name="createToDoTitleHint">제목 추가</string>
     <string name="createToDoDateLabel">날짜</string>
     <string name="createToDoTimeLabel">시간</string>
     <string name="createToDoCalendarLabel">캘린더</string>
     <string name="createToDoDetailsLabel">세부 정보</string>
     <string name="todoSaveErrorMessage">이 할 일 목록을 저장 데 오류가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
+    <string name="todoSaveErrorMessageNew">이 할 일을 저장하는 데 오류가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="selectCalendarScreenTitle">캘린더 선택</string>
 
     <string name="errorContentRetryButton">다시 시도</string>
@@ -1692,6 +1725,7 @@
     <string name="eventDetailsLabel">세부 정보</string>
     <string name="errorLoadingEvent">이 이벤트를 로드하는 데 문제가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="errorLoadingTodo">이 할 일을 로드하는 데 문제가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
+    <string name="errorLoadingTodoNew">이 할 일을 로드하는 데 문제가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="eventDeleteConfirmationTitle">이벤트를 삭제하시겠습니까?</string>
     <string name="eventDeleteConfirmationText">이렇게 하면 이벤트가 영구적으로 삭제됩니다.</string>
     <string name="eventDeleteErrorMessage">이 이벤트를 삭제하는 데 오류가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
@@ -1707,6 +1741,7 @@
     <string name="eventDeleteScopeAll">모든 이벤트</string>
     <string name="eventDeleteScopeFollowing">이것 및 모든 다음 이벤트</string>
     <string name="calendarAddToDo">할 일 추가</string>
+    <string name="calendarAddToDoNew">할 일 추가</string>
     <string name="calendarAddEvent">이벤트 추가</string>
 
     <string name="createEventScreenTitle">새 이벤트</string>
@@ -1905,6 +1940,15 @@
     <string name="courseDetailsMessageContentDescription">이 과목에 대한 메시지 보내기</string>
     <string name="gradeLockedContentDescription">성적이 잠김</string>
     <string name="gradesRefreshFailed">성적을 새로 고치지 못함</string>
+    <string name="showWhatIfScore">가상 점수 표시</string>
+    <string name="editWhatIfScore">가상 점수 편집</string>
+    <string name="editWhatIfScoreTitle">가상 점수 편집</string>
+    <string name="whatIfScoreLabel">가상</string>
+    <string name="whatIfScoreCurrentGraded">점수 %1$.0f/%2$.0f</string>
+    <string name="whatIfScoreCurrentUngraded">채점하지 않음, 최대 점수 %.0f</string>
+    <string name="whatIfScoreDisplay">가상: %s</string>
+    <string name="gradesBasedOnGradedAndWhatIf">채점된 과제에 기반, 및 가상 점수</string>
+    <string name="clearWhatIfScore">가상 점수 지우기</string>
     <string name="chooseACourseToMessage">과목을 선택하여 메시지 보내기</string>
     <string name="regardingHiddenMessage">관련 항목: %1$s, %2$s</string>
     <string name="regardingHiddenMessageWithAssignmentPrefix">관련 항목: %1$s, 과제 - %2$s</string>
@@ -2072,8 +2116,10 @@
     <string name="widgetNotLoggedInTitle">로그인하겠습니다!</string>
     <string name="widgetToDoNotLoggedInSubtitle">할 일을 보려면 앱에서 로그인하세요. 많은 시간이 걸리지 않습니다.</string>
     <string name="a11y_widgetToDoOpenToDoList">할 일 목록 열기 화면</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">할 일 목록 열기 화면</string>
     <string name="a11y_widgetToDoCreateNewToDo">새 할 일 만들기</string>
 
+    <string name="a11y_widgetToDoCreateNewToDoNew">새 할 일 만들기</string>
     <string name="widgetGradesErrorSubtitle">지금은 성적을 표시하는 데 문제가 있습니다. 잠시 후에 다시 시도하거나 앱을 사용하세요.</string>
     <string name="widgetGradesNotLoggedInSubtitle">성적을 보려면 앱에서 로그인하세요. 많은 시간이 걸리지 않습니다.</string>
     <string name="widgetSingleGradeErrorSubtitle">지금은 성적을 표시하는 데 문제가 있습니다.</string>
@@ -2082,6 +2128,19 @@
     <string name="widgetGradesErrorLoadingCourses">과목을 로드하는 데 오류가 발생했습니다.</string>
     <string name="settingsSwitchExperience">Canvas Career로 전환</string>
 
+    <string name="forecastWidgetTitle">주간 요약</string>
+    <string name="forecastWidgetWeekPeriod">주 %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">누락됨</string>
+    <string name="forecastWidgetDue">기한</string>
+    <string name="forecastWidgetRecentGrades">새 점수</string>
+    <string name="forecastWidgetGradeWeight">%d%% 최종 성적</string>
+    <string name="forecastWidgetErrorMessage">과제를 로드하는 데 문제가 있습니다. 연결을 확인하고 다시 시도하세요.</string>
+    <string name="forecastWidgetEmptyMissing">누락된 과제가 없습니다. 모두 확인했습니다!</string>
+    <string name="forecastWidgetEmptyDue">이번 주에 기한인 과제 없음</string>
+    <string name="forecastWidgetEmptyRecentGrades">이번주에는 새 성적이 없습니다.</string>
+    <string name="a11y_contentDescription_previousWeek">이전 주</string>
+    <string name="a11y_contentDescription_nextWeek">다음 주</string>
+
     <string name="speedGraderGradeTabTitle">성적 및 루브릭</string>
     <string name="speedGraderDetailsTabTitle">세부 정보</string>
     <string name="a11y_contentDescription_expandPanel">패널 펼치기</string>
@@ -2157,6 +2216,7 @@
     <string name="errorLoadingToDos">할 일 항목을 로드하는 데 오류가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="errorUpdatingToDo">할 일 항목을 업데이트하는 데 오류가 있었습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="noToDosForNow">지금은 할 일이 없습니다.</string>
+    <string name="noToDosForNowNew">지금은 할 일이 없습니다.</string>
     <string name="noToDosForNowSubtext">오늘은 편하게 쉬고 활력을 충전하기 좋은 날입니다.</string>
     <string name="todoSwipeDone">완료</string>
     <string name="todoSwipeUndo">실행 취소</string>
@@ -2167,8 +2227,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">할 일 목록 기본 설정</string>
+    <string name="todoFilterPreferencesNew">할 일 목록 기본 설정</string>
     <string name="todoFilterVisibleItems">표시되는 항목</string>
     <string name="todoFilterShowPersonalToDos">개인 할 일 표시</string>
+    <string name="todoFilterShowPersonalToDosNew">개인 할 일 표시</string>
     <string name="todoFilterShowCalendarEvents">캘린더 이벤트 표시</string>
     <string name="todoFilterShowCompleted">완료됨 표시</string>
     <string name="todoFilterFavoriteCoursesOnly">즐겨찾기 과목만</string>
@@ -2196,6 +2258,9 @@
     <string name="courseInvitationDeclineConfirmTitle">초대 거절</string>
     <string name="courseInvitationDeclineConfirmMessage">%s에 초대를 거절하시겠습니까?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">진행률</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">안녕하세요 %s 님.</string>
@@ -2319,6 +2384,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">안녕하세요, %s 님</string>
 
+    <string name="courses_and_groups">과목 및 그룹</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">대시보드 사용자 지정</string>
     <string name="dashboard_widgets">위젯</string>
@@ -2328,16 +2394,44 @@
     <string name="changing_dashboard_layout">대시보드 레이아웃 변경</string>
     <string name="changing_dashboard_layout_message">대시보드 레이아웃을 변경하려면 애플리케이션을 다시 시작해야 합니다</string>
     <string name="restart_now">지금 다시 시작</string>
+    <string name="turn_on_new_dashboard">새 대시보드 활성화</string>
     <string name="switched_back">되돌리시겠습니까?</string>
     <string name="switched_back_message">새 대시보드를 시도해 주셔서 감사합니다. 되돌린 이유를 알려주시겠습니까?</string>
+    <string name="survey_option_hard_to_find">항목을 찾기 어려움</string>
+    <string name="survey_option_prefer_old_layout">이전 레이아웃을 선호</string>
+    <string name="survey_option_something_broken">올바로 작동하지 않은 것이 있음</string>
     <string name="what_could_we_improve">저희가 어떻게 개선할 수 있습니까?</string>
+    <string name="what_do_you_think_of_new_dashboard">새 대시보드에 대해 어떻게 생각하십니까?</string>
+    <string name="let_us_know">저희에게 알려주세요!</string>
+    <string name="no_app_to_handle_link">이 링크를 열기에 사용할 수 있는 앱이 없습니다</string>
     <string name="skip">건너뛰기</string>
     <string name="widget_setting_show_greeting">인사 표시</string>
     <string name="background_color">배경 색</string>
+    <string name="widget_setting_show_grades">과목 점수</string>
+    <string name="widget_setting_show_color_overlay">과목 색 오버레이</string>
     <string name="offline_content_available">오프라인 콘텐츠 사용할 수 있음</string>
     <string name="a11y_contentDescription_moreOptions">더 많은 옵션</string>
     <string name="customizeCourse">과목 사용자 지정</string>
     <string name="favoriteCoursesAndGroups">즐겨 찾는 과목 및 그룹</string>
     <string name="collapsibleSectionTitle">%1$s(%2$d)</string>
     <string name="ltiToolsOffline">외부 도구는 오프라인에 사용할 수 없습니다.</string>
+    <string name="widget_weekly_summary">주간 요약</string>
+
+    <string name="dashboardCourseNickname">별칭</string>
+    <string name="dashboardCourseNicknameHint">여기에 과목 별칭 쓰기</string>
+    <string name="dashboardCourseColor">과목 색</string>
+    <string name="widget_toDo">매일 할 일</string>
+    <string name="dailyToDoWidgetTitle">매일 할 일</string>
+    <string name="todoWidget_showCompleted">완료됨 표시</string>
+    <string name="todoWidget_emptyTitle">현재는 모두 완료되었습니다.</string>
+    <string name="todoWidget_emptyMessage">오늘은 할 일이 없는 것 같습니다.\n할 일을 추가하시겠습니까?</string>
+    <string name="todoWidget_addTodo">할 일 추가</string>
+    <string name="todoWidget_errorTitle">죄송합니다. 문제가 발생했습니다</string>
+    <string name="todoWidget_errorMessage">할 일을 로드할 수 없었습니다.\n다시 시도하거나 나중에 돌아오세요.</string>
+    <string name="todoWidget_refresh">새로 고치기</string>
+    <string name="todoWidget_today">오늘</string>
+    <string name="a11y_todoWidget_jumpToToday">오늘로 이동</string>
+    <string name="widgetSettings_widgetsColor">대시보드 주요 색</string>
+    <string name="dashboard_globalAnnouncement">전역 공지</string>
+    <string name="forecastWidget_currentWeek">현재 주</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-mi/strings.xml b/libs/pandares/src/main/res/values-mi/strings.xml
index dc216d3359..b2f85aa021 100644
--- a/libs/pandares/src/main/res/values-mi/strings.xml
+++ b/libs/pandares/src/main/res/values-mi/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">I rahua te tuku o te tāpaetanga</string>
     <string name="submissionStatusFailedSubtitle">Pātō ki te tiro i ngā taipitopito</string>
     <string name="submissionAndRubric">Tāpaetanga &amp;Rubric</string>
+    <string name="submissionAndFeedback">Tukunga me te Urupare</string>
     <string name="commentsAndRubric">Ngā Kōrerorero &amp; Rubric</string>
     <string name="errorLoadingAssignment">He raruraru i te wā e tikiake ana i tēnei whakataunga Tēnā koa tirohia tō hononga ana ka tarai anō</string>
     <string name="submitted">Kua tukuna</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">I tēnei rā tonu</string>
+    <string name="tomorrow">Apopo</string>
     <string name="past">O muri</string>
     <string name="noDate">Kāore he rā</string>
     <string name="future">E heke mai nei</string>
@@ -291,6 +293,7 @@
     <string name="monologue">whai kupu</string>
     <string name="noItemsToDisplayShort">Kaore ngā tūemi hei whakātu</string>
     <string name="Todo">Hei mahi</string>
+    <string name="TodoNew">Mahi-mahi</string>
     <string name="todoFilter">Ngā Akoranga Tātari</string>
     <string name="filterByEllipsis">Tātari ma....</string>
     <string name="favoriteCoursesLabel">Ngā akoranga makau</string>
@@ -474,6 +477,7 @@
     <string name="groups">rōpū</string>
     <string name="groupMembers">mema rōpū</string>
 
+    <string name="messageGroup">Rōpū Karere</string>
     <string name="loading">E tukuake ana&#8230;</string>
     <string name="select_item_to_display">Tīpakohia i te rārangi</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Hei mahi</string>
+    <string name="todoWidgetTitleNew">Mahi-mahi</string>
     <string name="gradesWidgetTitle">Ngā Kōeke</string>
     <string name="notificationWidgetTitle">whakamōhiotanga</string>
     <string name="todoWidgetTitleLong">Canvas – Hei Mahi</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Ngā mahi</string>
     <string name="gradesWidgetTitleLong">Canvas – ngā Kōeke</string>
     <string name="gradeWidgetTitleLong">Canvas - Kōeke</string>
     <string name="notificationWidgetTitleLong">Canvas – ngā whakamōhiotanga</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Ngā Akoranga</string>
     <string name="toDoList">Rārangi Hei Mahi</string>
+    <string name="toDoListNew">Rārangi Mahi</string>
+
     <string name="notifications">whakamōhiotanga</string>
     <string name="pushNotifications">Pana ngā Whakamōhiotanga</string>
     <string name="pushNotificationsError">Kāore i te rēhitahia ngā whakamōhiotanga Pana mo tēnei pūrere.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">tuwhera speedgrader</string>
 
-    <string name="search_todo">hei mahi hei mahi ngā hei mahi hei mahi rārangi</string>
     <string name="search_course">akoranga ngā akoranga akomanga ngā akomanga</string>
     <string name="search_grades">kōeke ngā kōeke</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Me whakatau te taitara o te Whārangi.</string>
     <string name="pageDetails">Taipitopito Whārangi</string>
     <string name="saving">E tiaki ana</string>
+    <string name="speedGraderSaving">E tiaki ana</string>
+    <string name="speedGraderSaved">Kua Ora</string>
+    <string name="speedGraderFailed">I rahua</string>
+    <string name="speedGraderSaveErrorTitle">Āe, i he tetahi mea</string>
+    <string name="speedGraderSaveErrorMessage">I puta he hapa i te wā e tiaki ana i tō whakarerekētanga māka. Ka taea e koe te ngana anō, te ngana anō rānei ā muri ake nei.</string>
+    <string name="speedGraderSaveErrorContentDescription">I rahua te tiaki māka. Pāwhiritia mō ngā taipitopito.</string>
+
     <string name="confirmDeleteEvent">E tino hiahia ana koe ki te muku i tēnei hui?</string>
     <string name="conferencesNotSupported">Kaore i te tautokona ngā huihuinga i runga i te waea.</string>
     <string name="filePreviewContentDescription">Kōnae arokite āhua</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Ngā ōrongongo</string>
     <string name="conferenceInProgress">Huihuinga I roto i te kaunuku</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Ngā Huihuinga (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Huihuinga I roto i te kaunuku</string>
+    <string name="conferencesWidgetDismissed">Kua whakakorea te hui</string>
     <string name="a11y_criterion_content_description">Ngā whakatauranga paearu %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">ētahi atu mōhiohio</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s ki te mahi i te tūemi</item>
         <item quantity="other">%s ki te mahi i ngā tūemi</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s tūemi mahi</item>
+        <item quantity="other">%s ngā mea hei mahi</item>
+    </plurals>
     <string name="noAnnotationSelected">Karekau he tuhipoka i tohua</string>
     <string name="emailNotifications">Ngā Īmēra Whakamōhiotanga</string>
     <string name="emailNotificationsImmediately">Tonu</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Kaore he tauwhāinga i tēnei rā!</string>
     <string name="calendarNoEventsDescription">Ko te āhua nei he rā pai ki te whakatā me te whakahou anō.</string>
     <string name="userCalendarToDo">Hei Mahi</string>
+    <string name="userCalendarToDoNew">Mahi-mahi</string>
     <string name="courseToDo">%s Hei Mahi</string>
+    <string name="courseToDoNew">%s Ngā mahi hei mahi</string>
     <string name="calendarEventExcused">Whakawātea</string>
     <string name="calendarEventMissing">Ngaro</string>
     <string name="calendarEventGraded">Kōekehia</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Takahanga %s i tutuki pai.</string>
     <string name="a11y_eventUpdatedAnnouncement">Takahanga %s i pai te whakahou.</string>
     <string name="a11y_toDoCreatedAnnouncement">Ki te mahi %s i pai te hanga.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Ngā mahi hei mahi %s i hangaia angitu.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Ki te mahi %s i pai te whakahou.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Ngā mahi hei mahi %s kua angitu te whakahōu.</string>
     <string name="todoScreenTitle">Hei Mahi</string>
+    <string name="todoScreenTitleNew">Mahi-mahi</string>
     <string name="todoDateLabel">Rā</string>
     <string name="todoDescriptionLabel">Whakāhuatanga</string>
     <string name="todoDeleteConfirmationTitle">Mukua Hei Mahi?</string>
+    <string name="todoDeleteConfirmationTitleNew">Mukua ngā Mahi-ā-ringa?</string>
     <string name="todoDeleteConfirmationText">Ma tenei ka muku tonu to mea hei Mahi.</string>
+    <string name="todoDeleteConfirmationTextNew">Ka mukua rawatia tō tūemi Mahi.</string>
     <string name="todoDeleteErrorMessage">He hapa i te wā e muku ana i tēnei Hei Whakamahi. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
+    <string name="todoDeleteErrorMessageNew">I puta he hapa i te mukunga o tēnei Mahi-ā-ringa. Tirohia tō hononga, ka ngana anō.</string>
     <string name="createTodoScreenTitle">He Hou Whakamahi</string>
+    <string name="createTodoScreenTitleNew">Ngā Mahi-ā-ringa Hou</string>
     <string name="editTodoScreenTitle">Whakatika Whakamahi</string>
+    <string name="editTodoScreenTitleNew">Whakatikahia ngā Mahi-ā-ringa</string>
     <string name="createToDoTitleHint">Tāpiri taitara</string>
     <string name="createToDoDateLabel">Rā</string>
     <string name="createToDoTimeLabel">Wā</string>
     <string name="createToDoCalendarLabel">Maramataka</string>
     <string name="createToDoDetailsLabel">Nga korero taipitopito</string>
     <string name="todoSaveErrorMessage">He hapa i te wā e tiaki ana i tenei Hei Whakamahi. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
+    <string name="todoSaveErrorMessageNew">I puta he hapa i te wā e tiaki ana i tēnei Mahi-ā-ringa. Tirohia tō hononga, ka ngana anō.</string>
     <string name="selectCalendarScreenTitle">Tīpakohia Maramataka</string>
     <string name="errorContentRetryButton">Ngana anō</string>
     <string name="eventLocationLabel">Wāhi</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Nga korero taipitopito</string>
     <string name="errorLoadingEvent">I raru te uta i tenei takahanga. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
     <string name="errorLoadingTodo">I raru te uta i tenei mahi. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
+    <string name="errorLoadingTodoNew">I puta he raruraru i te utaina o tēnei mahi-ā-ringa. Tirohia tō hononga, ka ngana anō.</string>
     <string name="eventDeleteConfirmationTitle">Mukua Takahanga?</string>
     <string name="eventDeleteConfirmationText">Ma tenei ka muku tonu to kaupapa.</string>
     <string name="eventDeleteErrorMessage">I hapa te muku i tenei takahanga. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Nga huihuinga katoa</string>
     <string name="eventDeleteScopeFollowing">Ko tenei me nga huihuinga katoa e whai ake nei</string>
     <string name="calendarAddToDo">Tāpiri Hei Mahi</string>
+    <string name="calendarAddToDoNew">Tāpiri Mahi</string>
     <string name="calendarAddEvent">Tāpiri Takahanga</string>
     <string name="createEventScreenTitle">Tauwhāinga Hōu</string>
     <string name="editEventScreenTitle">Tauwhāinga Whakatika</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Kia Takiuru koe!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Hei kite i o mahi, tena koa takiuru ki to putea i roto i te taupānga. He wa poto noa iho!</string>
     <string name="a11y_widgetToDoOpenToDoList">Whakatuwherahia te mata rarangi Mahi</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Whakatuwheratia te mata o te rārangi mahi</string>
     <string name="a11y_widgetToDoCreateNewToDo">Waihanga hou Hei Mahi</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Waihangahia he mahi hou</string>
     <string name="widgetGradesErrorSubtitle">Kei te raru matou ki te whakaatu i o tohu i naianei. Tena koa ngana ano mo te wa poto, haere ranei ki te taupānga.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Hei kite i o tohu, tena koa takiuru ki to putea i roto i te taupānga. He wa poto noa iho!</string>
     <string name="widgetSingleGradeErrorSubtitle">Kei te raru matou ki te whakaatu i o tohu i naianei.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Me whiriwhiri he akoranga</string>
     <string name="widgetGradesErrorLoadingCourses">I puta he hapa i te wa e uta ana i nga akoranga.</string>
     <string name="settingsSwitchExperience">Hurihia ki te Canvas Mahi</string>
+    <string name="forecastWidgetTitle">Whakarāpopototanga ā-Wiki</string>
+    <string name="forecastWidgetWeekPeriod">Wiki %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Ngaro</string>
+    <string name="forecastWidgetDue">E tika ana</string>
+    <string name="forecastWidgetRecentGrades">Ngā Tohu Hou</string>
+    <string name="forecastWidgetGradeWeight">%d%% o te māka whakamutunga</string>
+    <string name="forecastWidgetErrorMessage">Kei te raru mātou ki te uta i ō mahi. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
+    <string name="forecastWidgetEmptyMissing">Kāore he mahi e ngaro ana. Kua mau katoa koe</string>
+    <string name="forecastWidgetEmptyDue">Kāore he mahi e tika ana kia tukuna i tēnei wiki.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Kāore he māka hou i tēnei wiki.</string>
+    <string name="a11y_contentDescription_previousWeek">Wiki o mua</string>
+    <string name="a11y_contentDescription_nextWeek">Te wiki e tū mai nei</string>
+
     <string name="speedGraderGradeTabTitle">Kōeke &amp; Rubric</string>
     <string name="speedGraderDetailsTabTitle">Nga korero taipitopito</string>
     <string name="a11y_contentDescription_expandPanel">Roha te röpü</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">I hapa i te utaina o nga mea hei mahi. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
     <string name="errorUpdatingToDo">I hapa te whakahōu i te tūemi hei mahi. Tēnā koa tirohia tō hononga ana ka tarai anō.</string>
     <string name="noToDosForNow">Kaore he mahi mo tenei wa!</string>
+    <string name="noToDosForNowNew">Kāore he Mahi-ā-ringa i tēnei wā!</string>
     <string name="noToDosForNowSubtext">He wā pai tēnei ki te okioki, ki te wātea, me te whakahou i te tinana.</string>
     <string name="todoSwipeDone">Kua mahia</string>
     <string name="todoSwipeUndo">Wete</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Ngā Manakohanga o te Rārangi Mahi</string>
+    <string name="todoFilterPreferencesNew">Ngā Manakohanga o te Rārangi Mahi</string>
     <string name="todoFilterVisibleItems">Ngā Tuemi e Kitea Ana</string>
     <string name="todoFilterShowPersonalToDos">Whakaatuhia ngā Mahi Whaiaro</string>
+    <string name="todoFilterShowPersonalToDosNew">Whakaatuhia ngā Mahi Whaiaro</string>
     <string name="todoFilterShowCalendarEvents">Whakaatuhia ngā Takahanga Maramataka</string>
     <string name="todoFilterShowCompleted">Whakaatuhia ngā Mea Kua Oti</string>
     <string name="todoFilterFavoriteCoursesOnly">Ngā Akoranga Tino Pai Anake</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Whakakore i te Pōwhiri</string>
     <string name="courseInvitationDeclineConfirmMessage">Kei te tino hiahia koe ki te whakakore i te pōwhiri ki %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Ahu Whakamua</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Mōrena, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Kia ora, %s</string>
 
+    <string name="courses_and_groups">Ngā Akoranga me ngā Rōpū</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Whakaritea te Papatohu</string>
     <string name="dashboard_widgets">Ngā taputapu</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Kei te huri i te tahora o te papaaho</string>
     <string name="changing_dashboard_layout_message">Hei huri i te tahora o te papaaho me tīmata anō te tono</string>
     <string name="restart_now">Tīmata anō inaianei</string>
+    <string name="turn_on_new_dashboard">Whakakāhia te papaaho hou</string>
     <string name="switched_back">Kua hoki anō?</string>
     <string name="switched_back_message">Ngā mihi mō te whakamātau i te papaaho hou! Ka taea e koe te kōrero mai he aha koe i hoki anō ai?</string>
+    <string name="survey_option_hard_to_find">Ngā mea uaua ki te kimi</string>
+    <string name="survey_option_prefer_old_layout">He pai ake te tahora tawhito</string>
+    <string name="survey_option_something_broken">Kāore i tika te mahi a tetahi mea</string>
     <string name="what_could_we_improve">He aha tā mātou e taea te whakapai ake?</string>
+    <string name="what_do_you_think_of_new_dashboard">He aha ō whakaaro mō te papatohu hou?</string>
+    <string name="let_us_know">Mōhio mai!</string>
+    <string name="no_app_to_handle_link">Kāore he taupānga e wātea ana hei whakatuwhera i tēnei hononga</string>
     <string name="skip">Tīpoka</string>
     <string name="widget_setting_show_greeting">Whakaatu mihi</string>
     <string name="background_color">Tae papamuri</string>
+    <string name="widget_setting_show_grades">Ngā Kōeke Akoranga</string>
+    <string name="widget_setting_show_color_overlay">Paparua Tae Akoranga</string>
     <string name="offline_content_available">Kei te wātea ngā ihirangi tuimotu</string>
     <string name="a11y_contentDescription_moreOptions">Kōwhiringa atu</string>
     <string name="customizeCourse">Whakarite akoranga</string>
     <string name="favoriteCoursesAndGroups">Ngā Akoranga me ngā Rōpū Tino Pai</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Kāore ngā Utauta o Waho e wātea ana tuimotu.</string>
+    <string name="widget_weekly_summary">Whakarāpopototanga o te Wiki</string>
+
+    <string name="dashboardCourseNickname">Ingoakāinga</string>
+    <string name="dashboardCourseNicknameHint">Tuhia te ingoa o te akoranga ki konei</string>
+    <string name="dashboardCourseColor">Akoranga tae</string>
+    <string name="widget_toDo">Ngā Mahi o ia Rā</string>
+    <string name="dailyToDoWidgetTitle">Ngā Mahi o ia Rā</string>
+    <string name="todoWidget_showCompleted">Whakaatuhia ngā Mea Kua Oti</string>
+    <string name="todoWidget_emptyTitle">Kua oti katoa i a koe i nāianei!</string>
+    <string name="todoWidget_emptyMessage">Te āhua nei kua wātea koe mō tēnei rā.\nKei te hiahia koe ki te tāpiri i ētahi Mahi-ā-ringa?</string>
+    <string name="todoWidget_addTodo">Tāpiri Mahi</string>
+    <string name="todoWidget_errorTitle">Āe, i he tetahi mea</string>
+    <string name="todoWidget_errorMessage">Kāore i taea e mātou te uta i ō Mahi.\nNgāna anō, hoki mai anō ā muri ake nei.</string>
+    <string name="todoWidget_refresh">Whakahouhia</string>
+    <string name="todoWidget_today">I tēnei rā tonu</string>
+    <string name="a11y_todoWidget_jumpToToday">Peke atu ki tēnei rā</string>
+    <string name="widgetSettings_widgetsColor">Tae Matua o te Papaaho</string>
+    <string name="dashboard_globalAnnouncement">Panuitanga o te Ao</string>
+    <string name="forecastWidget_currentWeek">Te wiki o nāianei</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-ms/strings.xml b/libs/pandares/src/main/res/values-ms/strings.xml
index a203d25f27..aebd6ae37c 100644
--- a/libs/pandares/src/main/res/values-ms/strings.xml
+++ b/libs/pandares/src/main/res/values-ms/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Serahan Gagal</string>
     <string name="submissionStatusFailedSubtitle">Ketik untuk melihat butiran</string>
     <string name="submissionAndRubric">Serahan &amp; Rubrik</string>
+    <string name="submissionAndFeedback">Serahan &amp; Maklum Balas</string>
     <string name="commentsAndRubric">Komen &amp; Rubrik</string>
     <string name="errorLoadingAssignment">Terdapat masalah untuk memuatkan tugasan ini. Sila semak sambungan anda dan cuba semula.</string>
     <string name="submitted">Diserahkan</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Hari Ini</string>
+    <string name="tomorrow">Esok</string>
     <string name="past">Lepas</string>
     <string name="noDate">Tiada Tarikh</string>
     <string name="future">Akan Datang</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Tiada item untuk dipaparkan</string>
     <string name="Todo">Untuk Dilakukan</string>
+    <string name="TodoNew">Untuk Dilakukan</string>
     <string name="todoFilter">Tapis Kursus</string>
     <string name="filterByEllipsis">Tapis mengikut...</string>
     <string name="favoriteCoursesLabel">Kursus Kegemaran</string>
@@ -474,6 +477,7 @@
     <string name="groups">Kumpulan</string>
     <string name="groupMembers">Ahli Kumpulan</string>
 
+    <string name="messageGroup">Mesej kumpulan</string>
     <string name="loading">Memuatkan&#8230;</string>
     <string name="select_item_to_display">Pilih daripada senarai</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Untuk Dilakukan</string>
+    <string name="todoWidgetTitleNew">Untuk Dilakukan</string>
     <string name="gradesWidgetTitle">Gred</string>
     <string name="notificationWidgetTitle">Pemberitahuan</string>
     <string name="todoWidgetTitleLong">Canvas - Untuk Dilakukan</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Untuk Dilakukan</string>
     <string name="gradesWidgetTitleLong">Canvas - Gred</string>
     <string name="gradeWidgetTitleLong">Canvas - Gred</string>
     <string name="notificationWidgetTitleLong">Canvas - Pemberitahuan</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kursus</string>
     <string name="toDoList">Senarai Untuk Dilakukan</string>
+    <string name="toDoListNew">Senarai Untuk Dilakukan</string>
+
     <string name="notifications">Pemberitahuan</string>
     <string name="pushNotifications">Pemberitahuan Tolak</string>
     <string name="pushNotificationsError">Pemberitahuan Tolak belum didaftarkan untuk peranti ini.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Buka SpeedGrader</string>
 
-    <string name="search_todo">untukdilakukan untuk dilakukan senarai untukdilakukan</string>
     <string name="search_course">kursus kursus kelas kelas</string>
     <string name="search_grades">gred gred</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Tajuk halaman mesti ditetapkan.</string>
     <string name="pageDetails">Butiran Halaman</string>
     <string name="saving">Menyimpan</string>
+    <string name="speedGraderSaving">Menyimpan</string>
+    <string name="speedGraderSaved">Disimpan</string>
+    <string name="speedGraderFailed">Gagal</string>
+    <string name="speedGraderSaveErrorTitle">Ops sesuatu tidak kena</string>
+    <string name="speedGraderSaveErrorMessage">Terdapat ralat semasa menyimpan pengubahsuaian gred anda. Anda boleh cuba semula, atau cuba semula kemudian.</string>
+    <string name="speedGraderSaveErrorContentDescription">Penyimpanan gred gagal. Ketik untuk butiran.</string>
+
     <string name="confirmDeleteEvent">Adakah anda pasti anda ingin memadamkan acara ini?</string>
     <string name="conferencesNotSupported">Persidangan belum disokong pada peranti mudah alih.</string>
     <string name="filePreviewContentDescription">Imej pratonton fail</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Rakaman</string>
     <string name="conferenceInProgress">Persidangan Sedang Berjalan</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Persidangan (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Persidangan Sedang Berjalan</string>
+    <string name="conferencesWidgetDismissed">Persidangan ditolak</string>
     <string name="a11y_criterion_content_description">Penarafan kriteria %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">lebih banyak maklumat</string>
@@ -1381,6 +1399,10 @@
         <item quantity="one">%s item untuk dilakukan</item>
         <item quantity="other">%s item untuk dilakukan</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s item untuk dilakukan</item>
+        <item quantity="other">%s item untuk dilakukan</item>
+    </plurals>
     <string name="noAnnotationSelected">Tiada anotasi dipilih</string>
     <string name="emailNotifications">Pemberitahuan E-mel</string>
     <string name="emailNotificationsImmediately">Dengan Segera</string>
@@ -1667,7 +1689,9 @@
     <string name="calendarNoEvents">Tiada Acara Hari Ini!</string>
     <string name="calendarNoEventsDescription">Nampaknya ini hari yang baik untuk berehat, bersantai dan merawat diri.</string>
     <string name="userCalendarToDo">Untuk Dilakukan</string>
+    <string name="userCalendarToDoNew">Untuk Dilakukan</string>
     <string name="courseToDo">Senarai Untuk Dilakukan bagi %s</string>
+    <string name="courseToDoNew">%s Untuk Dilakukan</string>
     <string name="calendarEventExcused">Dimaafkan</string>
     <string name="calendarEventMissing">Tiada</string>
     <string name="calendarEventGraded">Digredkan</string>
@@ -1692,21 +1716,30 @@
     <string name="a11y_eventCreatedAnnouncement">Acara %s berjaya dicipta.</string>
     <string name="a11y_eventUpdatedAnnouncement">Acara %s berjaya dikemas kini.</string>
     <string name="a11y_toDoCreatedAnnouncement">Untuk dilakukan %s berjaya dicipta.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Untuk dilakukan %s berjaya dicipta.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Untuk dilakukan %s berjaya dikemas kini.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Untuk dilakukan %s berjaya dikemas kini.</string>
     <string name="todoScreenTitle">Untuk Dilakukan</string>
+    <string name="todoScreenTitleNew">Untuk Dilakukan</string>
     <string name="todoDateLabel">Tarikh</string>
     <string name="todoDescriptionLabel">Penerangan</string>
     <string name="todoDeleteConfirmationTitle">Padam Untuk Dilakukan?</string>
+    <string name="todoDeleteConfirmationTitleNew">Padam Untuk Dilakukan?</string>
     <string name="todoDeleteConfirmationText">Tindakan ini akan memadamkan Untuk Dilakukan anda secara kekal.</string>
+    <string name="todoDeleteConfirmationTextNew">Ini akan memadamkan item Untuk Dilakukan anda secara kekal.</string>
     <string name="todoDeleteErrorMessage">Terdapat ralat untuk memadamkan senarai Untuk Dilakukan ini. Sila semak sambungan anda dan cuba semula.</string>
+    <string name="todoDeleteErrorMessageNew">Terdapat ralat memadamkan item Untuk Dilakukan ini. Sila semak sambungan anda dan cuba semula.</string>
     <string name="createTodoScreenTitle">Senarai Untuk Dilakukan Baharu</string>
+    <string name="createTodoScreenTitleNew">Item Untuk Dilakukan Baharu</string>
     <string name="editTodoScreenTitle">Edit Senarai Untuk Dilakukan</string>
+    <string name="editTodoScreenTitleNew">Edit Untuk Dilakukan?</string>
     <string name="createToDoTitleHint">Tambah tajuk</string>
     <string name="createToDoDateLabel">Tarikh</string>
     <string name="createToDoTimeLabel">Masa</string>
     <string name="createToDoCalendarLabel">Kalendar</string>
     <string name="createToDoDetailsLabel">Butiran</string>
     <string name="todoSaveErrorMessage">Terdapat ralat untuk menyimpan senarai Untuk Dilakukan ini. Sila semak sambungan anda dan cuba semula.</string>
+    <string name="todoSaveErrorMessageNew">Terdapat ralat menyimpan item Untuk Dilakukan ini. Sila semak sambungan anda dan cuba semula.</string>
     <string name="selectCalendarScreenTitle">Pilih Kalendar</string>
     <string name="errorContentRetryButton">Cuba semula</string>
     <string name="eventLocationLabel">Lokasi</string>
@@ -1714,6 +1747,7 @@
     <string name="eventDetailsLabel">Butiran</string>
     <string name="errorLoadingEvent">Terdapat masalah memuatkan acara ini. Sila semak sambungan anda dan cuba semula.</string>
     <string name="errorLoadingTodo">Terdapat masalah memuatkan item untuk dilakukan ini. Sila semak sambungan anda dan cuba semula.</string>
+    <string name="errorLoadingTodoNew">Terdapat masalah memuatkan item untuk dilakukan ini. Sila semak sambungan anda dan cuba semula.</string>
     <string name="eventDeleteConfirmationTitle">Padam Acara?</string>
     <string name="eventDeleteConfirmationText">Tindakan ini akan memadamkan acara anda secara kekal.</string>
     <string name="eventDeleteErrorMessage">Terdapat ralat untuk memadamkan acara ini. Sila semak sambungan anda dan cuba semula.</string>
@@ -1730,6 +1764,7 @@
     <string name="eventDeleteScopeAll">Semua acara</string>
     <string name="eventDeleteScopeFollowing">Ini dan semua acara berikut</string>
     <string name="calendarAddToDo">Tambah Untuk Dilakukan</string>
+    <string name="calendarAddToDoNew">Tambah Untuk Dilakukan</string>
     <string name="calendarAddEvent">Tambah Acara</string>
     <string name="createEventScreenTitle">Acara Baharu</string>
     <string name="editEventScreenTitle">Edit Acara</string>
@@ -2108,7 +2143,9 @@
     <string name="widgetNotLoggedInTitle">Jom Log Masuk!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Untuk melihat perkara untuk dilakukan, sila log masuk ke akaun anda dalam aplikasi. Hanya beberapa saat sahaja!</string>
     <string name="a11y_widgetToDoOpenToDoList">Buka skrin senarai untuk dilakukan</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Buka skrin senarai Untuk Dilakukan</string>
     <string name="a11y_widgetToDoCreateNewToDo">Cipta perkara Untuk Dilakukan baharu</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Cipta senarai Untuk Dilakukan baharu</string>
     <string name="widgetGradesErrorSubtitle">Kami menghadapi masalah untuk menunjukkan gred anda sekarang. Sila cuba semula sebentar lagi atau terus menuju ke aplikasi.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Untuk melihat gred anda, sila log masuk ke akaun anda di aplikasi. Hanya beberapa saat sahaja!</string>
     <string name="widgetSingleGradeErrorSubtitle">Kami menghadapi masalah untuk menunjukkan gred anda sekarang.</string>
@@ -2116,6 +2153,19 @@
     <string name="widgetSingleGradeSelectCourse">Mari pilih kursus</string>
     <string name="widgetGradesErrorLoadingCourses">Ralat berlaku semasa memuatkan kursus.</string>
     <string name="settingsSwitchExperience">Tukar kepada Canvas Career</string>
+    <string name="forecastWidgetTitle">Ringkasan Mingguan</string>
+    <string name="forecastWidgetWeekPeriod">Minggu %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Tiada</string>
+    <string name="forecastWidgetDue">Cukup tempoh</string>
+    <string name="forecastWidgetRecentGrades">Gred Baharu</string>
+    <string name="forecastWidgetGradeWeight">%d%% daripada gred akhir</string>
+    <string name="forecastWidgetErrorMessage">Kami menghadapi masalah untuk memuatkan tugasan anda. Sila semak sambungan anda dan cuba semula.</string>
+    <string name="forecastWidgetEmptyMissing">Tiada tugasan yang tiada. Anda telah mengetahui semua maklumat terkini!</string>
+    <string name="forecastWidgetEmptyDue">Tiada tugasan perlu siap minggu ini.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Tiada gred baharu dalam minggu ini.</string>
+    <string name="a11y_contentDescription_previousWeek">Minggu sebelumnya</string>
+    <string name="a11y_contentDescription_nextWeek">Minggu seterusnya</string>
+
     <string name="speedGraderGradeTabTitle">Gred &amp; Rubrik</string>
     <string name="speedGraderDetailsTabTitle">Butiran</string>
     <string name="a11y_contentDescription_expandPanel">Kembangkan panel</string>
@@ -2194,6 +2244,7 @@
     <string name="errorLoadingToDos">Terdapat ralat memuatkan item untuk dilakukan anda. Sila semak sambungan anda dan cuba semula.</string>
     <string name="errorUpdatingToDo">Terdapat ralat mengemas kini item untuk dilakukan anda. Sila semak sambungan anda dan cuba semula.</string>
     <string name="noToDosForNow">Tiada Untuk Dilakukan sekarang!</string>
+    <string name="noToDosForNowNew">Tiada item Untuk Dilakukan sekarang!</string>
     <string name="noToDosForNowSubtext">Nampaknya ini masa yang tepat untuk berehat, bersantai dan kembali segar.</string>
     <string name="todoSwipeDone">Siap</string>
     <string name="todoSwipeUndo">Buat asal</string>
@@ -2204,8 +2255,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Keutamaan senarai Untuk Dilakukan</string>
+    <string name="todoFilterPreferencesNew">Keutamaan senarai Untuk Dilakukan</string>
     <string name="todoFilterVisibleItems">Item Boleh Lihat</string>
     <string name="todoFilterShowPersonalToDos">Tunjukkan Untuk Dilakukan Peribadi</string>
+    <string name="todoFilterShowPersonalToDosNew">Tunjukkan Item Untuk Dilakukan Peribadi</string>
     <string name="todoFilterShowCalendarEvents">Tunjukkan Acara Kalendar</string>
     <string name="todoFilterShowCompleted">Tunjukkan Selesai</string>
     <string name="todoFilterFavoriteCoursesOnly">Kursus Kegemaran Sahaja</string>
@@ -2232,6 +2285,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Tolak Jemputan</string>
     <string name="courseInvitationDeclineConfirmMessage">Adakah anda pasti anda ingin menolak jemputan ke %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Kemajuan</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Selamat pagi, %s!</string>
@@ -2354,6 +2410,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Helo, %s</string>
 
+    <string name="courses_and_groups">Kursus &amp; Kumpulan</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Sesuaikan Papan Pemuka</string>
     <string name="dashboard_widgets">Widget</string>
@@ -2363,16 +2420,44 @@
     <string name="changing_dashboard_layout">Menukar tataletak papan pemuka</string>
     <string name="changing_dashboard_layout_message">Untuk menukar tataletak papan pemuka anda perlu memulakan semula aplikasi</string>
     <string name="restart_now">Mulakan semula sekarang</string>
+    <string name="turn_on_new_dashboard">Hidupkan papan pemuka baharu</string>
     <string name="switched_back">Menukar kembali?</string>
     <string name="switched_back_message">Terima kasih kerana mencuba papan pemuka baharu! Bolehkah anda memberitahu kami kenapa anda menukarnya kembali?</string>
+    <string name="survey_option_hard_to_find">Sukar mencari perkara dikehendaki</string>
+    <string name="survey_option_prefer_old_layout">Lebih suka tataletak lama</string>
+    <string name="survey_option_something_broken">Sesuatu tidak berfungsi dengan betul</string>
     <string name="what_could_we_improve">Apakah yang boleh kami tambah baik?</string>
+    <string name="what_do_you_think_of_new_dashboard">Apakah pendapat anda tentang papan pemuka baharu?</string>
+    <string name="let_us_know">Maklumkan kami!</string>
+    <string name="no_app_to_handle_link">Tiada aplikasi tersedia untuk membuka pautan ini</string>
     <string name="skip">Langkau</string>
     <string name="widget_setting_show_greeting">Tunjuk sapaan</string>
     <string name="background_color">Warna latar belakang</string>
+    <string name="widget_setting_show_grades">Gred Kursus</string>
+    <string name="widget_setting_show_color_overlay">Tindanan Warna Kursus</string>
     <string name="offline_content_available">Kandungan luar talian tersedia</string>
     <string name="a11y_contentDescription_moreOptions">Lebih banyak pilihan</string>
     <string name="customizeCourse">Sesuaikan Kursus</string>
     <string name="favoriteCoursesAndGroups">Kursus dan Kumpulan Kegemaran</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Alat Luaran tidak tersedia di luar talian.</string>
+    <string name="widget_weekly_summary">Ringkasan Mingguan</string>
+
+    <string name="dashboardCourseNickname">Nama panggilan</string>
+    <string name="dashboardCourseNicknameHint">Tulis nama panggilan kursus di sini</string>
+    <string name="dashboardCourseColor">Warna Kursus</string>
+    <string name="widget_toDo">Untuk Dilakukan Setiap Hari</string>
+    <string name="dailyToDoWidgetTitle">Untuk Dilakukan Setiap Hari</string>
+    <string name="todoWidget_showCompleted">Tunjukkan Selesai</string>
+    <string name="todoWidget_emptyTitle">Anda sudah siap buat masa ini!</string>
+    <string name="todoWidget_emptyMessage">Nampaknya anda lapang untuk perkara ini hari ini.\nAdakah anda ingin menambahkan beberapa perkara Untuk Dilakukan?</string>
+    <string name="todoWidget_addTodo">Tambah Untuk Dilakukan</string>
+    <string name="todoWidget_errorTitle">Ops, sesuatu tidak kena</string>
+    <string name="todoWidget_errorMessage">Kami tidak dapat memuatkan perkara Untuk Dilakukan.\nCuba lagi atau kembali kemudian.</string>
+    <string name="todoWidget_refresh">Segar semula</string>
+    <string name="todoWidget_today">Hari Ini</string>
+    <string name="a11y_todoWidget_jumpToToday">Terus ke hari ini</string>
+    <string name="widgetSettings_widgetsColor">Warna Utama Papan Pemuka</string>
+    <string name="dashboard_globalAnnouncement">Pengumuman Keseluruhan</string>
+    <string name="forecastWidget_currentWeek">Minggu semasa</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-nb/strings.xml b/libs/pandares/src/main/res/values-nb/strings.xml
index 819769887f..3396127371 100644
--- a/libs/pandares/src/main/res/values-nb/strings.xml
+++ b/libs/pandares/src/main/res/values-nb/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Innlevering feilet</string>
     <string name="submissionStatusFailedSubtitle">Trykk for å vise detaljer</string>
     <string name="submissionAndRubric">Innlevering &amp; Vurderingsveiledning</string>
+    <string name="submissionAndFeedback">Innlevering og tilbakemelding</string>
     <string name="commentsAndRubric">Kommentarer &amp; vurderingsveiledninger</string>
     <string name="errorLoadingAssignment">Det var et problem med lasting av denne oppgaven. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="submitted">Innlevert</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">I dag</string>
+    <string name="tomorrow">I morgen</string>
     <string name="past">Tidligere</string>
     <string name="noDate">Ingen dato</string>
     <string name="future">Fremtidige</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Ingenting å vise</string>
     <string name="Todo">Å gjøre</string>
+    <string name="TodoNew">Gjøremål</string>
     <string name="todoFilter">Filtrer emner</string>
     <string name="filterByEllipsis">Filtrer etter &#8230;</string>
     <string name="favoriteCoursesLabel">Favorittemner</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupper</string>
     <string name="groupMembers">Gruppemedlemmer</string>
 
+    <string name="messageGroup">Send melding til gruppe</string>
     <string name="loading">Loading&#8230;</string>
     <string name="select_item_to_display">Velg fra listen</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Å gjøre</string>
+    <string name="todoWidgetTitleNew">Gjøremål</string>
     <string name="gradesWidgetTitle">Vurderinger</string>
     <string name="notificationWidgetTitle">Varslinger</string>
     <string name="todoWidgetTitleLong">Canvas - Gjøremål</string>
+    <string name="todoWidgetTitleLongNew">Canvas – Gjøremål</string>
     <string name="gradesWidgetTitleLong">Canvas - klasser</string>
     <string name="gradeWidgetTitleLong">Canvas – vurdering</string>
     <string name="notificationWidgetTitleLong">Canvas - varsler</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Emner</string>
     <string name="toDoList">Gjøremålsliste</string>
+    <string name="toDoListNew">Gjøremålsliste</string>
+
     <string name="notifications">Varslinger</string>
     <string name="pushNotifications">Push-varslinger</string>
     <string name="pushNotificationsError">Push-varslinger har ikke blitt registrert for denne enheten.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Åpne Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">emne emner klasse klasser</string>
     <string name="search_grades">Vurder vurderinger</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Sidetittel må være satt.</string>
     <string name="pageDetails">Sidedetaljer</string>
     <string name="saving">Lagrer</string>
+    <string name="speedGraderSaving">Lagrer</string>
+    <string name="speedGraderSaved">Lagret</string>
+    <string name="speedGraderFailed">Ikke bestått</string>
+    <string name="speedGraderSaveErrorTitle">Obs, noe gikk galt</string>
+    <string name="speedGraderSaveErrorMessage">Det oppsto en feil ved lagring av vurderingsendringen din Du kan prøve igjen, eller prøve senere.</string>
+    <string name="speedGraderSaveErrorContentDescription">Lagring av vurderingen mislyktes. Trykk for detaljer.</string>
+
     <string name="confirmDeleteEvent">Er du sikker du ønsker å slette denne hendelsen?</string>
     <string name="conferencesNotSupported">Videomøter støttes ikke på mobil.</string>
     <string name="filePreviewContentDescription">Forhåndsvisning av filen</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Opptak</string>
     <string name="conferenceInProgress">Videomøte pågår</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferanser (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Videomøte pågår</string>
+    <string name="conferencesWidgetDismissed">Konferanse avvist</string>
     <string name="a11y_criterion_content_description">Kriterievurdering %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">mer informasjon</string>
@@ -1376,6 +1394,10 @@
         <item quantity="one">%s gjøremålselement</item>
         <item quantity="other">%s gjøremålselementer</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s gjøremålselement</item>
+        <item quantity="other">%s gjøremålselementer</item>
+    </plurals>
     <string name="noAnnotationSelected">Ingen merknad valgt</string>
     <string name="emailNotifications">E-post varslinger</string>
     <string name="emailNotificationsImmediately">Umiddelbart</string>
@@ -1662,7 +1684,9 @@
     <string name="calendarNoEvents">Ingen hendelser i dag!</string>
     <string name="calendarNoEventsDescription">Det ser ut som dette er en flott dag til å slappe av og lade batteriene.</string>
     <string name="userCalendarToDo">Å gjøre</string>
+    <string name="userCalendarToDoNew">Gjøremål</string>
     <string name="courseToDo">%s Gjøremål</string>
+    <string name="courseToDoNew">%s Gjøremål</string>
     <string name="calendarEventExcused">Fritatt</string>
     <string name="calendarEventMissing">Mangler</string>
     <string name="calendarEventGraded">Vurdert</string>
@@ -1687,21 +1711,30 @@
     <string name="a11y_eventCreatedAnnouncement">Hendelsen %s ble opprettet.</string>
     <string name="a11y_eventUpdatedAnnouncement">Hendelsen %s ble oppdatert</string>
     <string name="a11y_toDoCreatedAnnouncement">Gjøremålet %s ble opprettet.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Gjøremålet %s opprettet.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Gjøremålet %s ble oppdatert</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Gjøremålet %s oppdatert</string>
     <string name="todoScreenTitle">Å gjøre</string>
+    <string name="todoScreenTitleNew">Gjøremål</string>
     <string name="todoDateLabel">Dato</string>
     <string name="todoDescriptionLabel">Beskrivelse</string>
     <string name="todoDeleteConfirmationTitle">Slette gjøremål?</string>
+    <string name="todoDeleteConfirmationTitleNew">Slette gjøremål?</string>
     <string name="todoDeleteConfirmationText">Dette vil slette gjøremålselementet ditt permanent.</string>
+    <string name="todoDeleteConfirmationTextNew">Dette vil slette gjøremålet ditt permanent.</string>
     <string name="todoDeleteErrorMessage">Det oppsto en feil ved sletting av dette gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="todoDeleteErrorMessageNew">Det oppsto en feil ved sletting av dette gjøremålet. Sjekk tilkoblingen din og prøv på nytt.</string>
     <string name="createTodoScreenTitle">Ny i gjøremål</string>
+    <string name="createTodoScreenTitleNew">Nye gjøremål</string>
     <string name="editTodoScreenTitle">Rediger gjøremål</string>
+    <string name="editTodoScreenTitleNew">Rediger gjøremål</string>
     <string name="createToDoTitleHint">Legg til tittel</string>
     <string name="createToDoDateLabel">Dato</string>
     <string name="createToDoTimeLabel">Tid</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Detaljer</string>
     <string name="todoSaveErrorMessage">Det oppsto en feil ved lagring av dette gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="todoSaveErrorMessageNew">Det oppsto en feil ved lagring av dette gjøremålet. Sjekk tilkoblingen din og prøv på nytt.</string>
     <string name="selectCalendarScreenTitle">Velg kalender</string>
     <string name="errorContentRetryButton">Prøv igjen</string>
     <string name="eventLocationLabel">Sted</string>
@@ -1709,6 +1742,7 @@
     <string name="eventDetailsLabel">Detaljer</string>
     <string name="errorLoadingEvent">Det oppsto et problem ved lasting av denne hendelsen. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="errorLoadingTodo">Det oppsto et problem ved lasting av dette gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="errorLoadingTodoNew">Det oppsto en feil ved lasting av dette gjøremålet. Sjekk tilkoblingen din og prøv på nytt.</string>
     <string name="eventDeleteConfirmationTitle">Slette hendelse?</string>
     <string name="eventDeleteConfirmationText">Dette vil slette hendelsen din permanent.</string>
     <string name="eventDeleteErrorMessage">Det oppsto en feil ved sletting av denne hendelsen. Kontroller tilkoblingen og prøv på nytt.</string>
@@ -1725,6 +1759,7 @@
     <string name="eventDeleteScopeAll">Alle hendelser</string>
     <string name="eventDeleteScopeFollowing">Denne og følgende hendelser</string>
     <string name="calendarAddToDo">Legg til gjøremål</string>
+    <string name="calendarAddToDoNew">Legg til gjøremål</string>
     <string name="calendarAddEvent">Legg til hendelse</string>
     <string name="createEventScreenTitle">Ny hendelse</string>
     <string name="editEventScreenTitle">Rediger hendelse</string>
@@ -2103,7 +2138,9 @@
     <string name="widgetNotLoggedInTitle">La oss logge deg inn!</string>
     <string name="widgetToDoNotLoggedInSubtitle">For å se gjøremålene dine, logg inn på kontoen din i appen. Det tar bare et øyeblikk!</string>
     <string name="a11y_widgetToDoOpenToDoList">Åpne gjøremålsliste-skjermen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Åpne gjøremålsliste-skjermen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Opprett nytt gjøremål</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Opprett nytt gjøremål</string>
     <string name="widgetGradesErrorSubtitle">Vi har problemer med å vise vurderingene dine akkurat nå. Prøv igjen om litt eller gå til appen.</string>
     <string name="widgetGradesNotLoggedInSubtitle">For å se vurderinger, logg inn på kontoen din i appen. Det tar bare et øyeblikk!</string>
     <string name="widgetSingleGradeErrorSubtitle">Vi har problemer med å vise vurderingene dine akkurat nå.</string>
@@ -2111,6 +2148,19 @@
     <string name="widgetSingleGradeSelectCourse">La oss velge et emne</string>
     <string name="widgetGradesErrorLoadingCourses">Det oppsto en feil ved lasting av emner.</string>
     <string name="settingsSwitchExperience">Bytt til Canvas Career</string>
+    <string name="forecastWidgetTitle">Ukentlig oppsummering</string>
+    <string name="forecastWidgetWeekPeriod">Uke %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Mangler</string>
+    <string name="forecastWidgetDue">Forfall</string>
+    <string name="forecastWidgetRecentGrades">Nye vurderinger</string>
+    <string name="forecastWidgetGradeWeight">%d%% av sluttvurdering</string>
+    <string name="forecastWidgetErrorMessage">Vi har problemer med å laste inn oppgavene dine. Kontroller tilkoblingen og prøv på nytt.</string>
+    <string name="forecastWidgetEmptyMissing">Ingen manglende oppgaver. Du er opptatt!</string>
+    <string name="forecastWidgetEmptyDue">Ingen oppgaver forfaller denne uken.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Ingen nye vurderinger denne uken.</string>
+    <string name="a11y_contentDescription_previousWeek">Forrige uke</string>
+    <string name="a11y_contentDescription_nextWeek">Neste uke</string>
+
     <string name="speedGraderGradeTabTitle">Vurdering og vurderingsveiledning</string>
     <string name="speedGraderDetailsTabTitle">Detaljer</string>
     <string name="a11y_contentDescription_expandPanel">Vis panel</string>
@@ -2189,6 +2239,7 @@
     <string name="errorLoadingToDos">Det oppsto en feil under lastingen av gjøremålene dine. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="errorUpdatingToDo">Det oppsto en feil ved oppdatering av gjøremålet. Kontroller tilkoblingen og prøv på nytt.</string>
     <string name="noToDosForNow">Nye gjøremål for nå!</string>
+    <string name="noToDosForNowNew">Nye gjøremål for nå!</string>
     <string name="noToDosForNowSubtext">Det ser ut som dette er et godt tidspunkt å slappe av, hvile og lade batteriene.</string>
     <string name="todoSwipeDone">Ferdig</string>
     <string name="todoSwipeUndo">Angre</string>
@@ -2199,8 +2250,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Innstillinger for gjøremålsliste</string>
+    <string name="todoFilterPreferencesNew">Innstillinger for gjøremålsliste</string>
     <string name="todoFilterVisibleItems">Synlige elementer</string>
     <string name="todoFilterShowPersonalToDos">Vis personlige gjøremål</string>
+    <string name="todoFilterShowPersonalToDosNew">Vis personlige gjøremål</string>
     <string name="todoFilterShowCalendarEvents">Vis kalenderoppføringer</string>
     <string name="todoFilterShowCompleted">Vis fullført</string>
     <string name="todoFilterFavoriteCoursesOnly">Kun favorittemner</string>
@@ -2227,6 +2280,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Avvis invitasjon</string>
     <string name="courseInvitationDeclineConfirmMessage">Er du sikker på at du vil avslå invitasjonen til %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Fremdrift</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">God morgen, %s!</string>
@@ -2349,6 +2405,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hei, %s!</string>
 
+    <string name="courses_and_groups">Emner og grupper</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Tilpass dashbord</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2358,16 +2415,44 @@
     <string name="changing_dashboard_layout">Endre dashbordlayout</string>
     <string name="changing_dashboard_layout_message">For å endre dashbordlayout, må du starte applikasjonen på nytt</string>
     <string name="restart_now">Start på nytt nå</string>
+    <string name="turn_on_new_dashboard">Slå på det nye dashbordet</string>
     <string name="switched_back">Byttet tilbake?</string>
     <string name="switched_back_message">Takk for at du prøver det nye dashbordet! Kan du fortelle oss hvorfor du byttet tilbake?</string>
+    <string name="survey_option_hard_to_find">Vanskelig å finne ting</string>
+    <string name="survey_option_prefer_old_layout">Foretrekker det gamle oppsettet</string>
+    <string name="survey_option_something_broken">Noe fungerte ikke som det skal</string>
     <string name="what_could_we_improve">Hva kan vi forbedre?</string>
+    <string name="what_do_you_think_of_new_dashboard">Hva synes du om det nye dashbordet?</string>
+    <string name="let_us_know">Gi oss beskjed!</string>
+    <string name="no_app_to_handle_link">Ingen app tilgjengelig for å åpne denne lenken</string>
     <string name="skip">Hopp over</string>
     <string name="widget_setting_show_greeting">Vis hilsen</string>
     <string name="background_color">Bakgrunnsfarge</string>
+    <string name="widget_setting_show_grades">Emnevurderinger</string>
+    <string name="widget_setting_show_color_overlay">Fargeoverlegg for emne</string>
     <string name="offline_content_available">Frakoblet innhold tilgjengelig</string>
     <string name="a11y_contentDescription_moreOptions">Flere alternativer</string>
     <string name="customizeCourse">Skreddersy emne</string>
     <string name="favoriteCoursesAndGroups">Favorittemner og -grupper</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Eksterne verktøy er ikke tilgjengelige i frakoblet modus</string>
+    <string name="widget_weekly_summary">Ukentlig oppsummering</string>
+
+    <string name="dashboardCourseNickname">Kallenavn</string>
+    <string name="dashboardCourseNicknameHint">Skriv kallenavn for emnet her</string>
+    <string name="dashboardCourseColor">Emnefarge</string>
+    <string name="widget_toDo">Daglige gjøremål</string>
+    <string name="dailyToDoWidgetTitle">Daglige gjøremål</string>
+    <string name="todoWidget_showCompleted">Vis fullført</string>
+    <string name="todoWidget_emptyTitle">Du er ferdig for nå!</string>
+    <string name="todoWidget_emptyMessage">Det ser ut til at du ikke er ledig denne dagen.\nVil du legge til noen gjøremål?</string>
+    <string name="todoWidget_addTodo">Legg til gjøremål</string>
+    <string name="todoWidget_errorTitle">Obs, noe gikk galt</string>
+    <string name="todoWidget_errorMessage">Vi kunne ikke laste inn gjøremålene dine.\nPrøv igjen eller kom tilbake senere.</string>
+    <string name="todoWidget_refresh">Oppdater</string>
+    <string name="todoWidget_today">I dag</string>
+    <string name="a11y_todoWidget_jumpToToday">Hopp til i dag</string>
+    <string name="widgetSettings_widgetsColor">Hovedfarge på dashbord</string>
+    <string name="dashboard_globalAnnouncement">Global kunngjøring</string>
+    <string name="forecastWidget_currentWeek">Gjeldende uke</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-nl/strings.xml b/libs/pandares/src/main/res/values-nl/strings.xml
index 89fcaac053..3bb0af8d0d 100644
--- a/libs/pandares/src/main/res/values-nl/strings.xml
+++ b/libs/pandares/src/main/res/values-nl/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Inlevering mislukt</string>
     <string name="submissionStatusFailedSubtitle">Tik om details te bekijken</string>
     <string name="submissionAndRubric">Inlevering en rubriek</string>
+    <string name="submissionAndFeedback">Inlevering en feedback</string>
     <string name="commentsAndRubric">Opmerkingen &amp; Rubriek</string>
     <string name="errorLoadingAssignment">Er is een probleem met het laden van deze opdracht. Controleer je verbinding en probeer het opnieuw.</string>
     <string name="submitted">Ingediend</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Vandaag</string>
+    <string name="tomorrow">Morgen</string>
     <string name="past">Vorige</string>
     <string name="noDate">Geen datum</string>
     <string name="future">Toekomst</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monoloog</string>
     <string name="noItemsToDisplayShort">Geen items te tonen</string>
     <string name="Todo">To-do lijst</string>
+    <string name="TodoNew">Opdracht</string>
     <string name="todoFilter">Cursussen filteren</string>
     <string name="filterByEllipsis">Filteren op...</string>
     <string name="favoriteCoursesLabel">Favoriete cursussen</string>
@@ -474,6 +477,7 @@
     <string name="groups">Groepen</string>
     <string name="groupMembers">Groepsleden</string>
 
+    <string name="messageGroup">Bericht sturen naar groep</string>
     <string name="loading">Laden&#8230;</string>
     <string name="select_item_to_display">Geselecteerd van de lijst</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To-do lijst</string>
+    <string name="todoWidgetTitleNew">Opdracht</string>
     <string name="gradesWidgetTitle">Cijfers</string>
     <string name="notificationWidgetTitle">Meldingen</string>
     <string name="todoWidgetTitleLong">Canvas - To-do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Opdracht</string>
     <string name="gradesWidgetTitleLong">Canvas - Cijfers</string>
     <string name="gradeWidgetTitleLong">Canvas – Cijfer</string>
     <string name="notificationWidgetTitleLong">Canvas - Berichtgevingen</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Cursussen</string>
     <string name="toDoList">To-do lijst</string>
+    <string name="toDoListNew">Lijst met opdrachten</string>
+
     <string name="notifications">Meldingen</string>
     <string name="pushNotifications">Push berichtgevingen</string>
     <string name="pushNotificationsError">Er zijn geen pushberichten voor dit apparaat geregistreerd.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Speedgrader openen</string>
 
-    <string name="search_todo">to do to do to do to do lijst</string>
     <string name="search_course">cursus cursussen les lessen</string>
     <string name="search_grades">cijfer cijfers</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Paginatitel moet worden ingesteld.</string>
     <string name="pageDetails">Paginadetails</string>
     <string name="saving">Opslaan</string>
+    <string name="speedGraderSaving">Opslaan</string>
+    <string name="speedGraderSaved">Opgeslagen</string>
+    <string name="speedGraderFailed">Mislukt</string>
+    <string name="speedGraderSaveErrorTitle">Oeps, er ging iets mis</string>
+    <string name="speedGraderSaveErrorMessage">Er is een fout opgetreden bij het opslaan van je cijferaanpassing. Je kunt het nu of later opnieuw proberen.</string>
+    <string name="speedGraderSaveErrorContentDescription">Kan cijfer niet opslaan. Tik voor details.</string>
+
     <string name="confirmDeleteEvent">Weet je zeker dat je dit evenement wilt verwijderen?</string>
     <string name="conferencesNotSupported">Vergaderingen worden nog niet ondersteund op mobiele apparatenó.</string>
     <string name="filePreviewContentDescription">Voorbeeldweergave bestand</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Opnamen</string>
     <string name="conferenceInProgress">Vergadering is bezig</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Vergaderingen (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Vergadering is bezig</string>
+    <string name="conferencesWidgetDismissed">Vergadering afgewezen</string>
     <string name="a11y_criterion_content_description">Criteriabeoordeling %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">meer informatie</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s to-do-item</item>
         <item quantity="other">%s to-do-items</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s item van lijst met opdrachten</item>
+        <item quantity="other">%s items van lijst met opdrachten</item>
+    </plurals>
     <string name="noAnnotationSelected">Geen aantekening geselecteerd</string>
     <string name="emailNotifications">E-mail meldingen</string>
     <string name="emailNotificationsImmediately">Onmiddellijk</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Vandaag geen gebeurtenissen!</string>
     <string name="calendarNoEventsDescription">Dat lijkt een prima dag om lekker uit te rusten, te relaxen en de batterij op te laden.</string>
     <string name="userCalendarToDo">Takenlijst</string>
+    <string name="userCalendarToDoNew">Opdracht</string>
     <string name="courseToDo">%s Takenlijst</string>
+    <string name="courseToDoNew">%s opdracht</string>
     <string name="calendarEventExcused">Vrijgesteld</string>
     <string name="calendarEventMissing">Ontbrekend</string>
     <string name="calendarEventGraded">Beoordeeld</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Evenement %s is gemaakt.</string>
     <string name="a11y_eventUpdatedAnnouncement">Evenement %s is bijgewerkt.</string>
     <string name="a11y_toDoCreatedAnnouncement">Lijst met opdrachten %s is gemaakt.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Opdracht %s gemaakt.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Lijst met opdrachten %s is bijgewerkt.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Opdracht %s bijgewerkt.</string>
     <string name="todoScreenTitle">Takenlijst</string>
+    <string name="todoScreenTitleNew">Opdracht</string>
     <string name="todoDateLabel">Datum</string>
     <string name="todoDescriptionLabel">Beschrijving</string>
     <string name="todoDeleteConfirmationTitle">Lijst met opdrachten verwijderen?</string>
+    <string name="todoDeleteConfirmationTitleNew">Opdrachten verwijderen?</string>
     <string name="todoDeleteConfirmationText">Dit verwijdert je Lijst met opdrachten definitief</string>
+    <string name="todoDeleteConfirmationTextNew">Dit verwijdert je item uit de lijst met opdrachten definitief</string>
     <string name="todoDeleteErrorMessage">Er is een fout opgetreden bij het verwijderen van deze takenlijst. Controleer je verbinding en probeer het opnieuw.</string>
+    <string name="todoDeleteErrorMessageNew">Er is een fout opgetreden bij het verwijderen van deze opdracht. Controleer je verbinding en probeer het opnieuw.</string>
     <string name="createTodoScreenTitle">Nieuwe takenlijst</string>
+    <string name="createTodoScreenTitleNew">Nieuwe opdracht</string>
     <string name="editTodoScreenTitle">Lijst met opdrachten bewerken</string>
+    <string name="editTodoScreenTitleNew">Opdracht bewerken</string>
     <string name="createToDoTitleHint">Titel toevoegen</string>
     <string name="createToDoDateLabel">Datum</string>
     <string name="createToDoTimeLabel">Tijd</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">Er is een fout opgetreden bij het opslaan van deze takenlijst. Controleer je verbinding en probeer het opnieuw.</string>
+    <string name="todoSaveErrorMessageNew">Er is een fout opgetreden bij het opslaan van deze opdracht. Controleer je verbinding en probeer het opnieuw.</string>
     <string name="selectCalendarScreenTitle">Kalender selecteren</string>
     <string name="errorContentRetryButton">Opnieuw proberen</string>
     <string name="eventLocationLabel">Locatie</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">Er is een probleem met het laden van dit evenement. Controleer je verbinding en probeer het opnieuw.</string>
     <string name="errorLoadingTodo">Er is een probleem met het laden van deze to-do. Controleer je verbinding en probeer het opnieuw.</string>
+    <string name="errorLoadingTodoNew">Er is een fout opgetreden bij het laden van deze opdracht. Controleer je verbinding en probeer het opnieuw.</string>
     <string name="eventDeleteConfirmationTitle">Evenement verwijderen?</string>
     <string name="eventDeleteConfirmationText">Dit verwijdert je evenement definitief</string>
     <string name="eventDeleteErrorMessage">Er is een fout opgetreden bij het verwijderen van dit evenement. Controleer je verbinding en probeer het opnieuw.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Alle evenementen</string>
     <string name="eventDeleteScopeFollowing">Dit en alle volgende evenementen</string>
     <string name="calendarAddToDo">Lijst met opdrachten toevoegen</string>
+    <string name="calendarAddToDoNew">Opdracht toevoegen</string>
     <string name="calendarAddEvent">Evenement toevoegen</string>
     <string name="createEventScreenTitle">Nieuw evenement</string>
     <string name="editEventScreenTitle">De gebeurtenis bewerken</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Laten we je aanmelden!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Meld je in de app aan bij je account om je lijst met opdrachten te bekijken. Het kost je maar een momentje!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open het scherm van de lijst met opdrachten</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Scherm met lijst met opdrachten openen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Nieuwe opdracht maken</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Nieuwe opdracht maken</string>
     <string name="widgetGradesErrorSubtitle">We kunnen je cijfers op dit moment niet weergeven. Probeer het wat later nog een keer of open de app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Meld je in de app aan bij je account om je cijfers te bekijken. Het kost je maar een momentje!</string>
     <string name="widgetSingleGradeErrorSubtitle">We kunnen je cijfers op dit moment niet weergeven.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Laten we cursus kiezen</string>
     <string name="widgetGradesErrorLoadingCourses">Er is een fout opgetreden tijdens het laden van cursussen.</string>
     <string name="settingsSwitchExperience">Schakel over naar Canvas Career</string>
+    <string name="forecastWidgetTitle">Wekelijks overzicht</string>
+    <string name="forecastWidgetWeekPeriod">Week %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Ontbrekend</string>
+    <string name="forecastWidgetDue">Inleverdatum</string>
+    <string name="forecastWidgetRecentGrades">Nieuwe beoordelingen</string>
+    <string name="forecastWidgetGradeWeight">%d%% van eindcijfer</string>
+    <string name="forecastWidgetErrorMessage">We ondervinden problemen bij het laden van je opdrachten. Controleer je verbinding en probeer het opnieuw.</string>
+    <string name="forecastWidgetEmptyMissing">Geen ontbrekende opdrachten. Je hebt alles ingehaald!</string>
+    <string name="forecastWidgetEmptyDue">Geen opdrachten die deze week moet worden ingeleverd.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Geen nieuwe cijfers in deze week.</string>
+    <string name="a11y_contentDescription_previousWeek">Vorige week</string>
+    <string name="a11y_contentDescription_nextWeek">Volgende week</string>
+
     <string name="speedGraderGradeTabTitle">Cijfer en rubriek</string>
     <string name="speedGraderDetailsTabTitle">Details</string>
     <string name="a11y_contentDescription_expandPanel">Panel uitvouwen</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Er is een fout opgetreden bij het laden van je to-do-items. Controleer je verbinding en probeer het opnieuw.</string>
     <string name="errorUpdatingToDo">Er is een fout opgetreden bij het bijwerken van het to-do-item. Controleer je verbinding en probeer het opnieuw.</string>
     <string name="noToDosForNow">Er zijn op dit moment geen to-do\'s!</string>
+    <string name="noToDosForNowNew">Geen opdrachten op dit moment!</string>
     <string name="noToDosForNowSubtext">Dit lijkt een prima moment om uit te rusten, te ontspannen en nieuwe energie op te doen.</string>
     <string name="todoSwipeDone">Gereed</string>
     <string name="todoSwipeUndo">Ongedaan maken</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Voorkeuren voor to-do-lijst</string>
+    <string name="todoFilterPreferencesNew">Voorkeuren voor lijst met opdrachten</string>
     <string name="todoFilterVisibleItems">Zichtbare items</string>
     <string name="todoFilterShowPersonalToDos">Persoonlijke to-do\'s weergeven</string>
+    <string name="todoFilterShowPersonalToDosNew">Persoonlijke opdrachten weergeven</string>
     <string name="todoFilterShowCalendarEvents">Kalenderevenementen weergeven</string>
     <string name="todoFilterShowCompleted">Voltooid weergeven</string>
     <string name="todoFilterFavoriteCoursesOnly">Alleen favoriete cursus</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Uitnodiging weigeren</string>
     <string name="courseInvitationDeclineConfirmMessage">Weet je zeker dat je de uitnodiging voor %s wilt weigeren?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Voortgang</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Goedemorgen %s!</string>
@@ -2349,6 +2405,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hallo, %s</string>
 
+    <string name="courses_and_groups">Cursussen en groepen</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Dashboard aanpassen</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2358,16 +2415,44 @@
     <string name="changing_dashboard_layout">Lay-out van dashboard wordt gewijzigd</string>
     <string name="changing_dashboard_layout_message">Je moet de applicatie opnieuw starten om de lay-out van het dashboard te wijzigen</string>
     <string name="restart_now">Nu opnieuw starten</string>
+    <string name="turn_on_new_dashboard">Het nieuwe dashboard inschakelen</string>
     <string name="switched_back">Teruggekeerd?</string>
     <string name="switched_back_message">Bedankt dat je het nieuwe dashboard hebt geprobeerd! Kun je ons vertellen waarom je bent teruggekeerd naar het oude dashboard?</string>
+    <string name="survey_option_hard_to_find">Het is moeilijk om dingen te vinden</string>
+    <string name="survey_option_prefer_old_layout">Ik geef de voorkeur aan de oude layout</string>
+    <string name="survey_option_something_broken">Iets functioneerde niet goed</string>
     <string name="what_could_we_improve">Wat kunnen we verbeteren?</string>
+    <string name="what_do_you_think_of_new_dashboard">Wat vind je van het nieuwe dashboard?</string>
+    <string name="let_us_know">Laat het ons weten!</string>
+    <string name="no_app_to_handle_link">Er is geen app beschikbaar om deze link te openen</string>
     <string name="skip">Overslaan</string>
     <string name="widget_setting_show_greeting">Begroeting weergeven</string>
     <string name="background_color">Achtergrondkleur</string>
+    <string name="widget_setting_show_grades">Cursuscijfers</string>
+    <string name="widget_setting_show_color_overlay">Cursuskleuroverlay</string>
     <string name="offline_content_available">Er is offline inhoud beschikbaar</string>
     <string name="a11y_contentDescription_moreOptions">Meer opties</string>
     <string name="customizeCourse">Cursus aanpassen</string>
     <string name="favoriteCoursesAndGroups">Favoriete cursussen en groepen</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Er zijn offline geen externe tools beschikbaar</string>
+    <string name="widget_weekly_summary">Wekelijks overzicht</string>
+
+    <string name="dashboardCourseNickname">Bijnaam</string>
+    <string name="dashboardCourseNicknameHint">Vul hier de bijnaam van de cursus in</string>
+    <string name="dashboardCourseColor">Cursuskleur</string>
+    <string name="widget_toDo">Dagelijkse lijst met opdrachten</string>
+    <string name="dailyToDoWidgetTitle">Dagelijkse lijst met opdrachten</string>
+    <string name="todoWidget_showCompleted">Voltooid weergeven</string>
+    <string name="todoWidget_emptyTitle">Voor nu ben je klaar!</string>
+    <string name="todoWidget_emptyMessage">Het lijkt erop dat je deze dag nog niets hebt.\nWil je een paar opdrachten toevoegen?</string>
+    <string name="todoWidget_addTodo">Opdracht toevoegen</string>
+    <string name="todoWidget_errorTitle">Oeps, er is iets misgegaan</string>
+    <string name="todoWidget_errorMessage">We konden je taken niet toevoegen.\nProbeer het opnieuw, of kom later terug.</string>
+    <string name="todoWidget_refresh">Vernieuwen</string>
+    <string name="todoWidget_today">Vandaag</string>
+    <string name="a11y_todoWidget_jumpToToday">Naar vandaag springen</string>
+    <string name="widgetSettings_widgetsColor">Hoofdkleur dashboard</string>
+    <string name="dashboard_globalAnnouncement">Algemene aankondiging</string>
+    <string name="forecastWidget_currentWeek">Huidige week</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-pl/strings.xml b/libs/pandares/src/main/res/values-pl/strings.xml
index 5576af40da..d38185a50a 100644
--- a/libs/pandares/src/main/res/values-pl/strings.xml
+++ b/libs/pandares/src/main/res/values-pl/strings.xml
@@ -48,6 +48,7 @@
     <string name="submissionStatusFailedTitle">Przesyłanie zadania nie powiodło się</string>
     <string name="submissionStatusFailedSubtitle">Stuknij, aby wyświetlić szczegóły</string>
     <string name="submissionAndRubric">Przesyłka i kryteria ocen</string>
+    <string name="submissionAndFeedback">Przesłane materiały i opinie</string>
     <string name="commentsAndRubric">Komentarze i kryteria ocen</string>
     <string name="errorLoadingAssignment">Wystąpił problem z wczytaniem tego zadania. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="submitted">Przesłano</string>
@@ -229,6 +230,7 @@
 
     <!-- Date strings -->
     <string name="today">Dzisiaj</string>
+    <string name="tomorrow">Jutro</string>
     <string name="past">Przeszłe</string>
     <string name="noDate">Brak daty</string>
     <string name="future">Przyszłość</string>
@@ -301,6 +303,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Brak pozycji do wyświetlenia</string>
     <string name="Todo">Lista zadań</string>
+    <string name="TodoNew">Lista zadań</string>
     <string name="todoFilter">Filtruj kursy</string>
     <string name="filterByEllipsis">Filtruj wg...</string>
     <string name="favoriteCoursesLabel">Ulubione kursy</string>
@@ -496,6 +499,7 @@
     <string name="groups">Grupy</string>
     <string name="groupMembers">Członkowie grupy</string>
 
+    <string name="messageGroup">Wyślij wiadomość do grupy</string>
     <string name="loading">Wczytywanie&#8230;</string>
     <string name="select_item_to_display">Wybierz z listy</string>
 
@@ -712,9 +716,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Lista zadań</string>
+    <string name="todoWidgetTitleNew">Lista zadań</string>
     <string name="gradesWidgetTitle">Oceny</string>
     <string name="notificationWidgetTitle">Powiadomienia</string>
     <string name="todoWidgetTitleLong">Canvas - Lista zadań</string>
+    <string name="todoWidgetTitleLongNew">Canvas – lista zadań</string>
     <string name="gradesWidgetTitleLong">Canvas - Oceny</string>
     <string name="gradeWidgetTitleLong">Canvas - Ocena</string>
     <string name="notificationWidgetTitleLong">Canvas - Powiadomienia</string>
@@ -750,6 +756,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kursy</string>
     <string name="toDoList">Lista zadań</string>
+    <string name="toDoListNew">Lista zadań</string>
+
     <string name="notifications">Powiadomienia</string>
     <string name="pushNotifications">Powiadomienia push</string>
     <string name="pushNotificationsError">Nie zarejestrowano powiadomień push dla tego urządzenia.</string>
@@ -764,7 +772,6 @@
 
     <string name="launchSpeedgrader">Otwórz Speedgrader</string>
 
-    <string name="search_todo">do zrobienia do zrobienia lista do zrobienia</string>
     <string name="search_course">kurs kursy klasa klasy</string>
     <string name="search_grades">ocena oceny</string>
 
@@ -1113,6 +1120,13 @@
     <string name="pageTitleMustBeSet">Należy ustawić tytuł strony.</string>
     <string name="pageDetails">Szczegóły strony</string>
     <string name="saving">Zapisywanie</string>
+    <string name="speedGraderSaving">Zapisywanie</string>
+    <string name="speedGraderSaved">Zapisano</string>
+    <string name="speedGraderFailed">Nie powiodło się</string>
+    <string name="speedGraderSaveErrorTitle">Ups, coś poszło nie tak.</string>
+    <string name="speedGraderSaveErrorMessage">Wystąpił błąd podczas zapisywania zmian ocen. Możesz ponowić próbę lub spróbować później.</string>
+    <string name="speedGraderSaveErrorContentDescription">Nie udało się zapisać oceny. Stuknij, aby wyświetlić szczegóły.</string>
+
     <string name="confirmDeleteEvent">Czy na pewno chcesz usunąć to zdarzenie?</string>
     <string name="conferencesNotSupported">Konferencje nie mają jeszcze wsparcia dla urządzeń przenośnych.</string>
     <string name="filePreviewContentDescription">Obraz podglądu pliku</string>
@@ -1267,6 +1281,10 @@
     <string name="recordings">Nagrań</string>
     <string name="conferenceInProgress">Konferencja w toku</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferencje (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Konferencja w toku</string>
+    <string name="conferencesWidgetDismissed">Odrzucono konferencje</string>
     <string name="a11y_criterion_content_description">Punktacja dla danego kryterium %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">więcej informacji</string>
@@ -1423,6 +1441,12 @@
         <item quantity="many">Pozycje z listy zadań: %s</item>
         <item quantity="other">Pozycje z listy zadań: %s</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s element listy zadań</item>
+        <item quantity="few">%s elementy listy zadań</item>
+        <item quantity="many">%s elementy listy zadań</item>
+        <item quantity="other">%s elementy listy zadań</item>
+    </plurals>
     <string name="noAnnotationSelected">Nie wybrano adnotacji</string>
     <string name="emailNotifications">Powiadomienia e-mail</string>
     <string name="emailNotificationsImmediately">Natychmiast</string>
@@ -1719,7 +1743,9 @@
     <string name="calendarNoEvents">Brak wydarzeń na dziś!</string>
     <string name="calendarNoEventsDescription">Wygląda to na świetny dzień do odpoczynku, relaksu i regeneracji.</string>
     <string name="userCalendarToDo">Lista zadań</string>
+    <string name="userCalendarToDoNew">Lista zadań</string>
     <string name="courseToDo">Lista zadań %s</string>
+    <string name="courseToDoNew">%s Lista zadań</string>
     <string name="calendarEventExcused">Usprawiedliwiony</string>
     <string name="calendarEventMissing">Brak</string>
     <string name="calendarEventGraded">Oceniono</string>
@@ -1744,21 +1770,30 @@
     <string name="a11y_eventCreatedAnnouncement">Wydarzenie %s zostało pomyślnie utworzone.</string>
     <string name="a11y_eventUpdatedAnnouncement">Wydarzenie %s zostało pomyślnie zaktualizowane.</string>
     <string name="a11y_toDoCreatedAnnouncement">Utworzono zadanie %s.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Utworzono listę zadań %s.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Zaktualizowano zadanie %s.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Zaktualizowano listę zadań %s.</string>
     <string name="todoScreenTitle">Lista zadań</string>
+    <string name="todoScreenTitleNew">Lista zadań</string>
     <string name="todoDateLabel">Data</string>
     <string name="todoDescriptionLabel">Opis</string>
     <string name="todoDeleteConfirmationTitle">Usunąć listę zadań?</string>
+    <string name="todoDeleteConfirmationTitleNew">Usunąć listę zadań?</string>
     <string name="todoDeleteConfirmationText">Spowoduje to trwałe usunięcie elementu z listy zadań.</string>
+    <string name="todoDeleteConfirmationTextNew">Spowoduje to trwałe usunięcie elementu z listy zadań.</string>
     <string name="todoDeleteErrorMessage">Wystąpił błąd podczas usuwania tej listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
+    <string name="todoDeleteErrorMessageNew">Wystąpił błąd podczas usuwania listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="createTodoScreenTitle">Nowa lista zadań</string>
+    <string name="createTodoScreenTitleNew">Nowa lista zadań</string>
     <string name="editTodoScreenTitle">Edytuj listę zadań</string>
+    <string name="editTodoScreenTitleNew">Edytuj listę zadań</string>
     <string name="createToDoTitleHint">Dodaj tytuł</string>
     <string name="createToDoDateLabel">Data</string>
     <string name="createToDoTimeLabel">Czas</string>
     <string name="createToDoCalendarLabel">Kalendarz</string>
     <string name="createToDoDetailsLabel">Szczegóły</string>
     <string name="todoSaveErrorMessage">Wystąpił błąd podczas zapisywania tej listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
+    <string name="todoSaveErrorMessageNew">Wystąpił błąd podczas zapisywania listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="selectCalendarScreenTitle">Wybierz kalendarz</string>
     <string name="errorContentRetryButton">Ponów próbę</string>
     <string name="eventLocationLabel">Lokalizacja</string>
@@ -1766,6 +1801,7 @@
     <string name="eventDetailsLabel">Szczegóły</string>
     <string name="errorLoadingEvent">Wystąpił problem z wczytaniem tego wydarzenia. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="errorLoadingTodo">Wystąpił problem z wczytaniem tej listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
+    <string name="errorLoadingTodoNew">Wystąpił błąd podczas wczytywania listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="eventDeleteConfirmationTitle">Usunąć wydarzenie?</string>
     <string name="eventDeleteConfirmationText">Spowoduje to trwałe usunięcie Twojego wydarzenia.</string>
     <string name="eventDeleteErrorMessage">Wystąpił błąd podczas usuwania tego wydarzenia. Sprawdź połączenie i spróbuj ponownie.</string>
@@ -1784,6 +1820,7 @@
     <string name="eventDeleteScopeAll">Wszystkie zdarzenia</string>
     <string name="eventDeleteScopeFollowing">To i wszystkie następne zdarzenia</string>
     <string name="calendarAddToDo">Dodaj do listy zadań</string>
+    <string name="calendarAddToDoNew">Dodaj listę zadań</string>
     <string name="calendarAddEvent">Dodaj wydarzenie</string>
     <string name="createEventScreenTitle">Nowe wydarzenie</string>
     <string name="editEventScreenTitle">Edytuj wydarzenie</string>
@@ -2174,7 +2211,9 @@
     <string name="widgetNotLoggedInTitle">Spróbujmy Cię zalogować!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Aby wyświetlić listy zadań, zaloguj się do konta w aplikacji. To potrwa tylko chwilę!</string>
     <string name="a11y_widgetToDoOpenToDoList">Otwórz ekran listy zadań</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Otwórz ekran listy zadań</string>
     <string name="a11y_widgetToDoCreateNewToDo">Utwórz nową listę zadań</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Utwórz nową listę zadań</string>
     <string name="widgetGradesErrorSubtitle">Mamy problem z wyświetleniem ocen. Spróbuj ponownie za pewien czas lub przejdź do aplikacji.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Aby wyświetlić oceny, zaloguj się do konta w aplikacji. To potrwa tylko chwilę!</string>
     <string name="widgetSingleGradeErrorSubtitle">Mamy problem z wyświetleniem ocen.</string>
@@ -2182,6 +2221,19 @@
     <string name="widgetSingleGradeSelectCourse">Wybierzmy kurs</string>
     <string name="widgetGradesErrorLoadingCourses">Wystąpił błąd podczas wczytywania kursów.</string>
     <string name="settingsSwitchExperience">Przełącz na Canvas Career</string>
+    <string name="forecastWidgetTitle">Tygodniowe podsumowanie</string>
+    <string name="forecastWidgetWeekPeriod">Tydzień %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Brak</string>
+    <string name="forecastWidgetDue">Termin</string>
+    <string name="forecastWidgetRecentGrades">Nowe oceny</string>
+    <string name="forecastWidgetGradeWeight">%d%% końcowej oceny</string>
+    <string name="forecastWidgetErrorMessage">Wystąpił problem z wczytaniem zadań. Sprawdź połączenie i spróbuj ponownie.</string>
+    <string name="forecastWidgetEmptyMissing">Nie ma brakujących zadań. To już wszystko!</string>
+    <string name="forecastWidgetEmptyDue">Brak zadań z terminem w tym tygodniu.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Brak nowych ocen w tym tygodniu.</string>
+    <string name="a11y_contentDescription_previousWeek">Poprzedni tydzień</string>
+    <string name="a11y_contentDescription_nextWeek">Następny tydzień</string>
+
     <string name="speedGraderGradeTabTitle">Stopnie i kryteria ocen</string>
     <string name="speedGraderDetailsTabTitle">Szczegóły</string>
     <string name="a11y_contentDescription_expandPanel">Rozwiń panel</string>
@@ -2264,6 +2316,7 @@
     <string name="errorLoadingToDos">Wystąpił błąd podczas wczytywania listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="errorUpdatingToDo">Wystąpił błąd podczas aktualizowania pozycji z listy zadań. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="noToDosForNow">Brak pozycji na liście zadań!</string>
+    <string name="noToDosForNowNew">Brak list zadań na teraz!</string>
     <string name="noToDosForNowSubtext">Wygląda to na świetny dzień do odpoczynku, relaksu i regeneracji.</string>
     <string name="todoSwipeDone">Gotowe</string>
     <string name="todoSwipeUndo">Cofnij</string>
@@ -2274,8 +2327,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferencje dot. listy zadań</string>
+    <string name="todoFilterPreferencesNew">Preferencje listy zadań</string>
     <string name="todoFilterVisibleItems">Widoczne elementy</string>
     <string name="todoFilterShowPersonalToDos">Pokaż prywatne listy zadań</string>
+    <string name="todoFilterShowPersonalToDosNew">Pokaż prywatne listy zadań</string>
     <string name="todoFilterShowCalendarEvents">Pokaż wydarzenia w kalendarzu</string>
     <string name="todoFilterShowCompleted">Pokaż ukończone</string>
     <string name="todoFilterFavoriteCoursesOnly">Tylko ulubione kursy</string>
@@ -2302,6 +2357,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Odrzuć zaproszenie</string>
     <string name="courseInvitationDeclineConfirmMessage">Czy na pewno chcesz odrzucić to zaproszenie do %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Postęp</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Dzień dobry, %s!</string>
@@ -2424,6 +2482,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Witaj, %s</string>
 
+    <string name="courses_and_groups">Kursy i grupy</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personalizuj pulpit nawigacyjny</string>
     <string name="dashboard_widgets">Widżety</string>
@@ -2433,16 +2492,44 @@
     <string name="changing_dashboard_layout">Zmienianie układu pulpitu nawigacyjnego</string>
     <string name="changing_dashboard_layout_message">Aby zmienić układu pulpitu nawigacyjnego, należy ponownie uruchomić aplikację</string>
     <string name="restart_now">Uruchom ponownie teraz</string>
+    <string name="turn_on_new_dashboard">Włącz nowy pulpit nawigacyjny</string>
     <string name="switched_back">Powrót do poprzedniej wersji?</string>
     <string name="switched_back_message">Dziękujemy za wypróbowanie nowego pulpitu nawigacyjnego! Czy możesz nam powiedzieć, dlaczego powróciłeś do poprzedniej wersji?</string>
+    <string name="survey_option_hard_to_find">Trudno jest wyszukiwać</string>
+    <string name="survey_option_prefer_old_layout">Wolę starszy układ</string>
+    <string name="survey_option_something_broken">Coś nie działa jak trzeba</string>
     <string name="what_could_we_improve">Co moglibyśmy ulepszyć?</string>
+    <string name="what_do_you_think_of_new_dashboard">Co myślisz o nowym pulpicie nawigacyjnym?</string>
+    <string name="let_us_know">Powiadom nas!</string>
+    <string name="no_app_to_handle_link">Brak aplikacji do otwarcia tego łącza</string>
     <string name="skip">Pomiń</string>
     <string name="widget_setting_show_greeting">Pokaż powitanie</string>
     <string name="background_color">Kolor tła</string>
+    <string name="widget_setting_show_grades">Oceny kursu</string>
+    <string name="widget_setting_show_color_overlay">Kolor nakładki kursu</string>
     <string name="offline_content_available">Dostępna zawartość offline</string>
     <string name="a11y_contentDescription_moreOptions">Więcej opcji</string>
     <string name="customizeCourse">Personalizuj kurs</string>
     <string name="favoriteCoursesAndGroups">Ulubione kursy i grupy</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Narzędzia zewnętrzne są niedostępne w trybie offline.</string>
+    <string name="widget_weekly_summary">Tygodniowe podsumowanie</string>
+
+    <string name="dashboardCourseNickname">Przyjazna nazwa</string>
+    <string name="dashboardCourseNicknameHint">Wpisz tutaj przyjazną nazwę kursu</string>
+    <string name="dashboardCourseColor">Kolor kursu</string>
+    <string name="widget_toDo">Codzienne zadanie</string>
+    <string name="dailyToDoWidgetTitle">Codzienne zadanie</string>
+    <string name="todoWidget_showCompleted">Pokaż ukończone</string>
+    <string name="todoWidget_emptyTitle">To wszystko na razie!</string>
+    <string name="todoWidget_emptyMessage">Wygląda na to, że nie masz już zadań.\nCzy chcesz jakieś dodać?</string>
+    <string name="todoWidget_addTodo">Dodaj listę zadań</string>
+    <string name="todoWidget_errorTitle">Ups, coś poszło nie tak.</string>
+    <string name="todoWidget_errorMessage">Nie udało się wczytać Twoich zadań.\nSpróbuj ponownie lub powróć później.</string>
+    <string name="todoWidget_refresh">Odśwież</string>
+    <string name="todoWidget_today">Dzisiaj</string>
+    <string name="a11y_todoWidget_jumpToToday">Przejdź do dzisiaj</string>
+    <string name="widgetSettings_widgetsColor">Główny kolor pulpitu nawigacyjnego</string>
+    <string name="dashboard_globalAnnouncement">Ogłoszenie globalne</string>
+    <string name="forecastWidget_currentWeek">Bieżący tydzień</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-pt-rBR/strings.xml b/libs/pandares/src/main/res/values-pt-rBR/strings.xml
index 5ef18dafbc..25992bda01 100644
--- a/libs/pandares/src/main/res/values-pt-rBR/strings.xml
+++ b/libs/pandares/src/main/res/values-pt-rBR/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Falha no envio</string>
     <string name="submissionStatusFailedSubtitle">Toque para visualizar os detalhes</string>
     <string name="submissionAndRubric">Envio e rubrica</string>
+    <string name="submissionAndFeedback">Envio e feedback</string>
     <string name="commentsAndRubric">Comentários e rubrica</string>
     <string name="errorLoadingAssignment">Houve um problema ao carregar esta tarefa. Verifique a sua conexão e tente novamente.</string>
     <string name="submitted">Enviado</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Hoje</string>
+    <string name="tomorrow">Amanhã</string>
     <string name="past">Passado</string>
     <string name="noDate">Sem Data</string>
     <string name="future">Futuro</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monólogo</string>
     <string name="noItemsToDisplayShort">Nenhum item para apresentar</string>
     <string name="Todo">Lista de Tarefas</string>
+    <string name="TodoNew">A fazer</string>
     <string name="todoFilter">Filtrar cursos</string>
     <string name="filterByEllipsis">Filtrar por...</string>
     <string name="favoriteCoursesLabel">Cursos Favoritos</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupos</string>
     <string name="groupMembers">Membros do grupo</string>
 
+    <string name="messageGroup">Grupo de mensagens</string>
     <string name="loading">Carregando&#8230;</string>
     <string name="select_item_to_display">Selecionar da lista</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Lista de Tarefas</string>
+    <string name="todoWidgetTitleNew">A fazer</string>
     <string name="gradesWidgetTitle">Notas</string>
     <string name="notificationWidgetTitle">Notificações</string>
     <string name="todoWidgetTitleLong">Canvas - Lista de tarefas</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Tarefas</string>
     <string name="gradesWidgetTitleLong">Canvas - Notas</string>
     <string name="gradeWidgetTitleLong">Canvas - Nota</string>
     <string name="notificationWidgetTitleLong">Canvas - Notificações</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Cursos</string>
     <string name="toDoList">Lista de tarefas</string>
+    <string name="toDoListNew">Lista de tarefas</string>
+
     <string name="notifications">Notificações</string>
     <string name="pushNotifications">Notificações Push</string>
     <string name="pushNotificationsError">Notificações push não foram inscritas para esse dispositivo.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Abrir Speedgrader</string>
 
-    <string name="search_todo">afazer a fazer afazeres lista de afazeres</string>
     <string name="search_course">curso cursos turma turmas</string>
     <string name="search_grades">nota notas</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">O título da página deve ser definido.</string>
     <string name="pageDetails">Detalhes da página</string>
     <string name="saving">Salvando</string>
+    <string name="speedGraderSaving">Salvando</string>
+    <string name="speedGraderSaved">Salvo</string>
+    <string name="speedGraderFailed">Falhou</string>
+    <string name="speedGraderSaveErrorTitle">Ops, algo deu errado.</string>
+    <string name="speedGraderSaveErrorMessage">Ocorreu um erro ao salvar a alteração da sua nota. Você pode tentar novamente ou tentar mais tarde.</string>
+    <string name="speedGraderSaveErrorContentDescription">Falha ao salvar a nota. Toque para obter detalhes.</string>
+
     <string name="confirmDeleteEvent">Tem certeza de que deseja excluir este evento?</string>
     <string name="conferencesNotSupported">Conferências ainda não são suportadas em dispositivos móveis.</string>
     <string name="filePreviewContentDescription">Imagem de pré-visualização do arquivo</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Gravações</string>
     <string name="conferenceInProgress">Conferência em andamento</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferências (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conferência em andamento</string>
+    <string name="conferencesWidgetDismissed">Conferência encerrada</string>
     <string name="a11y_criterion_content_description">Avaliação de critério %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">mais informações</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s item na lista de tarefas</item>
         <item quantity="other">%s itens na lista de tarefas</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s item da lista de tarefas</item>
+        <item quantity="other">%s itens da lista de tarefas</item>
+    </plurals>
     <string name="noAnnotationSelected">Nenhuma anotação selecionada</string>
     <string name="emailNotifications">Notificações de e-mail</string>
     <string name="emailNotificationsImmediately">Imediatamente</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Nenhum evento hoje!</string>
     <string name="calendarNoEventsDescription">Parece um bom dia para descansar, relaxar e recarregar.</string>
     <string name="userCalendarToDo">Lista de Tarefas</string>
+    <string name="userCalendarToDoNew">A fazer</string>
     <string name="courseToDo">%s Lista de Tarefas</string>
+    <string name="courseToDoNew">%s Tarefa</string>
     <string name="calendarEventExcused">Dispensado</string>
     <string name="calendarEventMissing">Faltante</string>
     <string name="calendarEventGraded">Avaliado</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Evento %s criado com sucesso.</string>
     <string name="a11y_eventUpdatedAnnouncement">Evento %s atualizado com sucesso.</string>
     <string name="a11y_toDoCreatedAnnouncement">Lista de tarefas %s criada com sucesso.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Tarefa %s criada com sucesso.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Lista de tarefas %s atualizada com sucesso.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Tarefa %s atualizada com sucesso.</string>
     <string name="todoScreenTitle">Lista de Tarefas</string>
+    <string name="todoScreenTitleNew">A fazer</string>
     <string name="todoDateLabel">Data</string>
     <string name="todoDescriptionLabel">Descrição</string>
     <string name="todoDeleteConfirmationTitle">Excluir lista de tarefas?</string>
+    <string name="todoDeleteConfirmationTitleNew">Excluir lista de tarefas?</string>
     <string name="todoDeleteConfirmationText">Isso excluirá permanentemente o item de lista de tarefas.</string>
+    <string name="todoDeleteConfirmationTextNew">Isso excluirá permanentemente o item de lista de tarefas.</string>
     <string name="todoDeleteErrorMessage">Ocorreu um erro ao excluir esta Lista de Tarefas. Verifique a sua conexão e tente novamente.</string>
+    <string name="todoDeleteErrorMessageNew">Ocorreu um erro ao excluir esta tarefa. Verifique sua conexão e tente novamente.</string>
     <string name="createTodoScreenTitle">Nova lista de tarefas</string>
+    <string name="createTodoScreenTitleNew">Novas listas de tarefas</string>
     <string name="editTodoScreenTitle">Editar lista de tarefas</string>
+    <string name="editTodoScreenTitleNew">Editar lista de tarefas</string>
     <string name="createToDoTitleHint">Adicionar título</string>
     <string name="createToDoDateLabel">Data</string>
     <string name="createToDoTimeLabel">Tempo</string>
     <string name="createToDoCalendarLabel">Calendário</string>
     <string name="createToDoDetailsLabel">Detalhes</string>
     <string name="todoSaveErrorMessage">Ocorreu um erro ao salvar esta Lista de Tarefas. Verifique a sua conexão e tente novamente.</string>
+    <string name="todoSaveErrorMessageNew">Ocorreu um erro ao salvar esta tarefa. Verifique sua conexão e tente novamente.</string>
     <string name="selectCalendarScreenTitle">Selecionar calendário</string>
     <string name="errorContentRetryButton">Tentar novamente</string>
     <string name="eventLocationLabel">Localização</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Detalhes</string>
     <string name="errorLoadingEvent">Houve um problema ao carregar este evento. Verifique a sua conexão e tente novamente.</string>
     <string name="errorLoadingTodo">Houve um problema ao carregar esta ação. Verifique a sua conexão e tente novamente.</string>
+    <string name="errorLoadingTodoNew">Ocorreu um problema ao carregar esta lista de tarefas. Verifique sua conexão e tente novamente.</string>
     <string name="eventDeleteConfirmationTitle">Excluir evento?</string>
     <string name="eventDeleteConfirmationText">Isso excluirá permanentemente seu evento.</string>
     <string name="eventDeleteErrorMessage">Ocorreu um erro ao excluir este evento. Verifique a sua conexão e tente novamente.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Todos os eventos</string>
     <string name="eventDeleteScopeFollowing">Este e todos os eventos seguintes</string>
     <string name="calendarAddToDo">Adicionar à Lista de Tarefas</string>
+    <string name="calendarAddToDoNew">Adicionar tarefa</string>
     <string name="calendarAddEvent">Adicionar Evento</string>
     <string name="createEventScreenTitle">Novo Evento</string>
     <string name="editEventScreenTitle">Editar evento</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Vamos fazer seu login!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Para ver suas tarefas, faça login em sua conta no aplicativo. É só um segundo!</string>
     <string name="a11y_widgetToDoOpenToDoList">Abrir a tela da lista de tarefas</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Abrir tela da lista de tarefas</string>
     <string name="a11y_widgetToDoCreateNewToDo">Criar novas tarefas</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Criar nova tarefa</string>
     <string name="widgetGradesErrorSubtitle">Estamos com problemas para mostrar suas notas no momento. Tente novamente em breve ou acesse o aplicativo.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Para ver suas notas, faça login em sua conta no aplicativo. É só um segundo!</string>
     <string name="widgetSingleGradeErrorSubtitle">Estamos com problemas para mostrar suas notas no momento.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Vamos escolher um curso</string>
     <string name="widgetGradesErrorLoadingCourses">Ocorreu um erro ao carregar os cursos.</string>
     <string name="settingsSwitchExperience">Mudar para o Canvas Career</string>
+    <string name="forecastWidgetTitle">Resumo semanal</string>
+    <string name="forecastWidgetWeekPeriod">Semana %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Faltante</string>
+    <string name="forecastWidgetDue">Vencimento</string>
+    <string name="forecastWidgetRecentGrades">Novas notas</string>
+    <string name="forecastWidgetGradeWeight">%d%% da nota final</string>
+    <string name="forecastWidgetErrorMessage">Estamos com dificuldades para carregar suas tarefas. Verifique a sua conexão e tente novamente.</string>
+    <string name="forecastWidgetEmptyMissing">Nenhuma tarefa em atraso. Você está em dia!</string>
+    <string name="forecastWidgetEmptyDue">Não há trabalhos para entregar esta semana.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Não haverá novas notas esta semana.</string>
+    <string name="a11y_contentDescription_previousWeek">Semana anterior</string>
+    <string name="a11y_contentDescription_nextWeek">Próxima semana</string>
+
     <string name="speedGraderGradeTabTitle">Série e rubrica</string>
     <string name="speedGraderDetailsTabTitle">Detalhes</string>
     <string name="a11y_contentDescription_expandPanel">Expandir painel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Ocorreu um erro ao carregar seus itens da lista de tarefas. Verifique a sua conexão e tente novamente.</string>
     <string name="errorUpdatingToDo">Ocorreu um erro ao atualizar o item da lista de tarefas. Verifique a sua conexão e tente novamente.</string>
     <string name="noToDosForNow">Sem tarefas a fazer por agora!</string>
+    <string name="noToDosForNowNew">Não há listas de tarefas pendentes por enquanto!</string>
     <string name="noToDosForNowSubtext">Parece ser um ótimo momento para descansar, relaxar e recarregar as baterias.</string>
     <string name="todoSwipeDone">Feito</string>
     <string name="todoSwipeUndo">Desfazer</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Preferências da lista de tarefas</string>
+    <string name="todoFilterPreferencesNew">Preferências da lista de tarefas</string>
     <string name="todoFilterVisibleItems">Itens visíveis</string>
     <string name="todoFilterShowPersonalToDos">Mostrar lista de tarefas pessoais</string>
+    <string name="todoFilterShowPersonalToDosNew">Mostrar tarefas pessoais</string>
     <string name="todoFilterShowCalendarEvents">Mostrar eventos do calendário</string>
     <string name="todoFilterShowCompleted">Mostrar concluídos</string>
     <string name="todoFilterFavoriteCoursesOnly">Somente cursos favoritos</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Recusar convite</string>
     <string name="courseInvitationDeclineConfirmMessage">Tem certeza de que deseja recusar o convite para %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progresso</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Bom dia, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Olá, %s</string>
 
+    <string name="courses_and_groups">Cursos e grupos</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personalizar painel</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Alterando o layout do painel</string>
     <string name="changing_dashboard_layout_message">Para alterar o layout do painel, é necessário reiniciar o aplicativo.</string>
     <string name="restart_now">Reiniciar agora</string>
+    <string name="turn_on_new_dashboard">Ative o novo painel de controle</string>
     <string name="switched_back">Mudou de ideia?</string>
     <string name="switched_back_message">Obrigado por experimentar o novo painel! Você poderia nos dizer por que voltou atrás?</string>
+    <string name="survey_option_hard_to_find">Coisas difíceis de encontrar</string>
+    <string name="survey_option_prefer_old_layout">Prefiro o layout antigo</string>
+    <string name="survey_option_something_broken">Algo não funcionou corretamente</string>
     <string name="what_could_we_improve">O que poderíamos melhorar?</string>
+    <string name="what_do_you_think_of_new_dashboard">O que você acha do novo painel?</string>
+    <string name="let_us_know">Avise-nos!</string>
+    <string name="no_app_to_handle_link">Não há nenhum aplicativo disponível para abrir este link</string>
     <string name="skip">Pular</string>
     <string name="widget_setting_show_greeting">Mostrar saudação</string>
     <string name="background_color">Cor de fundo</string>
+    <string name="widget_setting_show_grades">Notas do curso</string>
+    <string name="widget_setting_show_color_overlay">Sobreposição de cores do curso</string>
     <string name="offline_content_available">Conteúdo offline disponível</string>
     <string name="a11y_contentDescription_moreOptions">Mais opções</string>
     <string name="customizeCourse">Personalizar curso</string>
     <string name="favoriteCoursesAndGroups">Cursos e grupos favoritos</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">As ferramentas externas não estão disponíveis offline.</string>
+    <string name="widget_weekly_summary">Resumo semanal</string>
+
+    <string name="dashboardCourseNickname">Apelido</string>
+    <string name="dashboardCourseNicknameHint">Escreva o apelido do curso aqui</string>
+    <string name="dashboardCourseColor">Cor do curso</string>
+    <string name="widget_toDo">Tarefas diárias</string>
+    <string name="dailyToDoWidgetTitle">Tarefas diárias</string>
+    <string name="todoWidget_showCompleted">Mostrar concluídos</string>
+    <string name="todoWidget_emptyTitle">Por agora, está tudo pronto!</string>
+    <string name="todoWidget_emptyMessage">Parece que você está livre hoje.\nDeseja adicionar algumas tarefas?</string>
+    <string name="todoWidget_addTodo">Adicionar tarefa</string>
+    <string name="todoWidget_errorTitle">Ops, algo deu errado.</string>
+    <string name="todoWidget_errorMessage">Não foi possível carregar suas tarefas.\nTente novamente ou volte mais tarde.</string>
+    <string name="todoWidget_refresh">Atualizar</string>
+    <string name="todoWidget_today">Hoje</string>
+    <string name="a11y_todoWidget_jumpToToday">Ir para hoje</string>
+    <string name="widgetSettings_widgetsColor">Cor principal do painel</string>
+    <string name="dashboard_globalAnnouncement">Anúncio global</string>
+    <string name="forecastWidget_currentWeek">Semana atual</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-pt-rPT/strings.xml b/libs/pandares/src/main/res/values-pt-rPT/strings.xml
index eea42ee043..036e322d7b 100644
--- a/libs/pandares/src/main/res/values-pt-rPT/strings.xml
+++ b/libs/pandares/src/main/res/values-pt-rPT/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Falha no envio</string>
     <string name="submissionStatusFailedSubtitle">Toque para ver detalhes</string>
     <string name="submissionAndRubric">Submissão e Rubrica</string>
+    <string name="submissionAndFeedback">Submissão e Feedback</string>
     <string name="commentsAndRubric">Comentários &amp; Rubrica</string>
     <string name="errorLoadingAssignment">Ocorreu um problema ao carregar esta tarefa. É favor verificar sua conexão e tente novamente.</string>
     <string name="submitted">Submetido</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Hoje</string>
+    <string name="tomorrow">Amanhã</string>
     <string name="past">Passado</string>
     <string name="noDate">Sem data</string>
     <string name="future">Futuro</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monólogo</string>
     <string name="noItemsToDisplayShort">Sem itens para apresentar</string>
     <string name="Todo">A Fazer</string>
+    <string name="TodoNew">A fazer</string>
     <string name="todoFilter">Filtrar Disciplinas</string>
     <string name="filterByEllipsis">Filtrar por&#8230;</string>
     <string name="favoriteCoursesLabel">Disciplinas preferidas</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupos</string>
     <string name="groupMembers">Membros do grupo</string>
 
+    <string name="messageGroup">Grupo de mensagens</string>
     <string name="loading">A carregar&#8230;</string>
     <string name="select_item_to_display">Selecione da lista</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">A Fazer</string>
+    <string name="todoWidgetTitleNew">A fazer</string>
     <string name="gradesWidgetTitle">Classificações</string>
     <string name="notificationWidgetTitle">Notificações</string>
     <string name="todoWidgetTitleLong">Canvas - A Fazer</string>
+    <string name="todoWidgetTitleLongNew">Canvas - A Fazer</string>
     <string name="gradesWidgetTitleLong">Canvas - Classificações</string>
     <string name="gradeWidgetTitleLong">Pano - Nota</string>
     <string name="notificationWidgetTitleLong">Canvas - Notificações</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Disciplinas</string>
     <string name="toDoList">Lista A Fazer</string>
+    <string name="toDoListNew">Lista A Fazer</string>
+
     <string name="notifications">Notificações</string>
     <string name="pushNotifications">Notificações Push</string>
     <string name="pushNotificationsError">As notificações de envio não foram registradas para este dispositivo.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Abrir Speedgrader</string>
 
-    <string name="search_todo">afazer a fazer afazer lista a fazer</string>
     <string name="search_course">disciplina disciplinas turma turmas</string>
     <string name="search_grades">classificação classificações</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">O título da página deve ser definido.</string>
     <string name="pageDetails">Detalhes da página</string>
     <string name="saving">A guardar</string>
+    <string name="speedGraderSaving">A guardar</string>
+    <string name="speedGraderSaved">Guardou</string>
+    <string name="speedGraderFailed">Falhou</string>
+    <string name="speedGraderSaveErrorTitle">Oops algo correu mal</string>
+    <string name="speedGraderSaveErrorMessage">Ocorreu um erro ao guardar a sua modificação de nota. Pode tentar novamente ou tentar mais tarde.</string>
+    <string name="speedGraderSaveErrorContentDescription">Falha ao guardar a nota. Toque para obter detalhes.</string>
+
     <string name="confirmDeleteEvent">Tem a certeza que deseja apagar este evento?</string>
     <string name="conferencesNotSupported">Conferências ainda não são suportadas no telemóvel.</string>
     <string name="filePreviewContentDescription">Imagem de pré-visualização de ficheiro</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Gravações</string>
     <string name="conferenceInProgress">Conferência em curso</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Conferências (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Conferência em curso</string>
+    <string name="conferencesWidgetDismissed">Conferência encerrada</string>
     <string name="a11y_criterion_content_description">Critério de classificação %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">mais informações</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s item a fazer</item>
         <item quantity="other">%s itens a fazer</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s item a fazer</item>
+        <item quantity="other">%s itens a fazer</item>
+    </plurals>
     <string name="noAnnotationSelected">Nenhuma anotação selecionada</string>
     <string name="emailNotifications">Notificações de Email</string>
     <string name="emailNotificationsImmediately">Imediatamente</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Nenhum evento hoje!</string>
     <string name="calendarNoEventsDescription">Parece um ótimo dia para descansar, relaxar e recarregar.</string>
     <string name="userCalendarToDo">A Fazer</string>
+    <string name="userCalendarToDoNew">A fazer</string>
     <string name="courseToDo">%s Tarefa</string>
+    <string name="courseToDoNew">%s a fazer</string>
     <string name="calendarEventExcused">Desculpado</string>
     <string name="calendarEventMissing">Em falta</string>
     <string name="calendarEventGraded">Classificado</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Evento %s criado com êxito.</string>
     <string name="a11y_eventUpdatedAnnouncement">Evento %s atualizado com êxito.</string>
     <string name="a11y_toDoCreatedAnnouncement">Para fazer %s criado com êxito.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">A fazer %s criado com êxito.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Para fazer %s atualização com êxito.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">A fazer %s atualizado com êxito.</string>
     <string name="todoScreenTitle">A Fazer</string>
+    <string name="todoScreenTitleNew">A fazer</string>
     <string name="todoDateLabel">Data</string>
     <string name="todoDescriptionLabel">Descrição</string>
     <string name="todoDeleteConfirmationTitle">Apagar A Fazer?</string>
+    <string name="todoDeleteConfirmationTitleNew">Eliminar tarefa?</string>
     <string name="todoDeleteConfirmationText">Isto elimina permanentemente o item A fazer.</string>
+    <string name="todoDeleteConfirmationTextNew">Isto elimina permanentemente o item A fazer.</string>
     <string name="todoDeleteErrorMessage">Houve um erro ao eliminar esta Tarefa É favor verificar sua conexão e tente novamente.</string>
+    <string name="todoDeleteErrorMessageNew">Ocorreu um erro ao eliminar esta tarefa. Por favor verifique a sua ligação e tente novamente.</string>
     <string name="createTodoScreenTitle">Novo para fazer</string>
+    <string name="createTodoScreenTitleNew">Nova tarefa</string>
     <string name="editTodoScreenTitle">Editar para fazer</string>
+    <string name="editTodoScreenTitleNew">Editar tarefa</string>
     <string name="createToDoTitleHint">Adicionar título</string>
     <string name="createToDoDateLabel">Data</string>
     <string name="createToDoTimeLabel">Hora</string>
     <string name="createToDoCalendarLabel">Calendário</string>
     <string name="createToDoDetailsLabel">Detalhes</string>
     <string name="todoSaveErrorMessage">Ocorreu um erro ao guardar esta Tarefa. É favor verificar sua conexão e tente novamente.</string>
+    <string name="todoSaveErrorMessageNew">Ocorreu um erro ao guardar esta tarefa. Por favor verifique a sua ligação e tente novamente.</string>
     <string name="selectCalendarScreenTitle">Selecionar calendário</string>
     <string name="errorContentRetryButton">Tentar novamente</string>
     <string name="eventLocationLabel">Local</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Detalhes</string>
     <string name="errorLoadingEvent">Ocorreu um problema ao carregar este evento. É favor verificar sua conexão e tente novamente.</string>
     <string name="errorLoadingTodo">Houve um problema ao carregar esta ação. É favor verificar sua conexão e tente novamente.</string>
+    <string name="errorLoadingTodoNew">Ocorreu um problema ao carregar esta tarefa. Por favor verifique a sua ligação e tente novamente.</string>
     <string name="eventDeleteConfirmationTitle">Eliminar evento?</string>
     <string name="eventDeleteConfirmationText">Isto irá eliminar permanentemente o seu evento.</string>
     <string name="eventDeleteErrorMessage">Houve um erro ao eliminar seu evento É favor verificar sua conexão e tente novamente.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Todos os eventos</string>
     <string name="eventDeleteScopeFollowing">Este e todos os eventos seguintes</string>
     <string name="calendarAddToDo">Adicionar A Fazer</string>
+    <string name="calendarAddToDoNew">Adicionar tarefa</string>
     <string name="calendarAddEvent">Adicionar evento</string>
     <string name="createEventScreenTitle">Novo Evento</string>
     <string name="editEventScreenTitle">Editar evento</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Vamos iniciar sessão!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Para ver as suas tarefas, inicie sessão na sua conta na app. É só um segundo!</string>
     <string name="a11y_widgetToDoOpenToDoList">Abrir ecrã da lista de tarefas</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Abrir ecrã da lista de tarefas</string>
     <string name="a11y_widgetToDoCreateNewToDo">Criar nova tarefa</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Criar nova tarefa</string>
     <string name="widgetGradesErrorSubtitle">Estamos com problemas para mostrar as suas notas no momento. Tente novamente em alguns instantes ou aceda à app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Para ver as suas notas, inicie sessão na sua conta na aplicação. É só um segundo!</string>
     <string name="widgetSingleGradeErrorSubtitle">Estamos com problemas para mostrar as suas notas neste momento.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Vamos escolher uma disciplina</string>
     <string name="widgetGradesErrorLoadingCourses">Ocorreu um erro ao carregar as disciplinas.</string>
     <string name="settingsSwitchExperience">Mudar para Canvas Career</string>
+    <string name="forecastWidgetTitle">Resumo semanal</string>
+    <string name="forecastWidgetWeekPeriod">Semana %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Em falta</string>
+    <string name="forecastWidgetDue">Data de vencimento</string>
+    <string name="forecastWidgetRecentGrades">Novas classificações</string>
+    <string name="forecastWidgetGradeWeight">%d%% da nota final</string>
+    <string name="forecastWidgetErrorMessage">Estamos com dificuldades para carregar as suas tarefas. É favor verificar sua conexão e tente novamente.</string>
+    <string name="forecastWidgetEmptyMissing">Não há tarefas em falta. Você é pego!</string>
+    <string name="forecastWidgetEmptyDue">Não há tarefas para esta semana.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Nenhuma nota nova nesta semana.</string>
+    <string name="a11y_contentDescription_previousWeek">Semana anterior</string>
+    <string name="a11y_contentDescription_nextWeek">Próxima semana</string>
+
     <string name="speedGraderGradeTabTitle">Nota &amp; Rubrica</string>
     <string name="speedGraderDetailsTabTitle">Detalhes</string>
     <string name="a11y_contentDescription_expandPanel">Expandir painel</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Ocorreu um erro ao carregar os seus itens A fazer. É favor verificar sua conexão e tente novamente.</string>
     <string name="errorUpdatingToDo">Ocorreu um erro ao atualizar o item A fazer. É favor verificar sua conexão e tente novamente.</string>
     <string name="noToDosForNow">Nenhuma tarefa por enquanto!</string>
+    <string name="noToDosForNowNew">Nenhuma tarefa por enquanto!</string>
     <string name="noToDosForNowSubtext">Parece ser um ótimo momento para descansar, relaxar e recarregar as energias.</string>
     <string name="todoSwipeDone">Concluído</string>
     <string name="todoSwipeUndo">Desfazer</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Lista de tarefas Preferências</string>
+    <string name="todoFilterPreferencesNew">Lista de tarefas Preferências</string>
     <string name="todoFilterVisibleItems">Itens visíveis</string>
     <string name="todoFilterShowPersonalToDos">Mostrar tarefas pessoais</string>
+    <string name="todoFilterShowPersonalToDosNew">Mostrar tarefas pessoais</string>
     <string name="todoFilterShowCalendarEvents">Mostrar eventos do calendário</string>
     <string name="todoFilterShowCompleted">Mostrar concluídas</string>
     <string name="todoFilterFavoriteCoursesOnly">Apenas cursos favoritos</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Recusar convite</string>
     <string name="courseInvitationDeclineConfirmMessage">Tem a certeza de que deseja recusar o convite para %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Progresso</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Bom dia, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Olá, %s</string>
 
+    <string name="courses_and_groups">Disciplinas e grupos</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Personalizar painel</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Alterar o layout do painel</string>
     <string name="changing_dashboard_layout_message">Para alterar o layout do painel, é necessário reiniciar a aplicação</string>
     <string name="restart_now">Reiniciar agora</string>
+    <string name="turn_on_new_dashboard">Ativar o novo painel</string>
     <string name="switched_back">Voltou ao layout anterior?</string>
     <string name="switched_back_message">Obrigado por experimentar o novo painel! Pode dizer-nos por que voltou ao layout anterior?</string>
+    <string name="survey_option_hard_to_find">Difícil encontrar coisas</string>
+    <string name="survey_option_prefer_old_layout">Prefiro o layout antigo</string>
+    <string name="survey_option_something_broken">Algo não funcionou corretamente</string>
     <string name="what_could_we_improve">O que podemos melhorar?</string>
+    <string name="what_do_you_think_of_new_dashboard">O que você acha do novo painel?</string>
+    <string name="let_us_know">Informe-nos!</string>
+    <string name="no_app_to_handle_link">Não há aplicação disponível para abrir esta ligação</string>
     <string name="skip">Saltar</string>
     <string name="widget_setting_show_greeting">Mostrar saudação</string>
     <string name="background_color">Cor de fundo</string>
+    <string name="widget_setting_show_grades">Notas da disciplina</string>
+    <string name="widget_setting_show_color_overlay">Sobreposição de cores da disciplina</string>
     <string name="offline_content_available">Conteúdo offline disponível</string>
     <string name="a11y_contentDescription_moreOptions">Mais opções</string>
     <string name="customizeCourse">Personalizar disciplina</string>
     <string name="favoriteCoursesAndGroups">Disciplinas e grupos favoritos</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">As ferramentas externas não estão disponíveis off-line.</string>
+    <string name="widget_weekly_summary">Resumo semanal</string>
+
+    <string name="dashboardCourseNickname">Nome de registo</string>
+    <string name="dashboardCourseNicknameHint">Escreva aqui o apelido da disciplina</string>
+    <string name="dashboardCourseColor">Cor da disciplina</string>
+    <string name="widget_toDo">Tarefa diária</string>
+    <string name="dailyToDoWidgetTitle">Tarefa diária</string>
+    <string name="todoWidget_showCompleted">Mostrar concluídas</string>
+    <string name="todoWidget_emptyTitle">Você já terminou por agora! </string>
+    <string name="todoWidget_emptyMessage">Parece que está livre hoje.\nQuer adicionar algumas tarefas?</string>
+    <string name="todoWidget_addTodo">Adicionar tarefa</string>
+    <string name="todoWidget_errorTitle">Oops, algo correu mal</string>
+    <string name="todoWidget_errorMessage">Não foi possível carregar as suas tarefas.\nTente novamente ou volte mais tarde.</string>
+    <string name="todoWidget_refresh">Atualizar</string>
+    <string name="todoWidget_today">Hoje</string>
+    <string name="a11y_todoWidget_jumpToToday">Ir para hoje</string>
+    <string name="widgetSettings_widgetsColor">Painel Cor principal</string>
+    <string name="dashboard_globalAnnouncement">Anúncio global</string>
+    <string name="forecastWidget_currentWeek">Semana atual</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-ru/strings.xml b/libs/pandares/src/main/res/values-ru/strings.xml
index 6e5f008d13..7786ba9635 100644
--- a/libs/pandares/src/main/res/values-ru/strings.xml
+++ b/libs/pandares/src/main/res/values-ru/strings.xml
@@ -48,6 +48,7 @@
     <string name="submissionStatusFailedTitle">Ошибка отправки</string>
     <string name="submissionStatusFailedSubtitle">Нажмите для просмотра подробностей</string>
     <string name="submissionAndRubric">Предоставление и рубрика</string>
+    <string name="submissionAndFeedback">Отправка и обратная связь</string>
     <string name="commentsAndRubric">Комментарии и рубрика</string>
     <string name="errorLoadingAssignment">Возникла проблема при загрузке данного задания. Проверьте подключение и попробуйте еще раз.</string>
     <string name="submitted">Отправлено</string>
@@ -229,6 +230,7 @@
 
     <!-- Date strings -->
     <string name="today">Сегодня</string>
+    <string name="tomorrow">Завтра</string>
     <string name="past">Прошлый</string>
     <string name="noDate">Дата отсутствует</string>
     <string name="future">Будущее</string>
@@ -301,6 +303,7 @@
     <string name="monologue">Монолог</string>
     <string name="noItemsToDisplayShort">Нет элементов для отображения</string>
     <string name="Todo">Задачи</string>
+    <string name="TodoNew">Задача</string>
     <string name="todoFilter">Фильтровать курсы</string>
     <string name="filterByEllipsis">Фильтровать по&#8230;</string>
     <string name="favoriteCoursesLabel">Избранные курсы</string>
@@ -496,6 +499,7 @@
     <string name="groups">Группы</string>
     <string name="groupMembers">Члены группы</string>
 
+    <string name="messageGroup">Сообщение группы</string>
     <string name="loading">Загрузка&#8230;</string>
     <string name="select_item_to_display">Выбрать из списка</string>
 
@@ -712,9 +716,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Задачи</string>
+    <string name="todoWidgetTitleNew">Задача</string>
     <string name="gradesWidgetTitle">Оценки</string>
     <string name="notificationWidgetTitle">Уведомления</string>
     <string name="todoWidgetTitleLong">Canvas - задачи</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Задача</string>
     <string name="gradesWidgetTitleLong">Canvas - Оценки</string>
     <string name="gradeWidgetTitleLong">Canvas - Оценка</string>
     <string name="notificationWidgetTitleLong">Canvas - Уведомления</string>
@@ -750,6 +756,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Курсы</string>
     <string name="toDoList">Список текущих задач</string>
+    <string name="toDoListNew">Список текущих задач</string>
+
     <string name="notifications">Уведомления</string>
     <string name="pushNotifications">Push-уведомления</string>
     <string name="pushNotificationsError">Для данного устройства не было зарегистрировано ни одного push-уведомления.</string>
@@ -764,7 +772,6 @@
 
     <string name="launchSpeedgrader">Открыть Speedgrader</string>
 
-    <string name="search_todo">для выполнения выполнить список заданий список задач</string>
     <string name="search_course">курс курсы класс классы</string>
     <string name="search_grades">оценка оценки</string>
 
@@ -1113,6 +1120,13 @@
     <string name="pageTitleMustBeSet">Необходимо задать заголовок страницы.</string>
     <string name="pageDetails">Данные страницы</string>
     <string name="saving">Выполняется сохранение</string>
+    <string name="speedGraderSaving">Выполняется сохранение</string>
+    <string name="speedGraderSaved">Сохранено</string>
+    <string name="speedGraderFailed">Сбой</string>
+    <string name="speedGraderSaveErrorTitle">Ой, что-то пошло не так</string>
+    <string name="speedGraderSaveErrorMessage">Произошла ошибка при сохранении вашего изменения оценки. Вы можете повторить попытку или попробовать позже.</string>
+    <string name="speedGraderSaveErrorContentDescription">Не удалось сохранить оценку. Нажмите для получения подробных сведений.</string>
+
     <string name="confirmDeleteEvent">Вы действительно хотите удалить это событие?</string>
     <string name="conferencesNotSupported">Конференции еще не поддерживаются на мобильных устройствах.</string>
     <string name="filePreviewContentDescription">Изображение для предварительного просмотра</string>
@@ -1267,6 +1281,10 @@
     <string name="recordings">Записи</string>
     <string name="conferenceInProgress">Идет конференция</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Конференции (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Идет конференция</string>
+    <string name="conferencesWidgetDismissed">Конференция отклонена</string>
     <string name="a11y_criterion_content_description">Оценка критерия %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">дополнительная информация</string>
@@ -1423,6 +1441,12 @@
         <item quantity="many">%s элемента(-ов) задачи</item>
         <item quantity="other">%s элемента(-ов) задачи</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s элемент задачи</item>
+        <item quantity="few">%s элементов задачи</item>
+        <item quantity="many">%s элементов задачи</item>
+        <item quantity="other">%s элементов задачи</item>
+    </plurals>
     <string name="noAnnotationSelected">Аннотация не выбрана</string>
     <string name="emailNotifications">Уведомления по электронной почте</string>
     <string name="emailNotificationsImmediately">Немедленно</string>
@@ -1719,7 +1743,9 @@
     <string name="calendarNoEvents">На сегодня события отсутствуют!</string>
     <string name="calendarNoEventsDescription">Похоже, что сегодня можно отдохнуть, расслабиться и набраться сил.</string>
     <string name="userCalendarToDo">Задачи</string>
+    <string name="userCalendarToDoNew">Задача</string>
     <string name="courseToDo">Задача %s</string>
+    <string name="courseToDoNew">%s задача</string>
     <string name="calendarEventExcused">По уважительной причине</string>
     <string name="calendarEventMissing">Отсутствует</string>
     <string name="calendarEventGraded">С оценкой</string>
@@ -1744,21 +1770,30 @@
     <string name="a11y_eventCreatedAnnouncement">Событие %s успешно создано.</string>
     <string name="a11y_eventUpdatedAnnouncement">Событие %s успешно обновлено.</string>
     <string name="a11y_toDoCreatedAnnouncement">Задание %s успешно создано.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Задача %s была успешно создана.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Задание %s успешно обновлено.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Задача %s была успешно обновлена.</string>
     <string name="todoScreenTitle">Задачи</string>
+    <string name="todoScreenTitleNew">Задача</string>
     <string name="todoDateLabel">Дата</string>
     <string name="todoDescriptionLabel">Описание</string>
     <string name="todoDeleteConfirmationTitle">Удалить список задач?</string>
+    <string name="todoDeleteConfirmationTitleNew">Удалить задачу?</string>
     <string name="todoDeleteConfirmationText">Это приведет к окончательному удалению пункта Задачи.</string>
+    <string name="todoDeleteConfirmationTextNew">Это приведет к окончательному удалению задачи.</string>
     <string name="todoDeleteErrorMessage">Произошла ошибка при удалении этой задачи. Проверьте подключение и попробуйте еще раз.</string>
+    <string name="todoDeleteErrorMessageNew">Возникла ошибка при сохранении этой задачи. Проверьте подключение и повторите попытку.</string>
     <string name="createTodoScreenTitle">Новая задача</string>
+    <string name="createTodoScreenTitleNew">Новая задача</string>
     <string name="editTodoScreenTitle">Задача редактирования</string>
+    <string name="editTodoScreenTitleNew">Редактировать задачу</string>
     <string name="createToDoTitleHint">Добавить заголовок</string>
     <string name="createToDoDateLabel">Дата</string>
     <string name="createToDoTimeLabel">Время</string>
     <string name="createToDoCalendarLabel">Календарь</string>
     <string name="createToDoDetailsLabel">Подробные сведения</string>
     <string name="todoSaveErrorMessage">Произошла ошибка при сохранении этой задачи. Проверьте подключение и попробуйте еще раз.</string>
+    <string name="todoSaveErrorMessageNew">Возникла ошибка при сохранении этой задачи. Проверьте подключение и повторите попытку.</string>
     <string name="selectCalendarScreenTitle">Выбрать календарь</string>
     <string name="errorContentRetryButton">Повторить</string>
     <string name="eventLocationLabel">Местоположение</string>
@@ -1766,6 +1801,7 @@
     <string name="eventDetailsLabel">Подробные сведения</string>
     <string name="errorLoadingEvent">Возникла проблема при загрузке этого события. Проверьте подключение и попробуйте еще раз.</string>
     <string name="errorLoadingTodo">Возникла проблема при загрузке этого задания. Проверьте подключение и попробуйте еще раз.</string>
+    <string name="errorLoadingTodoNew">Возникла проблема при загрузке этой задачи. Проверьте подключение и повторите попытку.</string>
     <string name="eventDeleteConfirmationTitle">Удалить Событие?</string>
     <string name="eventDeleteConfirmationText">Это приведет к необратимому удалению вашего события.</string>
     <string name="eventDeleteErrorMessage">Произошла ошибка при удалении этого события. Проверьте подключение и попробуйте еще раз.</string>
@@ -1784,6 +1820,7 @@
     <string name="eventDeleteScopeAll">Все события</string>
     <string name="eventDeleteScopeFollowing">Это и все последующие события</string>
     <string name="calendarAddToDo">Добавить в задачи</string>
+    <string name="calendarAddToDoNew">Добавить задачу</string>
     <string name="calendarAddEvent">Добавить Событие</string>
     <string name="createEventScreenTitle">Новое Событие</string>
     <string name="editEventScreenTitle">Редактировать Событие</string>
@@ -2174,7 +2211,9 @@
     <string name="widgetNotLoggedInTitle">Давайте войдем в систему!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Чтобы увидеть свои задачи, войдите в свою учетную запись в приложении. Это займет всего секунду!</string>
     <string name="a11y_widgetToDoOpenToDoList">Открыть окно со списком задач</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Открыть окно списка задач</string>
     <string name="a11y_widgetToDoCreateNewToDo">Создать новую задачу</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Создать новую задачу</string>
     <string name="widgetGradesErrorSubtitle">В настоящее время у нас возникли проблемы с отображением ваших оценок. Попробуйте снова через некоторое время или перейдите в приложение.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Чтобы увидеть свои оценки, войдите в свою учетную запись в приложении. Это займет всего секунду!</string>
     <string name="widgetSingleGradeErrorSubtitle">В настоящее время у нас возникли проблемы с отображением ваших оценок.</string>
@@ -2182,6 +2221,19 @@
     <string name="widgetSingleGradeSelectCourse">Давайте выберем курс</string>
     <string name="widgetGradesErrorLoadingCourses">Произошла ошибка при загрузке курсов.</string>
     <string name="settingsSwitchExperience">Переключение на Canvas Career</string>
+    <string name="forecastWidgetTitle">Еженедельная сводка</string>
+    <string name="forecastWidgetWeekPeriod">Неделя %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Отсутствует</string>
+    <string name="forecastWidgetDue">Срок</string>
+    <string name="forecastWidgetRecentGrades">Новые оценки</string>
+    <string name="forecastWidgetGradeWeight">%d%% итоговой оценки</string>
+    <string name="forecastWidgetErrorMessage">У нас возникла проблема с загрузкой вашего задания Проверьте подключение и попробуйте еще раз.</string>
+    <string name="forecastWidgetEmptyMissing">Нет отсутствующих заданий. Вы все нагнали!</string>
+    <string name="forecastWidgetEmptyDue">Нет заданий, подлежащих выполнению на этой неделе.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Нет новых оценок на этой неделе.</string>
+    <string name="a11y_contentDescription_previousWeek">Предыдущая неделя</string>
+    <string name="a11y_contentDescription_nextWeek">Следующая неделя</string>
+
     <string name="speedGraderGradeTabTitle">Класс и рубрика</string>
     <string name="speedGraderDetailsTabTitle">Подробные сведения</string>
     <string name="a11y_contentDescription_expandPanel">Развернуть панель</string>
@@ -2264,6 +2316,7 @@
     <string name="errorLoadingToDos">Произошла ошибка при загрузке ваших задач. Проверьте подключение и попробуйте еще раз.</string>
     <string name="errorUpdatingToDo">Произошла ошибка при обновлении задачи. Проверьте подключение и попробуйте еще раз.</string>
     <string name="noToDosForNow">Нет задач на данный момент!</string>
+    <string name="noToDosForNowNew">Нет задач на данный момент!</string>
     <string name="noToDosForNowSubtext">Похоже, что можно отдохнуть, расслабиться и набраться сил.</string>
     <string name="todoSwipeDone">Готово</string>
     <string name="todoSwipeUndo">Отменить</string>
@@ -2274,8 +2327,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Предпочтения списка задач</string>
+    <string name="todoFilterPreferencesNew">Предпочтительные настройки списка задач</string>
     <string name="todoFilterVisibleItems">Видимые позиции</string>
     <string name="todoFilterShowPersonalToDos">Показать персональные задачи</string>
+    <string name="todoFilterShowPersonalToDosNew">Показать персональные задачи</string>
     <string name="todoFilterShowCalendarEvents">Показать календарные события</string>
     <string name="todoFilterShowCompleted">Показать завершенные</string>
     <string name="todoFilterFavoriteCoursesOnly">Только избранные курсы</string>
@@ -2302,6 +2357,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Отклонить приглашение</string>
     <string name="courseInvitationDeclineConfirmMessage">Вы действительно хотите отклонить приглашение на %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Прогресс</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Доброе утро %s!</string>
@@ -2424,6 +2482,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Здравствуйте, %s</string>
 
+    <string name="courses_and_groups">Курсы и группы</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Настроить панель управления</string>
     <string name="dashboard_widgets">Виджеты</string>
@@ -2433,16 +2492,44 @@
     <string name="changing_dashboard_layout">Изменение компоновки панели управления</string>
     <string name="changing_dashboard_layout_message">Чтобы изменить компоновку панели управления, необходимо перезапустить приложение</string>
     <string name="restart_now">Перезапустить сейчас</string>
+    <string name="turn_on_new_dashboard">Включить новую панель инструментов</string>
     <string name="switched_back">Переключились обратно?</string>
     <string name="switched_back_message">Спасибо за использование новой панели управления! Не могли бы вы указать, почему вы переключились обратно?</string>
+    <string name="survey_option_hard_to_find">Трудно найти позиции</string>
+    <string name="survey_option_prefer_old_layout">Предпочитаю старую компоновку</string>
+    <string name="survey_option_something_broken">Что-то работает неправильно</string>
     <string name="what_could_we_improve">Что мы могли бы улучшить?</string>
+    <string name="what_do_you_think_of_new_dashboard">Что вы думаете о новой панели управления?</string>
+    <string name="let_us_know">Сообщите нам!</string>
+    <string name="no_app_to_handle_link">Нет доступного приложения для открытия этой ссылки</string>
     <string name="skip">Пропустить</string>
     <string name="widget_setting_show_greeting">Показать приветствие</string>
     <string name="background_color">Цвет фона</string>
+    <string name="widget_setting_show_grades">Оценки курса</string>
+    <string name="widget_setting_show_color_overlay">Наложение цветов курсов</string>
     <string name="offline_content_available">Доступно автономное содержимое</string>
     <string name="a11y_contentDescription_moreOptions">Дополнительные опции</string>
     <string name="customizeCourse">Настроить курс</string>
     <string name="favoriteCoursesAndGroups">Избранные курсы и группы</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Внешние инструменты недоступны в режиме офлайн.</string>
+    <string name="widget_weekly_summary">Еженедельная сводка</string>
+
+    <string name="dashboardCourseNickname">Ник</string>
+    <string name="dashboardCourseNicknameHint">Напишите краткое имя курса здесь</string>
+    <string name="dashboardCourseColor">Цвет курса</string>
+    <string name="widget_toDo">Ежедневная задача</string>
+    <string name="dailyToDoWidgetTitle">Ежедневная задача</string>
+    <string name="todoWidget_showCompleted">Показать завершенные</string>
+    <string name="todoWidget_emptyTitle">К настоящему времени вы все выполнили!</string>
+    <string name="todoWidget_emptyMessage">Похоже, у вас нет планов на этот день.\nХотите добавить несколько задач?</string>
+    <string name="todoWidget_addTodo">Добавить задачу</string>
+    <string name="todoWidget_errorTitle">Ой, что-то пошло не так</string>
+    <string name="todoWidget_errorMessage">Нам не удалось загрузить ваши задачи.\nПопробуйте еще раз или вернитесь позже.</string>
+    <string name="todoWidget_refresh">Обновить</string>
+    <string name="todoWidget_today">Сегодня</string>
+    <string name="a11y_todoWidget_jumpToToday">Перейти к сегодняшнему дню</string>
+    <string name="widgetSettings_widgetsColor">Основной цвета панели инструментов</string>
+    <string name="dashboard_globalAnnouncement">Общее объявление</string>
+    <string name="forecastWidget_currentWeek">Текущая неделя</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-sl/strings.xml b/libs/pandares/src/main/res/values-sl/strings.xml
index 2379bbf3df..ddfc0c6e85 100644
--- a/libs/pandares/src/main/res/values-sl/strings.xml
+++ b/libs/pandares/src/main/res/values-sl/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Oddaja ni uspela.</string>
     <string name="submissionStatusFailedSubtitle">Tapnite za ogled podrobnosti</string>
     <string name="submissionAndRubric">Oddaja in ocenjevalni vodnik</string>
+    <string name="submissionAndFeedback">Oddaja in povratne informacije</string>
     <string name="commentsAndRubric">Komentarji in ocenjevalni vodnik</string>
     <string name="errorLoadingAssignment">Prišlo je do težave z nalaganjem te naloge. Preverite svojo povezavo in poskusite znova.</string>
     <string name="submitted">Poslano</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Danes</string>
+    <string name="tomorrow">Jutri</string>
     <string name="past">Preteklo</string>
     <string name="noDate">Brez datuma</string>
     <string name="future">Prihodnje</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Samogovor</string>
     <string name="noItemsToDisplayShort">Ni elementov za prikaz.</string>
     <string name="Todo">Čakajoča opravila</string>
+    <string name="TodoNew">Opravilo</string>
     <string name="todoFilter">Filtriraj predmete</string>
     <string name="filterByEllipsis">Filtriraj po ...</string>
     <string name="favoriteCoursesLabel">Priljubljeni predmeti</string>
@@ -474,6 +477,7 @@
     <string name="groups">Skupine</string>
     <string name="groupMembers">Člani skupine</string>
 
+    <string name="messageGroup">Sporoči skupini</string>
     <string name="loading">Nalaganje&#8230;</string>
     <string name="select_item_to_display">Izberi s seznama</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Čakajoča opravila</string>
+    <string name="todoWidgetTitleNew">Opravilo</string>
     <string name="gradesWidgetTitle">Ocene</string>
     <string name="notificationWidgetTitle">Obvestila</string>
     <string name="todoWidgetTitleLong">Sistem Canvas – Čakajoča opravila</string>
+    <string name="todoWidgetTitleLongNew">Canvas – Čakajoča opravila</string>
     <string name="gradesWidgetTitleLong">Sistem Canvas – Ocene</string>
     <string name="gradeWidgetTitleLong">Canvas – Ocena</string>
     <string name="notificationWidgetTitleLong">Sistem Canvas – Obvestila</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Predmeti</string>
     <string name="toDoList">Čakajoča opravila</string>
+    <string name="toDoListNew">Seznam opravil</string>
+
     <string name="notifications">Obvestila</string>
     <string name="pushNotifications">Poslana obvestila</string>
     <string name="pushNotificationsError">Za to napravo ni registriranih poslanih obvestil.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Odpri aplikacijo SpeedGrader</string>
 
-    <string name="search_todo">Čakajoča opravila Čakajočaopravila seznamopravil seznam opravil seznami opravil seznam opravila</string>
     <string name="search_course">predmet predmeti razred razredi</string>
     <string name="search_grades">ocena ocene</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Nastavljen mora biti naslov strani.</string>
     <string name="pageDetails">Podrobnosti o strani</string>
     <string name="saving">Shranjevanje</string>
+    <string name="speedGraderSaving">Shranjevanje</string>
+    <string name="speedGraderSaved">Shranjeno</string>
+    <string name="speedGraderFailed">Neuspelo</string>
+    <string name="speedGraderSaveErrorTitle">Ups, nekaj se je zalomilo</string>
+    <string name="speedGraderSaveErrorMessage">Pri shranjevanju vaše spremembe ocene je prišlo do napake. Lahko poskusite znova ali pa poskusite znova pozneje.</string>
+    <string name="speedGraderSaveErrorContentDescription">Shranjevanje ocene ni uspelo. Za pomoč tapnite.</string>
+
     <string name="confirmDeleteEvent">Ali ste prepričani, da želite odstraniti ta dogodek?</string>
     <string name="conferencesNotSupported">Konference na mobilni napravi še niso podprte.</string>
     <string name="filePreviewContentDescription">Slika predogleda datoteke</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Snemanja</string>
     <string name="conferenceInProgress">V teku je konferenca</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konference (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">V teku je konferenca</string>
+    <string name="conferencesWidgetDismissed">Konferenca zaključena</string>
     <string name="a11y_criterion_content_description">Ocena merila %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">več informacij</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s element seznama opravil</item>
         <item quantity="other">%s elementov(-a/-i) seznama opravil</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s element seznama opravil</item>
+        <item quantity="other">%s elementov(-a/-i) seznama opravil</item>
+    </plurals>
     <string name="noAnnotationSelected">Izbrana ni nobena opomba</string>
     <string name="emailNotifications">E-poštno obveščanje</string>
     <string name="emailNotificationsImmediately">Takoj</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Danes ni dogodkov.</string>
     <string name="calendarNoEventsDescription">Videti je, da je to krasen dan za počitek, sprostitev in regeneracijo.</string>
     <string name="userCalendarToDo">Čakajoča opravila</string>
+    <string name="userCalendarToDoNew">Opravilo</string>
     <string name="courseToDo">%s Seznam opravil</string>
+    <string name="courseToDoNew">%s opravilo</string>
     <string name="calendarEventExcused">Opravičeno</string>
     <string name="calendarEventMissing">Manjkajoče</string>
     <string name="calendarEventGraded">Ocenjeno</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Dogodek %s uspešno ustvarjen.</string>
     <string name="a11y_eventUpdatedAnnouncement">Dogodek %s uspešno posodobljen.</string>
     <string name="a11y_toDoCreatedAnnouncement">Seznam opravil %s uspešno ustvarjen.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Opravilo %s uspešno ustvarjeno.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Seznam opravil %s uspešno posodobljen.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Opravilo %s uspešno posodobljeno.</string>
     <string name="todoScreenTitle">Čakajoča opravila</string>
+    <string name="todoScreenTitleNew">Opravilo</string>
     <string name="todoDateLabel">Datum</string>
     <string name="todoDescriptionLabel">Opis</string>
     <string name="todoDeleteConfirmationTitle">Izbriši seznam opravil?</string>
+    <string name="todoDeleteConfirmationTitleNew">Izbriši opravilo?</string>
     <string name="todoDeleteConfirmationText">To bo trajno izbrisalo vaš element seznama opravil.</string>
+    <string name="todoDeleteConfirmationTextNew">To bo trajno izbrisalo vaše opravilo.</string>
     <string name="todoDeleteErrorMessage">Prišlo je do napake pri brisanju tega seznama opravil. Preverite svojo povezavo in poskusite znova.</string>
+    <string name="todoDeleteErrorMessageNew">Pri brisanju tega opravila je prišlo do napake. Preverite povezavo in poskusite znova.</string>
     <string name="createTodoScreenTitle">Nov seznam opravil</string>
+    <string name="createTodoScreenTitleNew">Novo opravilo</string>
     <string name="editTodoScreenTitle">Uredi seznam opravil</string>
+    <string name="editTodoScreenTitleNew">Uredi opravilo</string>
     <string name="createToDoTitleHint">Dodaj naslov</string>
     <string name="createToDoDateLabel">Datum</string>
     <string name="createToDoTimeLabel">Čas</string>
     <string name="createToDoCalendarLabel">Koledar</string>
     <string name="createToDoDetailsLabel">Podrobnosti</string>
     <string name="todoSaveErrorMessage">Prišlo je do napake pri shranjevanju tega seznama opravil. Preverite svojo povezavo in poskusite znova.</string>
+    <string name="todoSaveErrorMessageNew">Pri shranjevanju tega opravila je prišlo do napake. Preverite povezavo in poskusite znova.</string>
     <string name="selectCalendarScreenTitle">Izberi koledar</string>
     <string name="errorContentRetryButton">Ponovno poskusi</string>
     <string name="eventLocationLabel">Mesto</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Podrobnosti</string>
     <string name="errorLoadingEvent">Prišlo je do težave z nalaganjem tega dogodka Preverite svojo povezavo in poskusite znova.</string>
     <string name="errorLoadingTodo">Prišlo je do težave z nalaganjem tega seznama opravil. Preverite svojo povezavo in poskusite znova.</string>
+    <string name="errorLoadingTodoNew">Pri nalaganju tega opravila je prišlo do težave. Preverite povezavo in poskusite znova.</string>
     <string name="eventDeleteConfirmationTitle">Izbriši dogodek?</string>
     <string name="eventDeleteConfirmationText">S tem boste trajno izbrisali svoj dogodek.</string>
     <string name="eventDeleteErrorMessage">Prišlo je do napake pri brisanju tega dogodka. Preverite svojo povezavo in poskusite znova.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Vsi dogodki</string>
     <string name="eventDeleteScopeFollowing">Ta in vsi naslednji dogodki</string>
     <string name="calendarAddToDo">Dodaj seznamu opravil</string>
+    <string name="calendarAddToDoNew">Dodaj opravilo</string>
     <string name="calendarAddEvent">Dodaj dogodek</string>
     <string name="createEventScreenTitle">Nov dogodek</string>
     <string name="editEventScreenTitle">Uredi dogodek</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Naj vas prijavimo!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Če si želite ogledati svoja opravila, se prijavite v svoj račun v aplikaciji. Trajalo bo le sekundo!</string>
     <string name="a11y_widgetToDoOpenToDoList">Odpri zaslon s seznamom opravil</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Odpri zaslon s seznamom opravil</string>
     <string name="a11y_widgetToDoCreateNewToDo">Ustvari nov seznam opravil</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Ustvari novo opravilo</string>
     <string name="widgetGradesErrorSubtitle">Trenutno imamo težave s prikazom vaših ocen. Poskusite znova čez nekaj časa ali pa uporabite aplikacijo.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Če si želite ogledati svoje ocene, se prijavite v svoj račun v aplikaciji. Trajalo bo le sekundo!</string>
     <string name="widgetSingleGradeErrorSubtitle">Trenutno imamo težave s prikazom vaših ocen.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Izberimo predmet</string>
     <string name="widgetGradesErrorLoadingCourses">Med nalaganjem predmetov je prišlo do napake.</string>
     <string name="settingsSwitchExperience">Preklopi na Canvas Career</string>
+    <string name="forecastWidgetTitle">Tedenski povzetek</string>
+    <string name="forecastWidgetWeekPeriod">Teden %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Manjkajoče</string>
+    <string name="forecastWidgetDue">Rok</string>
+    <string name="forecastWidgetRecentGrades">Nove ocene</string>
+    <string name="forecastWidgetGradeWeight">%d%% končne ocene</string>
+    <string name="forecastWidgetErrorMessage">Imamo težave pri nalaganju vaših nalog. Preverite svojo povezavo in poskusite znova.</string>
+    <string name="forecastWidgetEmptyMissing">Ni manjkajočih nalog. Seznanjeni ste z vsem.</string>
+    <string name="forecastWidgetEmptyDue">Ta teden nima roka nobena naloga.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Ta teden ni novih ocen.</string>
+    <string name="a11y_contentDescription_previousWeek">Prejšnji teden</string>
+    <string name="a11y_contentDescription_nextWeek">Naslednji teden</string>
+
     <string name="speedGraderGradeTabTitle">Ocena in ocenjevalni vodnik</string>
     <string name="speedGraderDetailsTabTitle">Podrobnosti</string>
     <string name="a11y_contentDescription_expandPanel">Razširi ploščo</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Pri nalaganju vaših opravil je prišlo do napake. Preverite svojo povezavo in poskusite znova.</string>
     <string name="errorUpdatingToDo">Pri posodabljanju elementa seznama opravil je prišlo do napake. Preverite svojo povezavo in poskusite znova.</string>
     <string name="noToDosForNow">Zaenkrat ni opravil!</string>
+    <string name="noToDosForNowNew">Zaenkrat ni opravil!</string>
     <string name="noToDosForNowSubtext">Videti je, da je to krasen čas za počitek, sprostitev in regeneracijo.</string>
     <string name="todoSwipeDone">Dokončano</string>
     <string name="todoSwipeUndo">Razveljavi</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Nastavitve seznama opravil</string>
+    <string name="todoFilterPreferencesNew">Nastavitve seznama opravil</string>
     <string name="todoFilterVisibleItems">Vidni elementi</string>
     <string name="todoFilterShowPersonalToDos">Prikaži osebna opravila</string>
+    <string name="todoFilterShowPersonalToDosNew">Prikaži osebna opravila</string>
     <string name="todoFilterShowCalendarEvents">Prikaži dogodke koledarja</string>
     <string name="todoFilterShowCompleted">Prikaži končano</string>
     <string name="todoFilterFavoriteCoursesOnly">Samo najljubši predmeti</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Zavrni vabilo</string>
     <string name="courseInvitationDeclineConfirmMessage">Ali ste prepričani, da želite zavrniti vabilo za %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Napredek</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Dobro jutro, %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Pozdravljeni, %s</string>
 
+    <string name="courses_and_groups">Predmeti in skupine</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Prilagodi nadzorno ploščo</string>
     <string name="dashboard_widgets">Pripomočki</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Sprememba postavitve nadzorne plošče</string>
     <string name="changing_dashboard_layout_message">Če želite spremeniti postavitev nadzorne plošče, morate znova zagnati aplikacijo</string>
     <string name="restart_now">Znova zaženi zdaj</string>
+    <string name="turn_on_new_dashboard">Vklopite novo nadzorno ploščo</string>
     <string name="switched_back">Preklopljeno nazaj?</string>
     <string name="switched_back_message">Hvala za preskus nove nadzorne plošče! Nam lahko poveste, zakaj ste preklopili nazaj?</string>
+    <string name="survey_option_hard_to_find">Težko je najti stvari</string>
+    <string name="survey_option_prefer_old_layout">Raje imam staro postavitev</string>
+    <string name="survey_option_something_broken">Nekaj ni delovalo prav</string>
     <string name="what_could_we_improve">Kaj bi lahko izboljšali?</string>
+    <string name="what_do_you_think_of_new_dashboard">Kaj menite o novi nadzorni plošči?</string>
+    <string name="let_us_know">Sporočite nam!</string>
+    <string name="no_app_to_handle_link">Ni na voljo aplikacije za odpiranje te povezave</string>
     <string name="skip">Preskoči</string>
     <string name="widget_setting_show_greeting">Pokaži pozdrav</string>
     <string name="background_color">Barva ozadja</string>
+    <string name="widget_setting_show_grades">Ocene pri predmetu</string>
+    <string name="widget_setting_show_color_overlay">Prekrivanje barve predmeta</string>
     <string name="offline_content_available">Na voljo vsebina brez povezave</string>
     <string name="a11y_contentDescription_moreOptions">Dodatne možnosti</string>
     <string name="customizeCourse">Prilagodi predmet po meri</string>
     <string name="favoriteCoursesAndGroups">Priljubljeni predmeti in skupine</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Zunanja orodja niso na voljo brez povezave.</string>
+    <string name="widget_weekly_summary">Tedenski povzetek</string>
+
+    <string name="dashboardCourseNickname">Vzdevek</string>
+    <string name="dashboardCourseNicknameHint">Tukaj napišite vzdevek predmeta</string>
+    <string name="dashboardCourseColor">Barva predmeta</string>
+    <string name="widget_toDo">Dnevna opravila</string>
+    <string name="dailyToDoWidgetTitle">Dnevna opravila</string>
+    <string name="todoWidget_showCompleted">Prikaži končano</string>
+    <string name="todoWidget_emptyTitle">Zaenkrat ste končali!</string>
+    <string name="todoWidget_emptyMessage">Zdi se, da ste danes prosti.\nŽelite dodati nekaj opravil?</string>
+    <string name="todoWidget_addTodo">Dodaj opravilo</string>
+    <string name="todoWidget_errorTitle">Ups, nekaj je narobe</string>
+    <string name="todoWidget_errorMessage">Vaših opravil ni bilo mogoče naložiti.\nPoskusite znova ali se vrnite pozneje.</string>
+    <string name="todoWidget_refresh">Osveži</string>
+    <string name="todoWidget_today">Danes</string>
+    <string name="a11y_todoWidget_jumpToToday">Preskoči na danes</string>
+    <string name="widgetSettings_widgetsColor">Glavna barva nadzorne plošče</string>
+    <string name="dashboard_globalAnnouncement">Splošno obvestilo</string>
+    <string name="forecastWidget_currentWeek">Tekoči teden</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-sv/strings.xml b/libs/pandares/src/main/res/values-sv/strings.xml
index 4836c9cde5..b6b0a2d33e 100644
--- a/libs/pandares/src/main/res/values-sv/strings.xml
+++ b/libs/pandares/src/main/res/values-sv/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Inlämningen misslyckades</string>
     <string name="submissionStatusFailedSubtitle">Tryck för att visa detaljer</string>
     <string name="submissionAndRubric">Inlämning och matris</string>
+    <string name="submissionAndFeedback">Inlämning och feedback</string>
     <string name="commentsAndRubric">Kommentarer och matris</string>
     <string name="errorLoadingAssignment">Ett problem uppstod vid inläsningen av den här uppgiften. Kontrollera din anslutning och försök igen.</string>
     <string name="submitted">Skickad</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Idag</string>
+    <string name="tomorrow">I morgon</string>
     <string name="past">Tidigare</string>
     <string name="noDate">Inget datum</string>
     <string name="future">Framtida</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Monolog</string>
     <string name="noItemsToDisplayShort">Inga objekt att visa</string>
     <string name="Todo">Att göra</string>
+    <string name="TodoNew">Att göra</string>
     <string name="todoFilter">Filtrera kurser</string>
     <string name="filterByEllipsis">Filtrera efter ...</string>
     <string name="favoriteCoursesLabel">Favoritkurser</string>
@@ -474,6 +477,7 @@
     <string name="groups">Grupper</string>
     <string name="groupMembers">Gruppmedlemmar</string>
 
+    <string name="messageGroup">Meddelandegrupp</string>
     <string name="loading">Laddar&#8230;</string>
     <string name="select_item_to_display">Välj från listan</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Att göra</string>
+    <string name="todoWidgetTitleNew">Att göra</string>
     <string name="gradesWidgetTitle">Omdömen</string>
     <string name="notificationWidgetTitle">Aviseringar</string>
     <string name="todoWidgetTitleLong">Canvas - Att göra</string>
+    <string name="todoWidgetTitleLongNew">Canvas – Att göra</string>
     <string name="gradesWidgetTitleLong">Canvas - Omdömen</string>
     <string name="gradeWidgetTitleLong">Canvas – omdöme</string>
     <string name="notificationWidgetTitleLong">Canvas - Aviseringar</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Kurser</string>
     <string name="toDoList">Att göra-lista</string>
+    <string name="toDoListNew">Att göra-lista</string>
+
     <string name="notifications">Aviseringar</string>
     <string name="pushNotifications">Pushmeddelanden</string>
     <string name="pushNotificationsError">Pushmeddelanden har inte registrerats för den här enheten.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Öppna Speedgrader</string>
 
-    <string name="search_todo">att göra att göra lista</string>
     <string name="search_course">kurs kurser klass klasser</string>
     <string name="search_grades">omdöme omdömen</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Sidrubrik måste anges.</string>
     <string name="pageDetails">Sidinformation</string>
     <string name="saving">Sparar</string>
+    <string name="speedGraderSaving">Sparar</string>
+    <string name="speedGraderSaved">Sparad</string>
+    <string name="speedGraderFailed">Misslyckad</string>
+    <string name="speedGraderSaveErrorTitle">Hoppsan, något gick fel</string>
+    <string name="speedGraderSaveErrorMessage">Ett fel inträffade när din ändring av omdömet sparades. Du kan försöka igen, eller vänta till senare.</string>
+    <string name="speedGraderSaveErrorContentDescription">Det gick inte att spara omdömet. Tryck för information</string>
+
     <string name="confirmDeleteEvent">Vill du ta bort den här händelsen?</string>
     <string name="conferencesNotSupported">Konferenser stöds ännu inte på den här mobilen.</string>
     <string name="filePreviewContentDescription">Förhandsvisningsbild för fil</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Inspelningar</string>
     <string name="conferenceInProgress">Konferens pågår...</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Konferenser (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Konferens pågår...</string>
+    <string name="conferencesWidgetDismissed">Konferensen avvisades</string>
     <string name="a11y_criterion_content_description">Kriteriebedömning %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">mer information</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s att göra-objekt</item>
         <item quantity="other">%s att göra-objekt</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s att göra-objekt</item>
+        <item quantity="other">%s att göra-objekt</item>
+    </plurals>
     <string name="noAnnotationSelected">Inga noteringar har valts</string>
     <string name="emailNotifications">E-postaviseringar</string>
     <string name="emailNotificationsImmediately">Omedelbart</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">Inga händelser idag!</string>
     <string name="calendarNoEventsDescription">Det verkar vara en bra dag för vila, avslappning och omladdning.</string>
     <string name="userCalendarToDo">Att göra</string>
+    <string name="userCalendarToDoNew">Att göra</string>
     <string name="courseToDo">Att-göra för %s</string>
+    <string name="courseToDoNew">%s att göra</string>
     <string name="calendarEventExcused">Ursäktad</string>
     <string name="calendarEventMissing">Saknad</string>
     <string name="calendarEventGraded">Har bedömts</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">Händelsen %s skapades.</string>
     <string name="a11y_eventUpdatedAnnouncement">Händelsen %s uppdaterades.</string>
     <string name="a11y_toDoCreatedAnnouncement">Att göra %s skapades.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Att göra %s skapades.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Att göra %s uppdaterades.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Att göra %s uppdaterades.</string>
     <string name="todoScreenTitle">Att göra</string>
+    <string name="todoScreenTitleNew">Att göra</string>
     <string name="todoDateLabel">Datum</string>
     <string name="todoDescriptionLabel">Beskrivning</string>
     <string name="todoDeleteConfirmationTitle">Vill du radera Att-göra?</string>
+    <string name="todoDeleteConfirmationTitleNew">Vill du radera Att göra?</string>
     <string name="todoDeleteConfirmationText">Detta tar bort ditt Att göra-objekt permanent.</string>
+    <string name="todoDeleteConfirmationTextNew">Detta tar bort ditt Att göra-objekt permanent.</string>
     <string name="todoDeleteErrorMessage">Det gick inte att ta bort det här att-göra-objektet. Kontrollera din anslutning och försök igen.</string>
+    <string name="todoDeleteErrorMessageNew">Det gick inte att radera detta att göra-objekt. Kontrollera anslutningen och försök igen.</string>
     <string name="createTodoScreenTitle">Ny att-göra</string>
+    <string name="createTodoScreenTitleNew">Nytt Att göra</string>
     <string name="editTodoScreenTitle">Redigera att-göra</string>
+    <string name="editTodoScreenTitleNew">Redigera Att göra</string>
     <string name="createToDoTitleHint">Lägg till titel</string>
     <string name="createToDoDateLabel">Datum</string>
     <string name="createToDoTimeLabel">Tid</string>
     <string name="createToDoCalendarLabel">Kalender</string>
     <string name="createToDoDetailsLabel">Detaljer</string>
     <string name="todoSaveErrorMessage">Det gick inte att läsa in det här att-göra-objektet. Kontrollera din anslutning och försök igen.</string>
+    <string name="todoSaveErrorMessageNew">Det gick inte att spara detta att göra-objekt. Kontrollera anslutningen och försök igen.</string>
     <string name="selectCalendarScreenTitle">Välj kalender</string>
     <string name="errorContentRetryButton">Försök igen</string>
     <string name="eventLocationLabel">Plats</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">Detaljer</string>
     <string name="errorLoadingEvent">Det gick inte att läsa in den här händelsen. Kontrollera din anslutning och försök igen.</string>
     <string name="errorLoadingTodo">Det gick inte att läsa in det här att göra-objektet. Kontrollera din anslutning och försök igen.</string>
+    <string name="errorLoadingTodoNew">Det gick inte att läsa in detta att göra-objekt. Kontrollera anslutningen och försök igen.</string>
     <string name="eventDeleteConfirmationTitle">Radera händelse?</string>
     <string name="eventDeleteConfirmationText">Detta raderar din händelse permanent.</string>
     <string name="eventDeleteErrorMessage">Det gick inte att radera den här händelsen. Kontrollera din anslutning och försök igen.</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">Alla händelser</string>
     <string name="eventDeleteScopeFollowing">Denna och alla följande händelser</string>
     <string name="calendarAddToDo">Lägg till att göra</string>
+    <string name="calendarAddToDoNew">Lägg till att göra-uppgift</string>
     <string name="calendarAddEvent">Lägg till händelse</string>
     <string name="createEventScreenTitle">Ny händelse</string>
     <string name="editEventScreenTitle">Redigera händelse</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">Då loggar vi in dig!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Om du vill se dina att göra-uppgifter loggar du in på ditt konto i appen. Det tar bara en sekund!</string>
     <string name="a11y_widgetToDoOpenToDoList">Öppna skärmen med att göra-listan</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Öppna skärmen med att göra-listan</string>
     <string name="a11y_widgetToDoCreateNewToDo">Skapa en ny att göra-uppgift</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Skapa en ny att göra-uppgift</string>
     <string name="widgetGradesErrorSubtitle">Vi har problem med att visa dig dina omdömen för tillfället. Försök igen om en stund eller gå till appen.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Om du vill se dina att omdömen loggar du in på ditt konto i appen. Det tar bara en sekund!</string>
     <string name="widgetSingleGradeErrorSubtitle">Vi har problem med att visa dig dina omdömen för tillfället.</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">Nu väljer vi en kurs.</string>
     <string name="widgetGradesErrorLoadingCourses">Ett fel inträffade under inläsning av kurser.</string>
     <string name="settingsSwitchExperience">Byt till Canvas Career</string>
+    <string name="forecastWidgetTitle">Veckovis sammanfattning</string>
+    <string name="forecastWidgetWeekPeriod">Vecka %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Saknad</string>
+    <string name="forecastWidgetDue">Inlämningsdatum</string>
+    <string name="forecastWidgetRecentGrades">Nya omdömen</string>
+    <string name="forecastWidgetGradeWeight">%d%% av det slutliga omdömet</string>
+    <string name="forecastWidgetErrorMessage">Vi har problem med att läsa in dina uppgifter. Kontrollera din anslutning och försök igen.</string>
+    <string name="forecastWidgetEmptyMissing">Inga saknade uppgifter. Du har kommit ikapp!</string>
+    <string name="forecastWidgetEmptyDue">Inga uppgifter måste lämnas in denna vecka.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Inga nya omdömen den här veckan.</string>
+    <string name="a11y_contentDescription_previousWeek">Föregående vecka</string>
+    <string name="a11y_contentDescription_nextWeek">Nästa vecka</string>
+
     <string name="speedGraderGradeTabTitle">Omdöme och matris</string>
     <string name="speedGraderDetailsTabTitle">Detaljer</string>
     <string name="a11y_contentDescription_expandPanel">Visa panelen</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">Det gick inte att läsa in dina att göra-objekt. Kontrollera din anslutning och försök igen.</string>
     <string name="errorUpdatingToDo">Det gick inte att uppdatera att göra-objektet. Kontrollera din anslutning och försök igen.</string>
     <string name="noToDosForNow">Du har inga att göra-objekt för tillfället!</string>
+    <string name="noToDosForNowNew">Inga Att göra-objekt för tillfället!</string>
     <string name="noToDosForNowSubtext">Det verkar vara en bra tid för vila, slappna av och ladda om batterierna.</string>
     <string name="todoSwipeDone">Klar</string>
     <string name="todoSwipeUndo">Ångra</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Inställningar för att göra-lista</string>
+    <string name="todoFilterPreferencesNew">Inställningar för att göra-lista</string>
     <string name="todoFilterVisibleItems">Synliga objekt</string>
     <string name="todoFilterShowPersonalToDos">Visa personliga att göra-objekt</string>
+    <string name="todoFilterShowPersonalToDosNew">Visa personliga att göra-objekt</string>
     <string name="todoFilterShowCalendarEvents">Visa kalenderhändelser</string>
     <string name="todoFilterShowCompleted">Visa slutförda</string>
     <string name="todoFilterFavoriteCoursesOnly">Endast favoritkurser</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Avvisa inbjudan</string>
     <string name="courseInvitationDeclineConfirmMessage">Är du säker på att du vill avvisa inbjudan till %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Framsteg</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">God morgon %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Hej %s!</string>
 
+    <string name="courses_and_groups">Kurser och grupper</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Anpassa översikt</string>
     <string name="dashboard_widgets">Widgetar</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">Ändrar layouten för översikten</string>
     <string name="changing_dashboard_layout_message">Om du vill ändra layouten för översikten måste du starta om appen.</string>
     <string name="restart_now">Starta om nu</string>
+    <string name="turn_on_new_dashboard">Aktivera den nya översikten</string>
     <string name="switched_back">Ändrade du tillbaka?</string>
     <string name="switched_back_message">Tack för att du provade den nya översikten! Vill du berätta varför du ändrade tillbaka?</string>
+    <string name="survey_option_hard_to_find">Svårt att hitta saker</string>
+    <string name="survey_option_prefer_old_layout">Föredrar den tidigare layouten</string>
+    <string name="survey_option_something_broken">Något fungerade inte som det skulle</string>
     <string name="what_could_we_improve">Vad kan vi förbättra?</string>
+    <string name="what_do_you_think_of_new_dashboard">Vad tycker du om den nya översikten?</string>
+    <string name="let_us_know">Informera oss!</string>
+    <string name="no_app_to_handle_link">Det finns ingen tillgänglig app som kan öppna den här länken</string>
     <string name="skip">Hoppa över</string>
     <string name="widget_setting_show_greeting">Visa hälsning</string>
     <string name="background_color">Bakgrundsfärg</string>
+    <string name="widget_setting_show_grades">Kursomdömen</string>
+    <string name="widget_setting_show_color_overlay">Överlägg för kursfärg</string>
     <string name="offline_content_available">Offlineinnehåll tillgängligt</string>
     <string name="a11y_contentDescription_moreOptions">Fler alternativ</string>
     <string name="customizeCourse">Anpassa kurs</string>
     <string name="favoriteCoursesAndGroups">Favoritkurser och grupper</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Externa verktyg är inte tillgängliga offline.</string>
+    <string name="widget_weekly_summary">Veckovis sammanfattning</string>
+
+    <string name="dashboardCourseNickname">Smeknamn</string>
+    <string name="dashboardCourseNicknameHint">Skriv kursen smeknamn här</string>
+    <string name="dashboardCourseColor">Kursfärg</string>
+    <string name="widget_toDo">Dagliga att göra-objekt</string>
+    <string name="dailyToDoWidgetTitle">Dagliga att göra-objekt</string>
+    <string name="todoWidget_showCompleted">Visa slutförda</string>
+    <string name="todoWidget_emptyTitle">Du är klar för tillfället!</string>
+    <string name="todoWidget_emptyMessage">Det ser ut som du är ledig för idag.\nVill du lägga till några att göra-objekt?</string>
+    <string name="todoWidget_addTodo">Lägg till att göra-uppgift</string>
+    <string name="todoWidget_errorTitle">Hoppsan, något gick fel</string>
+    <string name="todoWidget_errorMessage">Vi kunde inte läsa in dina att göra-objekt.\nFörsök igen, eller kom tillbaka senare.</string>
+    <string name="todoWidget_refresh">Uppdatera</string>
+    <string name="todoWidget_today">I dag</string>
+    <string name="a11y_todoWidget_jumpToToday">Hoppa över idag</string>
+    <string name="widgetSettings_widgetsColor">Huvudfärg för översikt</string>
+    <string name="dashboard_globalAnnouncement">Globalt anslag</string>
+    <string name="forecastWidget_currentWeek">Aktuell vecka</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-th/strings.xml b/libs/pandares/src/main/res/values-th/strings.xml
index 7f0696d518..e3968dc9d3 100644
--- a/libs/pandares/src/main/res/values-th/strings.xml
+++ b/libs/pandares/src/main/res/values-th/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">จัดส่งล้มเหลว</string>
     <string name="submissionStatusFailedSubtitle">กดเพื่อดูรายละเอียด</string>
     <string name="submissionAndRubric">ผลงานจัดส่งและเกณฑ์การให้คะแนน</string>
+    <string name="submissionAndFeedback">ผลงานจัดส่งและข้อคิดเห็น</string>
     <string name="commentsAndRubric">ความเห็นและเกณฑ์การให้คะแนน</string>
     <string name="errorLoadingAssignment">มีปัญหาในการโหลดภารกิจนี้ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
     <string name="submitted">จัดส่งแล้ว</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">วันนี้</string>
+    <string name="tomorrow">พรุ่งนี้</string>
     <string name="past">อดีต</string>
     <string name="noDate">ไม่มีวันที่</string>
     <string name="future">อนาคต</string>
@@ -291,6 +293,7 @@
     <string name="monologue">โมโนล็อก</string>
     <string name="noItemsToDisplayShort">ไม่มีรายการจัดแสดง</string>
     <string name="Todo">สิ่งที่ต้องดำเนินการ</string>
+    <string name="TodoNew">สิ่งที่ต้องทำ</string>
     <string name="todoFilter">กรองบทเรียน</string>
     <string name="filterByEllipsis">กรองจาก...</string>
     <string name="favoriteCoursesLabel">บทเรียนโปรด</string>
@@ -474,6 +477,7 @@
     <string name="groups">กลุ่ม</string>
     <string name="groupMembers">สมาชิกในกลุ่ม</string>
 
+    <string name="messageGroup">ส่งข้อความถึงกลุ่ม</string>
     <string name="loading">กำลังโหลด&#8230;</string>
     <string name="select_item_to_display">เลือกจากรายการ</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">สิ่งที่ต้องดำเนินการ</string>
+    <string name="todoWidgetTitleNew">สิ่งที่ต้องทำ</string>
     <string name="gradesWidgetTitle">เกรด</string>
     <string name="notificationWidgetTitle">การแจ้งข้อมูล</string>
     <string name="todoWidgetTitleLong">Canvas - สิ่งที่ต้องทำ</string>
+    <string name="todoWidgetTitleLongNew">Canvas - สิ่งที่ต้องทำ</string>
     <string name="gradesWidgetTitleLong">Canvas - เกรด</string>
     <string name="gradeWidgetTitleLong">Canvas - เกรด</string>
     <string name="notificationWidgetTitleLong">Canvas - การแจ้งข้อมูล</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">บทเรียน</string>
     <string name="toDoList">รายการสิ่งที่ต้องทำ</string>
+    <string name="toDoListNew">รายการสิ่งที่ต้องทำ</string>
+
     <string name="notifications">การแจ้งข้อมูล</string>
     <string name="pushNotifications">การแจ้งเตือนแบบพุช</string>
     <string name="pushNotificationsError">การแจ้งเตือนแบบพุชยังไม่ได้ลงทะเบียนสำหรับอุปกรณ์นี้</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">เปิด SpeedGrader</string>
 
-    <string name="search_todo">สิ่งที่ต้องทำ ต้องดำเนินการ รายการสิ่งที่ต้องทำ</string>
     <string name="search_course">บทเรียน บทเรียน ชั้นเรียน ชั้นเรียน</string>
     <string name="search_grades">เกรด เกรด</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">ต้องระบุชื่อเพจ</string>
     <string name="pageDetails">รายละเอียดหน้าเพจ</string>
     <string name="saving">กำลังบันทึก</string>
+    <string name="speedGraderSaving">กำลังบันทึก</string>
+    <string name="speedGraderSaved">บันทึกแล้ว</string>
+    <string name="speedGraderFailed">ล้มเหลว</string>
+    <string name="speedGraderSaveErrorTitle">อุ๊ปส์ มีบางอย่างผิดปกติ</string>
+    <string name="speedGraderSaveErrorMessage">มีข้อผิดพลาดขณะบันทึกข้อมูลการแก้ไขเกรดของคุณ สามารถลองใหม่อีกครั้งหรือลองทำรายการใหม่อีกครั้งในภายหลัง</string>
+    <string name="speedGraderSaveErrorContentDescription">บันทึกเกรดล้มเหลว กดเลือกรายละเอียด</string>
+
     <string name="confirmDeleteEvent">แน่ใจว่าต้องการลบกิจกรรมนี้หรือไม่</string>
     <string name="conferencesNotSupported">การประชุมยังไม่รองรับกับอุปกรณ์พกพา</string>
     <string name="filePreviewContentDescription">ภาพตัวอย่างไฟล์</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">ผลงานบันทึก</string>
     <string name="conferenceInProgress">กำลังจัดการประชุม</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">การประชุม (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">กำลังจัดการประชุม</string>
+    <string name="conferencesWidgetDismissed">ยกเลิกการประชุมแล้ว</string>
     <string name="a11y_criterion_content_description">คะแนนตามเกณฑ์ %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">ข้อมูลเพิ่มเติม</string>
@@ -1375,6 +1393,10 @@
         <item quantity="one">%s รายการสิ่งที่ต้องทำ</item>
         <item quantity="other">%s รายการสิ่งที่ต้องทำ</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s รายการสิ่งที่ต้องทำ</item>
+        <item quantity="other">%s รายการสิ่งที่ต้องทำ</item>
+    </plurals>
     <string name="noAnnotationSelected">ไม่ได้เลือกหมายเหตุกำกับใด ๆ</string>
     <string name="emailNotifications">การแจ้งข้อมูลทางอีเมล</string>
     <string name="emailNotificationsImmediately">ทันที</string>
@@ -1661,7 +1683,9 @@
     <string name="calendarNoEvents">ไม่มีกิจกรรมในวันนี้!</string>
     <string name="calendarNoEventsDescription">ดูเหมือนนี่จะเป็นวันที่เหมาะสำหรับพัก ผ่อนคลายและเติมพลัง</string>
     <string name="userCalendarToDo">สิ่งที่ต้องทำ</string>
+    <string name="userCalendarToDoNew">สิ่งที่ต้องทำ</string>
     <string name="courseToDo">%s สิ่งที่ต้องทำ</string>
+    <string name="courseToDoNew">%s สิ่งที่ต้องทำ</string>
     <string name="calendarEventExcused">ได้รับการยกเว้น</string>
     <string name="calendarEventMissing">ขาดหาย</string>
     <string name="calendarEventGraded">ให้เกรดแล้ว</string>
@@ -1686,21 +1710,30 @@
     <string name="a11y_eventCreatedAnnouncement">จัดทำ %s สำหรับกิจกรรมเสร็จสิ้น</string>
     <string name="a11y_eventUpdatedAnnouncement">อัพเดต %s สำหรับกิจกรรมเสร็จสิ้น</string>
     <string name="a11y_toDoCreatedAnnouncement">จัดทำ %s สำหรับรายการที่ต้องดำเนินการเสร็จสิ้น</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">จัดทำ %s สำหรับรายการที่ต้องทำเสร็จสิ้น</string>
     <string name="a11y_toDoUpdatedAnnouncement">อัพเดต %s สำหรับรายการที่ต้องดำเนินการเสร็จสิ้น</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">จัดทำ %s สำหรับรายการที่ต้องทำเสร็จสิ้น</string>
     <string name="todoScreenTitle">สิ่งที่ต้องทำ</string>
+    <string name="todoScreenTitleNew">สิ่งที่ต้องทำ</string>
     <string name="todoDateLabel">วันที่</string>
     <string name="todoDescriptionLabel">รายละเอียด</string>
     <string name="todoDeleteConfirmationTitle">ลบรายการที่ต้องทำหรือไม่</string>
+    <string name="todoDeleteConfirmationTitleNew">ลบรายการที่ต้องทำหรือไม่</string>
     <string name="todoDeleteConfirmationText">นี่เป็นการลบรายการ สิ่งที่ต้องทำ (To Do) ของคุณอย่างถาวร</string>
+    <string name="todoDeleteConfirmationTextNew">นี่เป็นการลบรายการ สิ่งที่ต้องทำ (To-do) ของคุณอย่างถาวร</string>
     <string name="todoDeleteErrorMessage">มีข้อผิดพลาดในการลบรายการสิ่งที่ต้องทำนี้ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
+    <string name="todoDeleteErrorMessageNew">มีข้อผิดพลาดในการลบรายการสิ่งที่ต้องทำ (To-do) นี้ กรุณาตรวจสอบการเชื่อมต่อของคุณแล้วรอใหม่อีกครั้ง</string>
     <string name="createTodoScreenTitle">รายการสิ่งที่ต้องทำใหม่</string>
+    <string name="createTodoScreenTitleNew">รายการสิ่งที่ต้องทำใหม่</string>
     <string name="editTodoScreenTitle">แก้ไขรายการสิ่งที่ต้องทำ</string>
+    <string name="editTodoScreenTitleNew">แก้ไขรายการสิ่งที่ต้องทำ</string>
     <string name="createToDoTitleHint">เพิ่มชื่อ</string>
     <string name="createToDoDateLabel">วันที่</string>
     <string name="createToDoTimeLabel">เวลา</string>
     <string name="createToDoCalendarLabel">ปฏิทิน</string>
     <string name="createToDoDetailsLabel">รายละเอียด</string>
     <string name="todoSaveErrorMessage">มีข้อผิดพลาดในการบันทึกรายการสิ่งที่ต้องทำนี้ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
+    <string name="todoSaveErrorMessageNew">มีข้อผิดพลาดในการบันทึกรายการสิ่งที่ต้องทำ (To-do) นี้ กรุณาตรวจสอบการเชื่อมต่อของคุณแล้วรอใหม่อีกครั้ง</string>
     <string name="selectCalendarScreenTitle">เลือกปฏิทิน</string>
     <string name="errorContentRetryButton">ลองใหม่</string>
     <string name="eventLocationLabel">ตำแหน่ง</string>
@@ -1708,6 +1741,7 @@
     <string name="eventDetailsLabel">รายละเอียด</string>
     <string name="errorLoadingEvent">มีปัญหาในการโหลดกิจกรรมนี้ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
     <string name="errorLoadingTodo">มีปัญหาในการโหลดรายการสิ่งที่ต้องดำเนินการ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
+    <string name="errorLoadingTodoNew">มีปัญหาในการโหลรายการสิ่งที่ต้องทำนี้ กรุณาตรวจสอบการเชื่อมต่อของคุณแล้วรอใหม่อีกครั้ง</string>
     <string name="eventDeleteConfirmationTitle">ลบกิจกรรมหรือไม่</string>
     <string name="eventDeleteConfirmationText">นี่จะเป็นการลบกิจกรรมของคุณอย่างถาวร</string>
     <string name="eventDeleteErrorMessage">มีข้อผิดพลาดในการลบรายการกิจกรรมนี้ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
@@ -1724,6 +1758,7 @@
     <string name="eventDeleteScopeAll">กิจกรรมทั้งหมด</string>
     <string name="eventDeleteScopeFollowing">รายการนี้และกิจกรรมต่อจากนี้ทั้งหมด</string>
     <string name="calendarAddToDo">เพิ่มรายการสิ่งที่ต้องทำ</string>
+    <string name="calendarAddToDoNew">เพิ่มรายการสิ่งที่ต้องทำ</string>
     <string name="calendarAddEvent">เพิ่มกิจกรรม</string>
     <string name="createEventScreenTitle">กิจกรรมใหม่</string>
     <string name="editEventScreenTitle">แก้ไขกิจกรรม</string>
@@ -2102,7 +2137,9 @@
     <string name="widgetNotLoggedInTitle">ล็อกอินกันก่อนเลย!</string>
     <string name="widgetToDoNotLoggedInSubtitle">ดูรายการที่ต้องดำเนินการโดยล็อกอินไปยังบัญชีของคุณในแอพ แป๊ปเดียวเท่านั้น!</string>
     <string name="a11y_widgetToDoOpenToDoList">เปิดหน้าจอรายการ สิ่งที่ต้องทำ</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">เปิดหน้าจอรายการ สิ่งที่ต้องทำ (To-do)</string>
     <string name="a11y_widgetToDoCreateNewToDo">จัดทำรายการ สิ่งที่ต้องทำ ใหม่</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">จัดทำรายการ สิ่งที่ต้องทำ (To-do) ใหม่</string>
     <string name="widgetGradesErrorSubtitle">เรามีปัญหาในการแสดงเกรดของคุณในตอนนี้ กรุณาลองใหม่อีกครั้งอีกสักครู่หรือเข้าไปที่แอพ</string>
     <string name="widgetGradesNotLoggedInSubtitle">ดูรเกรดของคุณโดยล็อกอินไปยังบัญชีของคุณในแอพ แป๊ปเดียวเท่านั้น!</string>
     <string name="widgetSingleGradeErrorSubtitle">เรามีปัญหาในการแสดงเกรดของคุณในตอนนี้</string>
@@ -2110,6 +2147,19 @@
     <string name="widgetSingleGradeSelectCourse">เลือกบทเรียนกันเลย</string>
     <string name="widgetGradesErrorLoadingCourses">เกิดข้อผิดพลาดขณะโหลดบทเรียน</string>
     <string name="settingsSwitchExperience">สลับไปใช้ Canvas Career</string>
+    <string name="forecastWidgetTitle">ข้อมูลสรุปรายสัปดาห์</string>
+    <string name="forecastWidgetWeekPeriod">สัปดาห์ %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">ขาดหาย</string>
+    <string name="forecastWidgetDue">ครบกำหนด</string>
+    <string name="forecastWidgetRecentGrades">เกรดใหม่</string>
+    <string name="forecastWidgetGradeWeight">%d%% ของเกรดสรุป</string>
+    <string name="forecastWidgetErrorMessage">เรามีปัญหาในการโหลดภารกิจของคุณ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
+    <string name="forecastWidgetEmptyMissing">ไม่มีภารกิจที่ขาดหาย คุณไม่ได้ก้าวหน้าไปไหนเลย!</string>
+    <string name="forecastWidgetEmptyDue">ไม่มีภารกิจที่ครบกำหนดสัปดาห์นี้</string>
+    <string name="forecastWidgetEmptyRecentGrades">ไม่มีเกรดใหม่ในสัปดาห์นี้</string>
+    <string name="a11y_contentDescription_previousWeek">สัปดาห์ก่อนหน้า</string>
+    <string name="a11y_contentDescription_nextWeek">สัปดาห์ถัดไป</string>
+
     <string name="speedGraderGradeTabTitle">เกรดและเกณฑ์การให้คะแนน</string>
     <string name="speedGraderDetailsTabTitle">รายละเอียด</string>
     <string name="a11y_contentDescription_expandPanel">ขยายแถบคำสั่ง</string>
@@ -2188,6 +2238,7 @@
     <string name="errorLoadingToDos">มีข้อผิดพลาดในการโหลดรายการสิ่งที่ต้องทำของคุณ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
     <string name="errorUpdatingToDo">มีข้อผิดพลาดในการอัพเดตรายการสิ่งที่ต้องทำ กรุณาตรวจสอบการเชื่อมต่อของคุณและลองใหม่อีกครั้ง</string>
     <string name="noToDosForNow">ไม่มีรายการสิ่งที่ต้องทำตอนนี้!</string>
+    <string name="noToDosForNowNew">ไม่มีรายการที่ต้องทำในตอนนี้!</string>
     <string name="noToDosForNowSubtext">ดูเหมือนนี่จะเป็นเวลาที่เหมาะสำหรับพัก ผ่อนคลายและเติมพลัง</string>
     <string name="todoSwipeDone">เสร็จสิ้น</string>
     <string name="todoSwipeUndo">เลิกทำ</string>
@@ -2198,8 +2249,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">ค่าปรับแต่งรายการสิ่งที่ต้องทำ</string>
+    <string name="todoFilterPreferencesNew">ค่าปรับแต่งรายการสิ่งที่ต้องทำ (To-do)</string>
     <string name="todoFilterVisibleItems">รายการที่จัดแสดง</string>
     <string name="todoFilterShowPersonalToDos">แสดงรายการสิ่งที่ต้องทำส่วนบุคคล</string>
+    <string name="todoFilterShowPersonalToDosNew">แสดงรายการสิ่งที่ต้องทำส่วนตัว</string>
     <string name="todoFilterShowCalendarEvents">แสดงกิจกรรมในปฏิทิน</string>
     <string name="todoFilterShowCompleted">แสดงรายการที่เสร็จสิ้นแล้ว</string>
     <string name="todoFilterFavoriteCoursesOnly">เฉพาะบทเรียนโปรด</string>
@@ -2226,6 +2279,9 @@
     <string name="courseInvitationDeclineConfirmTitle">ปฏิเสธคำเชิญ</string>
     <string name="courseInvitationDeclineConfirmMessage">แน่ใจว่าต้องการปฏิเสธคำเชิญ %s หรือไม่</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">ความคืบหน้า</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">สวัสดีตอนเช้า %s!</string>
@@ -2348,6 +2404,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">สวัสดี %s</string>
 
+    <string name="courses_and_groups">บทเรียนและกลุ่ม</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">กำหนดค่าแผงข้อมูล</string>
     <string name="dashboard_widgets">Widgets</string>
@@ -2357,16 +2414,44 @@
     <string name="changing_dashboard_layout">การปรับเค้าโครงแผงข้อมูล</string>
     <string name="changing_dashboard_layout_message">แก้ไขเค้าโครงแผงข้อมูลโดยคุณจะต้องรีสตาร์ทแอพพลิเคชั่น</string>
     <string name="restart_now">รีสตาร์ทตอนนี้</string>
+    <string name="turn_on_new_dashboard">เปิดแผงข้อมูลใหม่</string>
     <string name="switched_back">เปลี่ยนกลับหรือไม่</string>
     <string name="switched_back_message">ขอบคุณที่ทดลองใช้แผงข้อมูลใหม่ กรุณาแจ้งให้เราทราบว่าทำไมคุณถึงเปลี่ยนกลับ</string>
+    <string name="survey_option_hard_to_find">ค้นหาข้อมูลได้ยาก</string>
+    <string name="survey_option_prefer_old_layout">ชอบเค้าโครงแบบเดิมมากกว่า</string>
+    <string name="survey_option_something_broken">บางอย่างไม่ถูกต้อง</string>
     <string name="what_could_we_improve">มีอะไรที่เราสามารถปรับปรุงได้บ้าง</string>
+    <string name="what_do_you_think_of_new_dashboard">คุณคิดอย่างไรเกี่ยวกับแผงข้อมูลรูปแบบใหม่</string>
+    <string name="let_us_know">แจ้งให้เราทราบ!</string>
+    <string name="no_app_to_handle_link">ไม่มีแอพสำหรับเปิดลิงค์นี้</string>
     <string name="skip">ข้าม</string>
     <string name="widget_setting_show_greeting">แสดงคำทักทาย</string>
     <string name="background_color">สีพื้นหลัง</string>
+    <string name="widget_setting_show_grades">เกรดของบทเรียน</string>
+    <string name="widget_setting_show_color_overlay">โอเวอร์เลย์สีบทเรียน</string>
     <string name="offline_content_available">มีเนื้อหาออฟไลน์</string>
     <string name="a11y_contentDescription_moreOptions">ตัวเลือกเพิ่มเติม</string>
     <string name="customizeCourse">ปรับแต่งบทเรียน</string>
     <string name="favoriteCoursesAndGroups">บทเรียนโปรดและกลุ่ม</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">เครื่องมือจากภายนอกไม่สามารถใช้งานแบบออฟไลน์ได้</string>
+    <string name="widget_weekly_summary">ข้อมูลสรุปรายสัปดาห์</string>
+
+    <string name="dashboardCourseNickname">ชื่อเล่น</string>
+    <string name="dashboardCourseNicknameHint">เขียนชื่อเล่นสำหรับบทเรียนที่นี่</string>
+    <string name="dashboardCourseColor">สีบทเรียน</string>
+    <string name="widget_toDo">สิ่งที่ต้องทำประจำวัน</string>
+    <string name="dailyToDoWidgetTitle">สิ่งที่ต้องทำประจำวัน</string>
+    <string name="todoWidget_showCompleted">แสดงรายการที่เสร็จสิ้นแล้ว</string>
+    <string name="todoWidget_emptyTitle">เสร็จสิ้นแล้วในตอนนี้!</string>
+    <string name="todoWidget_emptyMessage">ดูเหมือนคุณจะว่างวันนี้\nตองการเพิ่มรายการสิ่งที่ต้องทำ (To-do) หรือไม่</string>
+    <string name="todoWidget_addTodo">เพิ่มรายการสิ่งที่ต้องทำ</string>
+    <string name="todoWidget_errorTitle">อุ๊ปส์ มีบางอย่างผิดปกติ</string>
+    <string name="todoWidget_errorMessage">เราไม่สามารถโหลดรายการสิ่งที่ต้องทำ (To-do) ของคุณ\nลองใหม่อีกครั้งหรือทำรายการใหม่ในภายหลัง</string>
+    <string name="todoWidget_refresh">รีเฟรช</string>
+    <string name="todoWidget_today">วันนี้</string>
+    <string name="a11y_todoWidget_jumpToToday">ข้ามไปที่วันนี้</string>
+    <string name="widgetSettings_widgetsColor">สีหลักแผงข้อมูล</string>
+    <string name="dashboard_globalAnnouncement">ประกาศส่วนกลาง</string>
+    <string name="forecastWidget_currentWeek">สัปดาห์ปัจจุบัน</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-vi/strings.xml b/libs/pandares/src/main/res/values-vi/strings.xml
index 60b3c69c11..9da9c06b1a 100644
--- a/libs/pandares/src/main/res/values-vi/strings.xml
+++ b/libs/pandares/src/main/res/values-vi/strings.xml
@@ -46,6 +46,7 @@
     <string name="submissionStatusFailedTitle">Nộp Thất Bại</string>
     <string name="submissionStatusFailedSubtitle">Nhấn vào để xem thông tin chi tiết</string>
     <string name="submissionAndRubric">Bài Nộp Và Bảng Đánh Giá Theo Tiêu Chí</string>
+    <string name="submissionAndFeedback">Bài Nộp &amp; Phản Hồi</string>
     <string name="commentsAndRubric">Bình Luận Và Bảng Đánh Giá Theo Tiêu Chí</string>
     <string name="errorLoadingAssignment">Đã xảy ra vấn đề khi tải bài tập này. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
     <string name="submitted">Đã nộp</string>
@@ -219,6 +220,7 @@
 
     <!-- Date strings -->
     <string name="today">Hôm Nay</string>
+    <string name="tomorrow">Ngày mai</string>
     <string name="past">Trước Đây</string>
     <string name="noDate">Không Có Ngày</string>
     <string name="future">Tương Lai</string>
@@ -291,6 +293,7 @@
     <string name="monologue">Độc Thoại</string>
     <string name="noItemsToDisplayShort">Không có mục để hiển thị</string>
     <string name="Todo">Việc Cần Làm</string>
+    <string name="TodoNew">Việc Cần Làm</string>
     <string name="todoFilter">Lọc Khóa Học</string>
     <string name="filterByEllipsis">Lọc theo...</string>
     <string name="favoriteCoursesLabel">Khóa Học Yêu Thích</string>
@@ -474,6 +477,7 @@
     <string name="groups">Nhóm</string>
     <string name="groupMembers">Thành Viên Nhóm</string>
 
+    <string name="messageGroup">Nhóm tin nhắn</string>
     <string name="loading">Đang tải&#8230;</string>
     <string name="select_item_to_display">Chọn từ danh sách</string>
 
@@ -690,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">Việc Cần Làm</string>
+    <string name="todoWidgetTitleNew">Việc Cần Làm</string>
     <string name="gradesWidgetTitle">Điểm</string>
     <string name="notificationWidgetTitle">Thông Báo</string>
     <string name="todoWidgetTitleLong">Canvas - Việc Cần Làm</string>
+    <string name="todoWidgetTitleLongNew">Canvas - Việc Cần Làm</string>
     <string name="gradesWidgetTitleLong">Canvas - Điểm</string>
     <string name="gradeWidgetTitleLong">Canvas - Điểm</string>
     <string name="notificationWidgetTitleLong">Canvas - Thông Báo</string>
@@ -728,6 +734,8 @@
     <!-- Tablet Strings -->
     <string name="courses">Khóa Học</string>
     <string name="toDoList">Danh Sách Việc Cần Làm</string>
+    <string name="toDoListNew">Danh Sách Việc Cần Làm</string>
+
     <string name="notifications">Thông Báo</string>
     <string name="pushNotifications">Thông Báo Đẩy</string>
     <string name="pushNotificationsError">Thông Báo Đẩy chưa được đăng ký cho thiết bị này.</string>
@@ -742,7 +750,6 @@
 
     <string name="launchSpeedgrader">Mở SpeedGrader</string>
 
-    <string name="search_todo">việc cần làm việc cần làm danh sách việc cần làm</string>
     <string name="search_course">khóa học khóa học lớp lớp</string>
     <string name="search_grades">lớp lớp</string>
 
@@ -1077,6 +1084,13 @@
     <string name="pageTitleMustBeSet">Phải cài đặt tiêu đề trang.</string>
     <string name="pageDetails">Thông Tin Chi Tiết Trang</string>
     <string name="saving">Đang lưu</string>
+    <string name="speedGraderSaving">Đang lưu</string>
+    <string name="speedGraderSaved">Đã Lưu</string>
+    <string name="speedGraderFailed">Thất bại</string>
+    <string name="speedGraderSaveErrorTitle">Rất tiếc, đã xảy ra vấn đề</string>
+    <string name="speedGraderSaveErrorMessage">Đã xảy ra lỗi khi lưu điều chỉnh điểm của bạn. Bạn có thể thử lại hoặc quay lại sau.</string>
+    <string name="speedGraderSaveErrorContentDescription">Lưu điểm không thành công. Nhấn để biết thêm chi tiết.</string>
+
     <string name="confirmDeleteEvent">Bạn có chắc chắn muốn xóa sự kiện này không?</string>
     <string name="conferencesNotSupported">Hội Nghị chưa được hỗ trợ trên di động.</string>
     <string name="filePreviewContentDescription">Hình ảnh xem trước tập tin</string>
@@ -1225,6 +1239,10 @@
     <string name="recordings">Bản Ghi</string>
     <string name="conferenceInProgress">Hội nghị đang diễn ra</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">Hội Nghị (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">Hội nghị đang diễn ra</string>
+    <string name="conferencesWidgetDismissed">Hội nghị bị hủy bỏ</string>
     <string name="a11y_criterion_content_description">Xếp hạng tiêu chí %s</string>
     <string name="a11y_criterion_description_content_description">%s, %s</string>
     <string name="a11y_criterion_button_click_description">thêm thông tin</string>
@@ -1376,6 +1394,10 @@
         <item quantity="one">%s mục việc cần làm</item>
         <item quantity="other">%s mục việc cần làm</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s mục việc cần làm</item>
+        <item quantity="other">%s mục việc cần làm</item>
+    </plurals>
     <string name="noAnnotationSelected">Không có chú thích nào được chọn</string>
     <string name="emailNotifications">Thông Báo Email</string>
     <string name="emailNotificationsImmediately">Ngay Lập Tức</string>
@@ -1662,7 +1684,9 @@
     <string name="calendarNoEvents">Không Có Sự Kiện Hôm Nay!</string>
     <string name="calendarNoEventsDescription">Có vẻ là một ngày tuyệt vời để nghỉ ngơi, thư giãn và hồi sức.</string>
     <string name="userCalendarToDo">Cần Làm</string>
+    <string name="userCalendarToDoNew">Việc Cần Làm</string>
     <string name="courseToDo">%s Việc Cần Làm</string>
+    <string name="courseToDoNew">%s Việc Cần Làm</string>
     <string name="calendarEventExcused">Đã Xin Phép</string>
     <string name="calendarEventMissing">Bị Thiếu</string>
     <string name="calendarEventGraded">Đã Chấm Điểm</string>
@@ -1687,21 +1711,30 @@
     <string name="a11y_eventCreatedAnnouncement">Sự kiện %s đã được tạo thành công.</string>
     <string name="a11y_eventUpdatedAnnouncement">Sự kiện %s đã được cập nhật thành công.</string>
     <string name="a11y_toDoCreatedAnnouncement">Danh sách những việc cần làm %s đã được tạo thành công.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">Việc cần làm %s đã được tạo thành công.</string>
     <string name="a11y_toDoUpdatedAnnouncement">Danh sách những việc cần làm %s đã được cập nhật thành công.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">Việc cần làm %s đã được cập nhật thành công.</string>
     <string name="todoScreenTitle">Cần Làm</string>
+    <string name="todoScreenTitleNew">Việc Cần Làm</string>
     <string name="todoDateLabel">Ngày</string>
     <string name="todoDescriptionLabel">Mô Tả</string>
     <string name="todoDeleteConfirmationTitle">Xóa Việc Cần Làm?</string>
+    <string name="todoDeleteConfirmationTitleNew">Xóa Việc Cần Làm?</string>
     <string name="todoDeleteConfirmationText">Sẽ xóa vĩnh viễn mục Cần Làm của bạn.</string>
+    <string name="todoDeleteConfirmationTextNew">Sẽ xóa vĩnh viễn mục Việc Cần Làm của bạn.</string>
     <string name="todoDeleteErrorMessage">Đã xảy ra lỗi xóa Việc Cần Làm này. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
+    <string name="todoDeleteErrorMessageNew">Đã xảy ra lỗi khi xóa Việc Cần Làm này. Vui lòng kiểm tra kết nối và thử lại.</string>
     <string name="createTodoScreenTitle">Việc Cần Làm Mới</string>
+    <string name="createTodoScreenTitleNew">Việc Cần Làm Mới</string>
     <string name="editTodoScreenTitle">Chỉnh Sửa Việc Cần Làm</string>
+    <string name="editTodoScreenTitleNew">Chỉnh Sửa Việc Cần Làm</string>
     <string name="createToDoTitleHint">Thêm tiêu đề</string>
     <string name="createToDoDateLabel">Ngày</string>
     <string name="createToDoTimeLabel">Thời Gian</string>
     <string name="createToDoCalendarLabel">Lịch</string>
     <string name="createToDoDetailsLabel">Các Thông Tin Chi Tiết</string>
     <string name="todoSaveErrorMessage">Đã xảy ra lỗi lưu Việc Cần Làm này. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
+    <string name="todoSaveErrorMessageNew">Đã xảy ra lỗi khi lưu Việc Cần Làm này. Vui lòng kiểm tra kết nối và thử lại.</string>
     <string name="selectCalendarScreenTitle">Chọn Lịch</string>
     <string name="errorContentRetryButton">Thử Lại</string>
     <string name="eventLocationLabel">Địa Điểm</string>
@@ -1709,6 +1742,7 @@
     <string name="eventDetailsLabel">Các Thông Tin Chi Tiết</string>
     <string name="errorLoadingEvent">Đã có sự cố khi tải sự kiện này. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
     <string name="errorLoadingTodo">Đã có sự cố khi tải việc cần làm này. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
+    <string name="errorLoadingTodoNew">Đã xảy ra vấn đề khi tải việc cần làm này. Vui lòng kiểm tra kết nối và thử lại.</string>
     <string name="eventDeleteConfirmationTitle">Xóa Sự Kiện?</string>
     <string name="eventDeleteConfirmationText">Thao tác này sẽ xóa vĩnh viễn sự kiện của bạn.</string>
     <string name="eventDeleteErrorMessage">Đã xảy ra lỗi khi xóa sự kiện này. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
@@ -1725,6 +1759,7 @@
     <string name="eventDeleteScopeAll">Tất cả sự kiện</string>
     <string name="eventDeleteScopeFollowing">Sự kiện này và tất cả các sự kiện sau</string>
     <string name="calendarAddToDo">Thêm Việc Cần Làm</string>
+    <string name="calendarAddToDoNew">Thêm Việc Cần Làm</string>
     <string name="calendarAddEvent">Thêm Sự Kiện</string>
     <string name="createEventScreenTitle">Sự Kiện Mới</string>
     <string name="editEventScreenTitle">Chỉnh Sửa Sự Kiện</string>
@@ -2103,7 +2138,9 @@
     <string name="widgetNotLoggedInTitle">Hãy Tiến Hành Đăng Nhập!</string>
     <string name="widgetToDoNotLoggedInSubtitle">Để xem các việc cần làm của bạn, vui lòng đăng nhập vào tài khoản của bạn trong ứng dụng. Sẽ chỉ mất một lát thôi!</string>
     <string name="a11y_widgetToDoOpenToDoList">Mở màn hình danh sách Việc Cần Làm</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Mở màn hình danh sách Việc Cần Làm</string>
     <string name="a11y_widgetToDoCreateNewToDo">Tạo Việc Cần Làm mới</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Tạo Việc Cần Làm mới</string>
     <string name="widgetGradesErrorSubtitle">Chúng tôi đang gặp sự cố khi hiển thị điểm của bạn ngay lúc này. Vui lòng thử lại sau một lúc hoặc truy cập ứng dụng.</string>
     <string name="widgetGradesNotLoggedInSubtitle">Để xem điểm của bạn, vui lòng đăng nhập vào tài khoản của bạn trong ứng dụng. Sẽ chỉ mất một lát thôi!</string>
     <string name="widgetSingleGradeErrorSubtitle">Chúng tôi đang gặp sự cố khi hiển thị điểm của bạn ngay lúc này.</string>
@@ -2111,6 +2148,19 @@
     <string name="widgetSingleGradeSelectCourse">Hãy chọn một khóa học</string>
     <string name="widgetGradesErrorLoadingCourses">Đã xảy ra lỗi khi tải các khóa học.</string>
     <string name="settingsSwitchExperience">Chuyển đổi sang Canvas Career</string>
+    <string name="forecastWidgetTitle">Tóm Tắt Hàng Tuần</string>
+    <string name="forecastWidgetWeekPeriod">Tuần %1$d | %2$s</string>
+    <string name="forecastWidgetMissing">Bị Thiếu</string>
+    <string name="forecastWidgetDue">Hạn</string>
+    <string name="forecastWidgetRecentGrades">Điểm Mới</string>
+    <string name="forecastWidgetGradeWeight">%d%% điểm cuối cùng</string>
+    <string name="forecastWidgetErrorMessage">Chúng tôi đang gặp khó khăn khi tải bài tập của bạn. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
+    <string name="forecastWidgetEmptyMissing">Không có bài tập bị thiếu. Bạn đã bắt kịp mọi thứ!</string>
+    <string name="forecastWidgetEmptyDue">Không có bài tập đến hạn tuần này.</string>
+    <string name="forecastWidgetEmptyRecentGrades">Không có điểm mới trong tuần này.</string>
+    <string name="a11y_contentDescription_previousWeek">Tuần trước</string>
+    <string name="a11y_contentDescription_nextWeek">Tuần sau</string>
+
     <string name="speedGraderGradeTabTitle">Điểm &amp; Bảng Đánh Giá Theo Tiêu Chí</string>
     <string name="speedGraderDetailsTabTitle">Các Thông Tin Chi Tiết</string>
     <string name="a11y_contentDescription_expandPanel">Mở rộng bảng</string>
@@ -2189,6 +2239,7 @@
     <string name="errorLoadingToDos">Đã xảy ra lỗi khi tải các mục việc cần làm. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
     <string name="errorUpdatingToDo">Đã xảy ra lỗi khi cập nhật các mục việc cần làm. Vui lòng kiểm tra kết nối của bạn rồi thử lại.</string>
     <string name="noToDosForNow">Hiện chưa có Việc Cần Làm!</string>
+    <string name="noToDosForNowNew">Hiện chưa có Việc Cần Làm!</string>
     <string name="noToDosForNowSubtext">Có vẻ là thời điểm tuyệt vời để nghỉ ngơi, thư giãn và hồi sức.</string>
     <string name="todoSwipeDone">Đã Xong</string>
     <string name="todoSwipeUndo">Hoàn tác</string>
@@ -2199,8 +2250,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">Tùy Chọn danh sách Việc Cần Làm</string>
+    <string name="todoFilterPreferencesNew">Tùy Chọn danh sách Việc Cần Làm</string>
     <string name="todoFilterVisibleItems">Các Mục Hiển Thị</string>
     <string name="todoFilterShowPersonalToDos">Hiển Thị Việc Cần Làm Cá Nhân</string>
+    <string name="todoFilterShowPersonalToDosNew">Hiển Thị Việc Cần Làm Cá Nhân</string>
     <string name="todoFilterShowCalendarEvents">Hiển Thị Sự Kiện Lịch</string>
     <string name="todoFilterShowCompleted">Hiển Thị Mục Đã Hoàn Thành</string>
     <string name="todoFilterFavoriteCoursesOnly">Chỉ Khóa Học Yêu Thích</string>
@@ -2227,6 +2280,9 @@
     <string name="courseInvitationDeclineConfirmTitle">Từ Chối Lời Mời</string>
     <string name="courseInvitationDeclineConfirmMessage">Bạn có chắc chắn muốn từ chối lời mời đến %s?</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">Quá Trình</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">Chào buổi sáng, %s!</string>
@@ -2349,6 +2405,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">Xin chào, %s</string>
 
+    <string name="courses_and_groups">Khóa Học &amp; Nhóm</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">Tùy Chỉnh Bảng Điều Khiển</string>
     <string name="dashboard_widgets">Tiện Ích</string>
@@ -2358,16 +2415,44 @@
     <string name="changing_dashboard_layout">Đang thay đổi bố cục bảng điều khiển</string>
     <string name="changing_dashboard_layout_message">Để thay đổi bố cục bảng điều khiển, bạn phải khởi động lại ứng dụng</string>
     <string name="restart_now">Khởi động lại ngay</string>
+    <string name="turn_on_new_dashboard">Bật bảng điều khiển mới</string>
     <string name="switched_back">Bạn đã chuyển lại rồi à?</string>
     <string name="switched_back_message">Cảm ơn bạn đã thử dùng bảng điều khiển mới! Bạn có thể cho chúng tôi biết lý do bạn chuyển lại không?</string>
+    <string name="survey_option_hard_to_find">Khó tìm nội dung</string>
+    <string name="survey_option_prefer_old_layout">Thích bố cục cũ hơn</string>
+    <string name="survey_option_something_broken">Có gì đó không hiệu quả</string>
     <string name="what_could_we_improve">Chúng tôi có thể cải thiện điều gì?</string>
+    <string name="what_do_you_think_of_new_dashboard">Bạn nghĩ gì về bảng điều khiển mới?</string>
+    <string name="let_us_know">Hãy cho chúng tôi biết!</string>
+    <string name="no_app_to_handle_link">Không có ứng dụng nào khả dụng để mở liên kết này</string>
     <string name="skip">Bỏ Qua</string>
     <string name="widget_setting_show_greeting">Hiển thị phần chào hỏi</string>
     <string name="background_color">Màu nền</string>
+    <string name="widget_setting_show_grades">Điểm Khóa Học</string>
+    <string name="widget_setting_show_color_overlay">Lớp Phủ Màu Khóa Học</string>
     <string name="offline_content_available">Không có nội dung ngoại tuyến nào khả dụng</string>
     <string name="a11y_contentDescription_moreOptions">Tùy chọn khác</string>
     <string name="customizeCourse">Tùy Chỉnh Khóa Học</string>
     <string name="favoriteCoursesAndGroups">Khóa Học và Nhóm Yêu Thích</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">Công Cụ Ngoài không khả dụng ngoại tuyến.</string>
+    <string name="widget_weekly_summary">Tóm Tắt Hàng Tuần</string>
+
+    <string name="dashboardCourseNickname">Biệt Danh</string>
+    <string name="dashboardCourseNicknameHint">Viết biệt danh khóa học ở đây</string>
+    <string name="dashboardCourseColor">Màu Khóa Học</string>
+    <string name="widget_toDo">Cần Làm Hàng Ngày</string>
+    <string name="dailyToDoWidgetTitle">Cần Làm Hàng Ngày</string>
+    <string name="todoWidget_showCompleted">Hiển Thị Mục Đã Hoàn Thành</string>
+    <string name="todoWidget_emptyTitle">Bây giờ, bạn đã hoàn tất mọi việc!</string>
+    <string name="todoWidget_emptyMessage">Có vẻ như hôm nay bạn đang rảnh.\nBạn có muốn thêm một số việc Cần Làm không?</string>
+    <string name="todoWidget_addTodo">Thêm Việc Cần Làm</string>
+    <string name="todoWidget_errorTitle">Rất tiếc, Đã xảy ra vấn đề</string>
+    <string name="todoWidget_errorMessage">Không thể tải danh sách Cần Làm.\nThử lại hoặc quay lại sau.</string>
+    <string name="todoWidget_refresh">Làm Mới</string>
+    <string name="todoWidget_today">Hôm Nay</string>
+    <string name="a11y_todoWidget_jumpToToday">Chuyển đến hôm nay</string>
+    <string name="widgetSettings_widgetsColor">Màu Chính của Bảng Điều Khiển</string>
+    <string name="dashboard_globalAnnouncement">Thông Báo Toàn Cầu</string>
+    <string name="forecastWidget_currentWeek">Tuần hiện tại</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values-zh/strings.xml b/libs/pandares/src/main/res/values-zh/strings.xml
index ea3778865f..457cdabd03 100644
--- a/libs/pandares/src/main/res/values-zh/strings.xml
+++ b/libs/pandares/src/main/res/values-zh/strings.xml
@@ -45,6 +45,7 @@
     <string name="submissionStatusFailedTitle">提交文件失败</string>
     <string name="submissionStatusFailedSubtitle">轻按以查看详细信息</string>
     <string name="submissionAndRubric">提交项和评价量规</string>
+    <string name="submissionAndFeedback">提交内容和反馈</string>
     <string name="commentsAndRubric">备注和评分细则</string>
     <string name="errorLoadingAssignment">加载此作业时发生问题。请检查您的连接，然后再试一次。</string>
     <string name="submitted">已提交</string>
@@ -214,6 +215,7 @@
 
     <!-- Date strings -->
     <string name="today">今天</string>
+    <string name="tomorrow">明天</string>
     <string name="past">过去</string>
     <string name="noDate">无日期</string>
     <string name="future">未来</string>
@@ -286,6 +288,7 @@
     <string name="monologue">独白</string>
     <string name="noItemsToDisplayShort">没有项目显示</string>
     <string name="Todo">待办事项</string>
+    <string name="TodoNew">待办</string>
     <string name="todoFilter">过滤课程</string>
     <string name="filterByEllipsis">过滤条件...</string>
     <string name="favoriteCoursesLabel">最喜欢的课程</string>
@@ -463,6 +466,7 @@
     <string name="groups">小组</string>
     <string name="groupMembers">小组成员</string>
 
+    <string name="messageGroup">消息组</string>
     <string name="loading">正在加载&#8230;</string>
     <string name="select_item_to_display">从列表中选择</string>
 
@@ -679,9 +683,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">待办事项</string>
+    <string name="todoWidgetTitleNew">待办</string>
     <string name="gradesWidgetTitle">评分</string>
     <string name="notificationWidgetTitle">通知</string>
     <string name="todoWidgetTitleLong">Canvas - 待办事项</string>
+    <string name="todoWidgetTitleLongNew">Canvas - 待办</string>
     <string name="gradesWidgetTitleLong">Canvas - 评分</string>
     <string name="gradeWidgetTitleLong">Canvas - 年级</string>
     <string name="notificationWidgetTitleLong">Canvas - 通知</string>
@@ -717,6 +723,8 @@
     <!-- Tablet Strings -->
     <string name="courses">课程</string>
     <string name="toDoList">待办事项列表</string>
+    <string name="toDoListNew">待办任务列表</string>
+
     <string name="notifications">通知</string>
     <string name="pushNotifications">推送通知</string>
     <string name="pushNotificationsError">未在此设备上注册推送通知。</string>
@@ -731,7 +739,6 @@
 
     <string name="launchSpeedgrader">打开 Speedgrader</string>
 
-    <string name="search_todo">待办事项 待办事项的待办列表</string>
     <string name="search_course">课程 课程 课时 课时</string>
     <string name="search_grades">评分 成绩</string>
 
@@ -1059,6 +1066,13 @@
     <string name="pageTitleMustBeSet">必须设置页面标题。</string>
     <string name="pageDetails">页面详细信息</string>
     <string name="saving">正在保存</string>
+    <string name="speedGraderSaving">正在保存</string>
+    <string name="speedGraderSaved">已保存</string>
+    <string name="speedGraderFailed">失败</string>
+    <string name="speedGraderSaveErrorTitle">糟糕，出错了</string>
+    <string name="speedGraderSaveErrorMessage">保存评分修改时出错。您可以重试或稍后再试。</string>
+    <string name="speedGraderSaveErrorContentDescription">保存评分失败。单击以查看详细信息。</string>
+
     <string name="confirmDeleteEvent">是否确定要删除此活动？</string>
     <string name="conferencesNotSupported">会议目前不支持移动设备。</string>
     <string name="filePreviewContentDescription">文件预览图像</string>
@@ -1204,6 +1218,10 @@
     <string name="recordings">录制文件</string>
     <string name="conferenceInProgress">会议进行中</string>
 
+    <!-- Conferences Widget -->
+    <string name="conferencesWidgetTitle">会议 (%d)</string>
+    <string name="conferencesWidgetConferenceInProgress">会议进行中</string>
+    <string name="conferencesWidgetDismissed">已忽略会议</string>
     <string name="a11y_criterion_content_description">标准评分 %s</string>
     <string name="a11y_criterion_description_content_description">%s，%s</string>
     <string name="a11y_criterion_button_click_description">更多信息</string>
@@ -1351,6 +1369,9 @@
     <plurals name="a11y_todoBadgeCount">
         <item quantity="other">%s 个待办任务</item>
     </plurals>
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="other">%s 个待办任务</item>
+    </plurals>
     <string name="noAnnotationSelected">未选择任何批注</string>
     <string name="emailNotifications">电子邮件通知</string>
     <string name="emailNotificationsImmediately">立即</string>
@@ -1632,7 +1653,9 @@
     <string name="calendarNoEvents">今天没有事件！</string>
     <string name="calendarNoEventsDescription">今天是休息放松的一天。</string>
     <string name="userCalendarToDo">待办事项</string>
+    <string name="userCalendarToDoNew">待办</string>
     <string name="courseToDo">%s待办事项</string>
+    <string name="courseToDoNew">%s 个待办</string>
     <string name="calendarEventExcused">已免除</string>
     <string name="calendarEventMissing">未交</string>
     <string name="calendarEventGraded">已评分</string>
@@ -1657,21 +1680,30 @@
     <string name="a11y_eventCreatedAnnouncement">已成功创建事件 %s。</string>
     <string name="a11y_eventUpdatedAnnouncement">已成功更新事件 %s。</string>
     <string name="a11y_toDoCreatedAnnouncement">已成功创建待办事项 %s。</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">已成功创建待办任务 %s。</string>
     <string name="a11y_toDoUpdatedAnnouncement">已成功更新待办事项 %s。</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">已成功更新待办任务 %s。</string>
     <string name="todoScreenTitle">待办事项</string>
+    <string name="todoScreenTitleNew">待办</string>
     <string name="todoDateLabel">日期</string>
     <string name="todoDescriptionLabel">说明</string>
     <string name="todoDeleteConfirmationTitle">是否删除待办事项？</string>
+    <string name="todoDeleteConfirmationTitleNew">是否删除待办任务？</string>
     <string name="todoDeleteConfirmationText">这将永久删除您的待办事项。</string>
+    <string name="todoDeleteConfirmationTextNew">您的待办任务将永久删除。</string>
     <string name="todoDeleteErrorMessage">删除此待办事项时发生错误。请检查连接，然后重试。</string>
+    <string name="todoDeleteErrorMessageNew">删除此待办任务时出错。请检查连接状况并重试。</string>
     <string name="createTodoScreenTitle">新待办事项</string>
+    <string name="createTodoScreenTitleNew">新建待办任务</string>
     <string name="editTodoScreenTitle">编辑待办事项</string>
+    <string name="editTodoScreenTitleNew">编辑待办任务</string>
     <string name="createToDoTitleHint">添加标题</string>
     <string name="createToDoDateLabel">日期</string>
     <string name="createToDoTimeLabel">时间</string>
     <string name="createToDoCalendarLabel">日历</string>
     <string name="createToDoDetailsLabel">详情</string>
     <string name="todoSaveErrorMessage">保存此待办事项时发生错误。请检查连接，然后重试。</string>
+    <string name="todoSaveErrorMessageNew">保存此待办任务时出错。请检查连接状况并重试。</string>
     <string name="selectCalendarScreenTitle">选择日历</string>
     <string name="errorContentRetryButton">重试</string>
     <string name="eventLocationLabel">位置</string>
@@ -1679,6 +1711,7 @@
     <string name="eventDetailsLabel">详情</string>
     <string name="errorLoadingEvent">加载此事件时遇到问题。请检查连接，然后重试。</string>
     <string name="errorLoadingTodo">加载此待办事项时遇到问题。请检查连接，然后重试。</string>
+    <string name="errorLoadingTodoNew">加载此待办任务时出错。请检查连接状况并重试。</string>
     <string name="eventDeleteConfirmationTitle">是否删除事件？</string>
     <string name="eventDeleteConfirmationText">您的事件将永久删除。</string>
     <string name="eventDeleteErrorMessage">删除此事件时出错。请检查连接，然后重试。</string>
@@ -1694,6 +1727,7 @@
     <string name="eventDeleteScopeAll">所有事件</string>
     <string name="eventDeleteScopeFollowing">此事件和所有后续事件</string>
     <string name="calendarAddToDo">添加到待办事项</string>
+    <string name="calendarAddToDoNew">添加任务</string>
     <string name="calendarAddEvent">添加事件</string>
     <string name="createEventScreenTitle">新事件</string>
     <string name="editEventScreenTitle">编辑事件</string>
@@ -2066,7 +2100,9 @@
     <string name="widgetNotLoggedInTitle">请登录！</string>
     <string name="widgetToDoNotLoggedInSubtitle">要查看任务，请在应用程序中登录您的帐户。只需片刻！</string>
     <string name="a11y_widgetToDoOpenToDoList">打开任务列表页面</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">打开待办任务列表页面</string>
     <string name="a11y_widgetToDoCreateNewToDo">新建任务 </string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">新建待办任务</string>
     <string name="widgetGradesErrorSubtitle">目前显示您的年级时遇到问题。请稍后再试或前往应用程序。</string>
     <string name="widgetGradesNotLoggedInSubtitle">要查看您的年级，请在应用程序中登录您的帐户。只需片刻！</string>
     <string name="widgetSingleGradeErrorSubtitle">目前显示您的年级时遇到问题。</string>
@@ -2074,6 +2110,19 @@
     <string name="widgetSingleGradeSelectCourse">请选择课程</string>
     <string name="widgetGradesErrorLoadingCourses">加载课程时出错。</string>
     <string name="settingsSwitchExperience">切换到 Canvas Career</string>
+    <string name="forecastWidgetTitle">每周摘要</string>
+    <string name="forecastWidgetWeekPeriod">第 %2$s | %1$d 周</string>
+    <string name="forecastWidgetMissing">未交</string>
+    <string name="forecastWidgetDue">截止</string>
+    <string name="forecastWidgetRecentGrades">新评分</string>
+    <string name="forecastWidgetGradeWeight">%d%% 的最终评分</string>
+    <string name="forecastWidgetErrorMessage">加载您的作业时遇到问题。请检查连接，然后重试。</string>
+    <string name="forecastWidgetEmptyMissing">没有缺交作业。您已经全部赶上了！</string>
+    <string name="forecastWidgetEmptyDue">没有本周截止的作业。</string>
+    <string name="forecastWidgetEmptyRecentGrades">本周没有新评分。</string>
+    <string name="a11y_contentDescription_previousWeek">上一周</string>
+    <string name="a11y_contentDescription_nextWeek">下一周</string>
+
     <string name="speedGraderGradeTabTitle">评分和评价量规</string>
     <string name="speedGraderDetailsTabTitle">详情</string>
     <string name="a11y_contentDescription_expandPanel">展开面板</string>
@@ -2150,6 +2199,7 @@
     <string name="errorLoadingToDos">加载待办任务时出错。请检查连接，然后重试。</string>
     <string name="errorUpdatingToDo">更新待办任务时出错。请检查连接，然后重试。</string>
     <string name="noToDosForNow">暂时没有待办任务！</string>
+    <string name="noToDosForNowNew">暂时没有待办任务！</string>
     <string name="noToDosForNowSubtext">现在似乎是休息放松的好时机。</string>
     <string name="todoSwipeDone">完成</string>
     <string name="todoSwipeUndo">后退</string>
@@ -2160,8 +2210,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">待办任务首选项</string>
+    <string name="todoFilterPreferencesNew">待办任务列表首选项</string>
     <string name="todoFilterVisibleItems">可见任务</string>
     <string name="todoFilterShowPersonalToDos">显示个人待办任务</string>
+    <string name="todoFilterShowPersonalToDosNew">显示个人待办任务</string>
     <string name="todoFilterShowCalendarEvents">显示日历事件</string>
     <string name="todoFilterShowCompleted">显示已完成</string>
     <string name="todoFilterFavoriteCoursesOnly">仅限收藏的课程</string>
@@ -2188,6 +2240,9 @@
     <string name="courseInvitationDeclineConfirmTitle">拒绝邀请</string>
     <string name="courseInvitationDeclineConfirmMessage">是否确实要拒绝%s邀请？</string>
 
+    <!-- Progress Widget -->
+    <string name="progressWidgetTitle">进度、进步</string>
+
     <!-- Welcome Widget -->
     <!-- Greetings with name (%s is the student's first name) -->
     <string name="welcomeGreetingMorningWithName">早上好，%s！</string>
@@ -2310,6 +2365,7 @@
     <!-- Widget Display Names -->
     <string name="widget_hello">您好，%s</string>
 
+    <string name="courses_and_groups">课程和小组</string>
     <!-- Customize Dashboard -->
     <string name="customize_dashboard">自定义控制面板</string>
     <string name="dashboard_widgets">小工具</string>
@@ -2319,16 +2375,44 @@
     <string name="changing_dashboard_layout">更改控制面板布局</string>
     <string name="changing_dashboard_layout_message">要更改控制面板布局，必须重启应用程序</string>
     <string name="restart_now">立即重启</string>
+    <string name="turn_on_new_dashboard">打开新的控制面板</string>
     <string name="switched_back">是否换回旧版？</string>
     <string name="switched_back_message">感谢您尝试新的控制面板！请告诉我们您换回旧版的原因。</string>
+    <string name="survey_option_hard_to_find">难以查找内容</string>
+    <string name="survey_option_prefer_old_layout">偏好原布局</string>
+    <string name="survey_option_something_broken">出现异常</string>
     <string name="what_could_we_improve">请为我们提供改进建议。</string>
+    <string name="what_do_you_think_of_new_dashboard">您对新控制面板的评价如何？</string>
+    <string name="let_us_know">请告诉我们！</string>
+    <string name="no_app_to_handle_link">没有应用程序可打开此链接</string>
     <string name="skip">略过</string>
     <string name="widget_setting_show_greeting">显示欢迎</string>
     <string name="background_color">背景色</string>
+    <string name="widget_setting_show_grades">课程评分</string>
+    <string name="widget_setting_show_color_overlay">课程颜色叠加</string>
     <string name="offline_content_available">可用的离线内容</string>
     <string name="a11y_contentDescription_moreOptions">更多选项</string>
     <string name="customizeCourse">自定义课程</string>
     <string name="favoriteCoursesAndGroups">收藏的课程和小组</string>
     <string name="collapsibleSectionTitle">%1$s (%2$d)</string>
     <string name="ltiToolsOffline">外部工具无法离线使用。</string>
+    <string name="widget_weekly_summary">每周摘要</string>
+
+    <string name="dashboardCourseNickname">昵称</string>
+    <string name="dashboardCourseNicknameHint">在此处撰写课程别称</string>
+    <string name="dashboardCourseColor">课程颜色</string>
+    <string name="widget_toDo">每日待办任务</string>
+    <string name="dailyToDoWidgetTitle">每日待办任务</string>
+    <string name="todoWidget_showCompleted">显示已完成</string>
+    <string name="todoWidget_emptyTitle">您的任务已全部完成！</string>
+    <string name="todoWidget_emptyMessage">您今天没有任务。\n是否要添加一些任务？</string>
+    <string name="todoWidget_addTodo">添加任务</string>
+    <string name="todoWidget_errorTitle">糟糕，出错了</string>
+    <string name="todoWidget_errorMessage">无法加载您的待办任务。\n再试一次，或稍后回来。</string>
+    <string name="todoWidget_refresh">刷新</string>
+    <string name="todoWidget_today">今天</string>
+    <string name="a11y_todoWidget_jumpToToday">跳到今天</string>
+    <string name="widgetSettings_widgetsColor">控制面板主要颜色</string>
+    <string name="dashboard_globalAnnouncement">全局公告</string>
+    <string name="forecastWidget_currentWeek">本周</string>
 </resources>
diff --git a/libs/pandares/src/main/res/values/strings.xml b/libs/pandares/src/main/res/values/strings.xml
index 9743da6224..030560e018 100644
--- a/libs/pandares/src/main/res/values/strings.xml
+++ b/libs/pandares/src/main/res/values/strings.xml
@@ -293,6 +293,7 @@
     <string name="monologue">Monologue</string>
     <string name="noItemsToDisplayShort">No items to display</string>
     <string name="Todo">To Do</string>
+    <string name="TodoNew">To-do</string>
     <string name="todoFilter">Filter Courses</string>
     <string name="filterByEllipsis">Filter by…</string>
     <string name="favoriteCoursesLabel">Favorite Courses</string>
@@ -693,9 +694,11 @@
 
     <!-- Widget Strings -->
     <string name="todoWidgetTitle">To Do</string>
+    <string name="todoWidgetTitleNew">To-do</string>
     <string name="gradesWidgetTitle">Grades</string>
     <string name="notificationWidgetTitle">Notifications</string>
     <string name="todoWidgetTitleLong">Canvas - To Do</string>
+    <string name="todoWidgetTitleLongNew">Canvas - To-do</string>
     <string name="gradesWidgetTitleLong">Canvas - Grades</string>
     <string name="gradeWidgetTitleLong">Canvas - Grade</string>
     <string name="notificationWidgetTitleLong">Canvas - Notifications</string>
@@ -731,6 +734,7 @@
     <!-- Tablet Strings -->
     <string name="courses">Courses</string>
     <string name="toDoList">To Do List</string>
+    <string name="toDoListNew">To-do List</string>
     <string name="notifications">Notifications</string>
     <string name="pushNotifications">Push Notifications</string>
     <string name="pushNotificationsError">Push Notifications have not been registered for this device.</string>
@@ -745,7 +749,6 @@
 
     <string name="launchSpeedgrader">Open Speedgrader</string>
 
-    <string name="search_todo">todo to do todos todo list</string>
     <string name="search_course">course courses class classes</string>
     <string name="search_grades">grade grades</string>
 
@@ -1397,6 +1400,11 @@
         <item quantity="other">%s to do items</item>
     </plurals>
 
+    <plurals name="a11y_todoBadgeCountNew">
+        <item quantity="one">%s to-do item</item>
+        <item quantity="other">%s to-do items</item>
+    </plurals>
+
     <string name="noAnnotationSelected">No annotation selected</string>
 
     <string name="emailNotifications">Email Notifications</string>
@@ -1687,7 +1695,9 @@
     <string name="calendarNoEvents">No Events Today!</string>
     <string name="calendarNoEventsDescription">It looks like a great day to rest, relax, and recharge.</string>
     <string name="userCalendarToDo">To Do</string>
+    <string name="userCalendarToDoNew">To-do</string>
     <string name="courseToDo">%s To Do</string>
+    <string name="courseToDoNew">%s To-do</string>
     <string name="calendarEventExcused">Excused</string>
     <string name="calendarEventMissing">Missing</string>
     <string name="calendarEventGraded">Graded</string>
@@ -1712,22 +1722,31 @@
     <string name="a11y_eventCreatedAnnouncement">Event %s successfully created.</string>
     <string name="a11y_eventUpdatedAnnouncement">Event %s successfully updated.</string>
     <string name="a11y_toDoCreatedAnnouncement">To do %s successfully created.</string>
+    <string name="a11y_toDoCreatedAnnouncementNew">To-do %s successfully created.</string>
     <string name="a11y_toDoUpdatedAnnouncement">To do %s successfully updated.</string>
+    <string name="a11y_toDoUpdatedAnnouncementNew">To-do %s successfully updated.</string>
 
     <string name="todoScreenTitle">To Do</string>
+    <string name="todoScreenTitleNew">To-do</string>
     <string name="todoDateLabel">Date</string>
     <string name="todoDescriptionLabel">Description</string>
     <string name="todoDeleteConfirmationTitle">Delete To Do?</string>
+    <string name="todoDeleteConfirmationTitleNew">Delete To-do?</string>
     <string name="todoDeleteConfirmationText">This will permanently delete your To Do item.</string>
+    <string name="todoDeleteConfirmationTextNew">This will permanently delete your To-do item.</string>
     <string name="todoDeleteErrorMessage">There was an error deleting this To Do. Please check your connection and try again.</string>
+    <string name="todoDeleteErrorMessageNew">There was an error deleting this To-do. Please check your connection and try again.</string>
     <string name="createTodoScreenTitle">New To Do</string>
+    <string name="createTodoScreenTitleNew">New To-do</string>
     <string name="editTodoScreenTitle">Edit To Do</string>
+    <string name="editTodoScreenTitleNew">Edit To-do</string>
     <string name="createToDoTitleHint">Add title</string>
     <string name="createToDoDateLabel">Date</string>
     <string name="createToDoTimeLabel">Time</string>
     <string name="createToDoCalendarLabel">Calendar</string>
     <string name="createToDoDetailsLabel">Details</string>
     <string name="todoSaveErrorMessage">There was an error saving this To Do. Please check your connection and try again.</string>
+    <string name="todoSaveErrorMessageNew">There was an error saving this To-do. Please check your connection and try again.</string>
     <string name="selectCalendarScreenTitle">Select Calendar</string>
 
     <string name="errorContentRetryButton">Retry</string>
@@ -1737,6 +1756,7 @@
     <string name="eventDetailsLabel">Details</string>
     <string name="errorLoadingEvent">There was a problem loading this event. Please check your connection and try again.</string>
     <string name="errorLoadingTodo">There was a problem loading this todo. Please check your connection and try again.</string>
+    <string name="errorLoadingTodoNew">There was a problem loading this to-do. Please check your connection and try again.</string>
     <string name="eventDeleteConfirmationTitle">Delete Event?</string>
     <string name="eventDeleteConfirmationText">This will permanently delete your event.</string>
     <string name="eventDeleteErrorMessage">There was an error deleting this event. Please check your connection and try again.</string>
@@ -1753,6 +1773,7 @@
     <string name="eventDeleteScopeAll">All events</string>
     <string name="eventDeleteScopeFollowing">This and all following events</string>
     <string name="calendarAddToDo">Add To Do</string>
+    <string name="calendarAddToDoNew">Add To-do</string>
     <string name="calendarAddEvent">Add Event</string>
 
     <string name="createEventScreenTitle">New Event</string>
@@ -2133,7 +2154,9 @@
     <string name="widgetNotLoggedInTitle">Let\'s Get You Logged In!</string>
     <string name="widgetToDoNotLoggedInSubtitle">To see your to-dos, please log in to your account in the app. It\'ll just take a sec!</string>
     <string name="a11y_widgetToDoOpenToDoList">Open To Do list screen</string>
+    <string name="a11y_widgetToDoOpenToDoListNew">Open To-do list screen</string>
     <string name="a11y_widgetToDoCreateNewToDo">Create new To Do</string>
+    <string name="a11y_widgetToDoCreateNewToDoNew">Create new To-do</string>
 
     <string name="widgetGradesErrorSubtitle">We\'re having trouble showing your grades right now. Please try again in a bit or head to the app.</string>
     <string name="widgetGradesNotLoggedInSubtitle">To see your grades, please log in to your account in the app. It\'ll just take a sec!</string>
@@ -2233,6 +2256,7 @@
     <string name="errorLoadingToDos">There was an error loading your to-do items. Please check your connection and try again.</string>
     <string name="errorUpdatingToDo">There was an error updating the to-do item. Please check your connection and try again.</string>
     <string name="noToDosForNow">No To Dos for now!</string>
+    <string name="noToDosForNowNew">No To-dos for now!</string>
     <string name="noToDosForNowSubtext">It looks like a great time to rest, relax, and recharge.</string>
     <string name="todoSwipeDone">Done</string>
     <string name="todoSwipeUndo">Undo</string>
@@ -2243,8 +2267,10 @@
 
     <!-- To Do List Filter Screen -->
     <string name="todoFilterPreferences">To Do list Preferences</string>
+    <string name="todoFilterPreferencesNew">To-do list Preferences</string>
     <string name="todoFilterVisibleItems">Visible Items</string>
     <string name="todoFilterShowPersonalToDos">Show Personal To Dos</string>
+    <string name="todoFilterShowPersonalToDosNew">Show Personal To-dos</string>
     <string name="todoFilterShowCalendarEvents">Show Calendar Events</string>
     <string name="todoFilterShowCompleted">Show Completed</string>
     <string name="todoFilterFavoriteCoursesOnly">Favourite Courses Only</string>
diff --git a/libs/pandautils/build.gradle b/libs/pandautils/build.gradle
index 69cb1b73ce..93c3c1b49c 100644
--- a/libs/pandautils/build.gradle
+++ b/libs/pandautils/build.gradle
@@ -187,6 +187,7 @@ dependencies {
     implementation Libs.ANDROIDX_CONSTRAINT_LAYOUT
     implementation Libs.ANDROIDX_WEBKIT
     implementation Libs.PLAY_IN_APP_UPDATES
+    implementation Libs.MLKIT_DOCUMENT_SCANNER
 
     /* Work Manager */
     implementation Libs.ANDROIDX_WORK_MANAGER
@@ -234,6 +235,7 @@ dependencies {
     api Libs.COMPOSE_FRAGMENT
     api Libs.COMPOSE_REORDERABLE
 
+    api Libs.PENDO
 
     implementation Libs.FLEXBOX_LAYOUT
 
diff --git a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendar/CalendarScreenTest.kt b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendar/CalendarScreenTest.kt
index 52818bc0fa..33b36bb736 100644
--- a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendar/CalendarScreenTest.kt
+++ b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendar/CalendarScreenTest.kt
@@ -175,7 +175,7 @@ class CalendarScreenTest {
 
         val fab = composeTestRule.onNode(hasContentDescription("Add new calendar item"))
         fab.assertIsDisplayed()
-        val addToDoItem = composeTestRule.onNode((hasText("Add To Do")))
+        val addToDoItem = composeTestRule.onNode((hasText("Add To-do")))
         addToDoItem.assertIsNotDisplayed()
         val addEventItem = composeTestRule.onNode((hasText("Add Event")))
         addEventItem.assertIsNotDisplayed()
@@ -207,7 +207,7 @@ class CalendarScreenTest {
         fab.assertIsDisplayed()
         fab.performClick()
         composeTestRule.waitForIdle()
-        val addToDoItem = composeTestRule.onNode((hasText("Add To Do")))
+        val addToDoItem = composeTestRule.onNode((hasText("Add To-do")))
         addToDoItem.assertIsDisplayed()
         val addEventItem = composeTestRule.onNode((hasText("Add Event")))
         addEventItem.assertIsDisplayed()
@@ -274,7 +274,7 @@ class CalendarScreenTest {
         val fab = composeTestRule.onNode(hasContentDescription("Add new calendar item"))
         fab.performClick()
         composeTestRule.waitForIdle()
-        val addToDo = composeTestRule.onNode((hasText("Add To Do")))
+        val addToDo = composeTestRule.onNode((hasText("Add To-do")))
         addToDo.performClick()
         composeTestRule.waitForIdle()
 
@@ -334,7 +334,7 @@ class CalendarScreenTest {
         fab.performClick()
         composeTestRule.waitForIdle()
         
-        val addToDoItem = composeTestRule.onNode((hasText("Add To Do")))
+        val addToDoItem = composeTestRule.onNode((hasText("Add To-do")))
         addToDoItem.assertIsDisplayed()
         
         val addEventItem = composeTestRule.onNode((hasText("Add Event")))
@@ -368,7 +368,7 @@ class CalendarScreenTest {
         fab.performClick()
         composeTestRule.waitForIdle()
         
-        val addToDoItem = composeTestRule.onNode((hasText("Add To Do")))
+        val addToDoItem = composeTestRule.onNode((hasText("Add To-do")))
         addToDoItem.assertIsDisplayed()
         
         val addEventItem = composeTestRule.onNode((hasText("Add Event")))
diff --git a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendartodo/details/ToDoScreenTest.kt b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendartodo/details/ToDoScreenTest.kt
index 767f6dc268..d727acc293 100644
--- a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendartodo/details/ToDoScreenTest.kt
+++ b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/compose/features/calendartodo/details/ToDoScreenTest.kt
@@ -51,7 +51,7 @@ class ToDoScreenTest {
     fun assertToolbar() {
         composeTestRule.setContent {
             ToDoScreen(
-                title = "To Do",
+                title = "To-do",
                 toDoUiState = ToDoUiState(),
                 actionHandler = {},
                 navigationActionClick = {},
@@ -60,7 +60,7 @@ class ToDoScreenTest {
 
         val toolbar = composeTestRule.onNodeWithTag("toolbar")
         toolbar.assertExists()
-        composeTestRule.onNode(hasParent(hasTestTag("toolbar")).and(hasText("To Do")))
+        composeTestRule.onNode(hasParent(hasTestTag("toolbar")).and(hasText("To-do")))
             .assertIsDisplayed()
         val backButton =
             composeTestRule.onNode(hasParent(hasTestTag("toolbar")).and(hasContentDescription("Back")))
@@ -78,7 +78,7 @@ class ToDoScreenTest {
     fun assertToolbarActions() {
         composeTestRule.setContent {
             ToDoScreen(
-                title = "To Do",
+                title = "To-do",
                 toDoUiState = ToDoUiState(),
                 actionHandler = {},
                 navigationActionClick = {},
@@ -102,8 +102,8 @@ class ToDoScreenTest {
             .assertHasClickAction()
             .performClick()
 
-        composeTestRule.onNode(hasText("Delete To Do?")).assertIsDisplayed()
-        composeTestRule.onNode(hasText("This will permanently delete your To Do item."))
+        composeTestRule.onNode(hasText("Delete To-do?")).assertIsDisplayed()
+        composeTestRule.onNode(hasText("This will permanently delete your To-do item."))
             .assertIsDisplayed()
         val cancelDelete = composeTestRule.onNode(hasText("Cancel"))
         cancelDelete
@@ -121,14 +121,14 @@ class ToDoScreenTest {
             ToDoScreen(
                 title = "Toolbar title",
                 toDoUiState = ToDoUiState(
-                    title = "To Do title",
+                    title = "To-do title",
                 ),
                 actionHandler = {},
                 navigationActionClick = {},
             )
         }
 
-        composeTestRule.onNode(hasText("To Do title")).assertIsDisplayed()
+        composeTestRule.onNode(hasText("To-do title")).assertIsDisplayed()
     }
 
     @SuppressLint("MissingColorAlphaChannel")
@@ -138,7 +138,7 @@ class ToDoScreenTest {
             ToDoScreen(
                 title = "Toolbar title",
                 toDoUiState = ToDoUiState(
-                    title = "To Do title",
+                    title = "To-do title",
                     contextName = "Canvas Context",
                     contextColor = 0x000000,
                 ),
@@ -166,7 +166,7 @@ class ToDoScreenTest {
             ToDoScreen(
                 title = "Toolbar title",
                 toDoUiState = ToDoUiState(
-                    title = "To Do title",
+                    title = "To-do title",
                     date = dateTitle,
                 ),
                 actionHandler = {},
@@ -183,15 +183,15 @@ class ToDoScreenTest {
             ToDoScreen(
                 title = "Toolbar title",
                 toDoUiState = ToDoUiState(
-                    title = "To Do title",
-                    description = "To Do description",
+                    title = "To-do title",
+                    description = "To-do description",
                 ),
                 actionHandler = {},
                 navigationActionClick = {},
             )
         }
 
-        composeTestRule.onNode(hasText("To Do description")).assertIsDisplayed()
+        composeTestRule.onNode(hasText("To-do description")).assertIsDisplayed()
     }
 
     @Test
@@ -200,7 +200,7 @@ class ToDoScreenTest {
             ToDoScreen(
                 title = "Toolbar title",
                 toDoUiState = ToDoUiState(
-                    title = "To Do title",
+                    title = "To-do title",
                     errorSnack = "Error message",
                 ),
                 actionHandler = {},
diff --git a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/ToDoListScreenTest.kt b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/ToDoListScreenTest.kt
index fe2812272d..d8de06f543 100644
--- a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/ToDoListScreenTest.kt
+++ b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/ToDoListScreenTest.kt
@@ -89,7 +89,7 @@ class ToDoListScreenTest {
         }
 
         composeTestRule.onNodeWithTag("todoListEmpty").assertIsDisplayed()
-        composeTestRule.onNodeWithText(context.getString(R.string.noToDosForNow)).assertIsDisplayed()
+        composeTestRule.onNodeWithText(context.getString(R.string.noToDosForNowNew)).assertIsDisplayed()
         composeTestRule.onNodeWithText(context.getString(R.string.noToDosForNowSubtext)).assertIsDisplayed()
     }
 
@@ -245,7 +245,7 @@ class ToDoListScreenTest {
             )
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.noToDosForNow)).assertIsDisplayed()
+        composeTestRule.onNodeWithText(context.getString(R.string.noToDosForNowNew)).assertIsDisplayed()
         composeTestRule.onNodeWithText("Filtered Item").assertIsNotDisplayed()
     }
 
diff --git a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreenTest.kt b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreenTest.kt
index 626bb6644e..e1ae306aaa 100644
--- a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreenTest.kt
+++ b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreenTest.kt
@@ -63,7 +63,7 @@ class ToDoFilterScreenTest {
             )
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDos)).assertIsDisplayed().assertHasClickAction()
+        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDosNew)).assertIsDisplayed().assertHasClickAction()
         composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowCalendarEvents)).assertIsDisplayed().assertHasClickAction()
         composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowCompleted)).assertIsDisplayed().assertHasClickAction()
         composeTestRule.onNodeWithText(context.getString(R.string.todoFilterFavoriteCoursesOnly)).assertIsDisplayed().assertHasClickAction()
@@ -79,7 +79,7 @@ class ToDoFilterScreenTest {
             )
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDos))
+        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDosNew))
             .assertIsDisplayed()
         composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowCalendarEvents))
             .assertIsDisplayed()
@@ -99,7 +99,7 @@ class ToDoFilterScreenTest {
             )
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDos))
+        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDosNew))
             .assertIsDisplayed()
         composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowCalendarEvents))
             .assertIsDisplayed()
@@ -119,7 +119,7 @@ class ToDoFilterScreenTest {
             )
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDos))
+        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDosNew))
             .assertIsDisplayed()
         composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowCalendarEvents))
             .assertIsDisplayed()
@@ -184,7 +184,7 @@ class ToDoFilterScreenTest {
             )
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDos)).performClick()
+        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDosNew)).performClick()
 
         assert(callbackInvoked)
         assertEquals(true, toggledValue)
@@ -238,7 +238,7 @@ class ToDoFilterScreenTest {
             )
         }
 
-        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDos))
+        composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowPersonalToDosNew))
             .assertIsDisplayed()
         composeTestRule.onNodeWithText(context.getString(R.string.todoFilterShowCalendarEvents))
             .assertIsDisplayed()
@@ -276,7 +276,7 @@ class ToDoFilterScreenTest {
         return ToDoFilterUiState(
             checkboxItems = listOf(
                 FilterCheckboxItem(
-                    titleRes = R.string.todoFilterShowPersonalToDos,
+                    titleRes = R.string.todoFilterShowPersonalToDosNew,
                     checked = checkboxStates[0],
                     onToggle = { onCheckboxToggle(0, it) }
                 ),
diff --git a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDaoTest.kt b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDaoTest.kt
index cbbd3fdeea..afca3d59c3 100644
--- a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDaoTest.kt
+++ b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDaoTest.kt
@@ -32,6 +32,7 @@ import com.instructure.pandautils.room.offline.entities.CourseSyncProgressEntity
 import com.instructure.pandautils.room.offline.entities.CourseSyncSettingsEntity
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Before
@@ -198,6 +199,29 @@ class CourseSyncProgressDaoTest {
         assertEquals(entities, result.value)
     }
 
+    @Test
+    fun testFindAllFlow() = runTest {
+        val entities = listOf(
+            CourseSyncProgressEntity(
+                1L,
+                "Course 1",
+                CourseSyncSettingsEntity.TABS.associateWith { TabSyncData(it, ProgressState.IN_PROGRESS) },
+                progressState = ProgressState.IN_PROGRESS
+            ),
+            CourseSyncProgressEntity(
+                2L,
+                "Course 2",
+                CourseSyncSettingsEntity.TABS.associateWith { TabSyncData(it, ProgressState.IN_PROGRESS) },
+                progressState = ProgressState.IN_PROGRESS
+            )
+        )
+
+        courseSyncProgressDao.insertAll(entities)
+
+        val result = courseSyncProgressDao.findAllFlow().first()
+        assertEquals(entities, result)
+    }
+
     @Test
     fun testFindByCourseIdLiveData() = runTest {
         val entities = listOf(
diff --git a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDaoTest.kt b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDaoTest.kt
index 696d0f7f0d..637a6182e7 100644
--- a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDaoTest.kt
+++ b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDaoTest.kt
@@ -30,6 +30,7 @@ import com.instructure.pandautils.room.offline.entities.CourseSyncProgressEntity
 import com.instructure.pandautils.room.offline.entities.FileSyncProgressEntity
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Before
@@ -301,6 +302,44 @@ class FileSyncProgressDaoTest {
         assertEquals(entities, result.value)
     }
 
+    @Test
+    fun testFindAllFlow() = runTest {
+        courseSyncProgressDao.insert(CourseSyncProgressEntity(2L, "Course 2"))
+        val entities = listOf(
+            FileSyncProgressEntity(
+                courseId = 1L,
+                fileName = "File 1",
+                progress = 0,
+                fileSize = 1000L,
+                progressState = ProgressState.IN_PROGRESS,
+                fileId = 1L,
+                id = 1L
+            ),
+            FileSyncProgressEntity(
+                courseId = 1L,
+                fileName = "File 2",
+                progress = 0,
+                fileSize = 1000L,
+                progressState = ProgressState.IN_PROGRESS,
+                fileId = 2L,
+                id = 2L
+            ),
+            FileSyncProgressEntity(
+                courseId = 2L,
+                fileName = "File 3",
+                progress = 0,
+                fileSize = 1000L,
+                progressState = ProgressState.IN_PROGRESS,
+                fileId = 3L,
+                id = 3L
+            )
+        )
+        fileSyncProgressDao.insertAll(entities)
+
+        val result = fileSyncProgressDao.findAllFlow().first()
+        assertEquals(entities, result)
+    }
+
     @Test
     fun testDeleteAll() = runTest {
         val entities = listOf(
diff --git a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDaoTest.kt b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDaoTest.kt
index d930aa8710..cc84b2255f 100644
--- a/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDaoTest.kt
+++ b/libs/pandautils/src/androidTest/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDaoTest.kt
@@ -28,6 +28,7 @@ import com.instructure.pandautils.room.offline.OfflineDatabase
 import com.instructure.pandautils.room.offline.entities.StudioMediaProgressEntity
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Before
@@ -112,6 +113,37 @@ class StudioMediaProgressDaoTest {
         assertEquals(entities, result.value)
     }
 
+    @Test
+    fun testFindAllFlow() = runTest {
+        val entities = listOf(
+            StudioMediaProgressEntity(
+                ltiLaunchId = "1",
+                progress = 0,
+                fileSize = 1000L,
+                progressState = ProgressState.IN_PROGRESS,
+                id = 1
+            ),
+            StudioMediaProgressEntity(
+                ltiLaunchId = "2",
+                progress = 0,
+                fileSize = 1000L,
+                progressState = ProgressState.IN_PROGRESS,
+                id = 2
+            ),
+            StudioMediaProgressEntity(
+                ltiLaunchId = "3",
+                progress = 0,
+                fileSize = 1000L,
+                progressState = ProgressState.IN_PROGRESS,
+                id = 3
+            )
+        )
+        studioMediaProgressDao.insertAll(entities)
+
+        val result = studioMediaProgressDao.findAllFlow().first()
+        assertEquals(entities, result)
+    }
+
     @Test
     fun testDeleteAll() = runTest {
         val entities = listOf(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/analytics/OfflineAnalyticsManager.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/analytics/OfflineAnalyticsManager.kt
index d6b3ec79b0..e34bf46ff6 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/analytics/OfflineAnalyticsManager.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/analytics/OfflineAnalyticsManager.kt
@@ -3,8 +3,10 @@ package com.instructure.pandautils.analytics
 import android.content.Context
 import android.os.Bundle
 import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.instructure.canvasapi2.utils.Analytics
@@ -19,7 +21,10 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
-private val Context.sessionDataStore by preferencesDataStore(name = OfflineAnalyticsManager.SESSION_STORE_NAME)
+private val Context.sessionDataStore by preferencesDataStore(
+    name = OfflineAnalyticsManager.SESSION_STORE_NAME,
+    corruptionHandler = ReplaceFileCorruptionHandler { emptyPreferences() }
+)
 
 class OfflineAnalyticsManager @Inject constructor(
     @ApplicationContext private val context: Context,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasAppBar.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasAppBar.kt
index 802b2e18b4..6f51afbb39 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasAppBar.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasAppBar.kt
@@ -18,13 +18,25 @@ package com.instructure.pandautils.compose.composables
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
@@ -38,10 +50,13 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.pandautils.R
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.getActivityOrNull
 
 /**
- * App bar for edit screens/modal screens, the colors are always the same and has smaller elevation.
+ * App bar for edit screens/modal screens, the colors are always the same and has elevation.
  */
 @Composable
 fun CanvasAppBar(
@@ -53,8 +68,18 @@ fun CanvasAppBar(
     navIconContentDescription: String = stringResource(id = R.string.close),
     actions: @Composable RowScope.() -> Unit = {},
     backgroundColor: Color = colorResource(id = R.color.backgroundLightestElevated),
-    textColor: Color = colorResource(id = R.color.textDarkest)
+    textColor: Color = colorResource(id = R.color.textDarkest),
+    windowInsets: WindowInsets = if (ApiPrefs.isMasquerading) {
+        WindowInsets.statusBars.only(WindowInsetsSides.Horizontal)
+    } else {
+        WindowInsets.statusBars
+    }
 ) {
+    val activity = LocalContext.current.getActivityOrNull()
+    activity?.let {
+        ViewStyler.themeStatusBar(activity)
+    }
+
     TopAppBar(
         title = {
             Column(
@@ -76,7 +101,78 @@ fun CanvasAppBar(
                 }
             }
         },
-        elevation = 2.dp,
+        elevation = 0.dp,
+        backgroundColor = backgroundColor,
+        contentColor = textColor,
+        navigationIcon = {
+            IconButton(
+                modifier = Modifier.testTag("navigationButton"),
+                onClick = navigationActionClick
+            ) {
+                Icon(
+                    painter = painterResource(id = navIconRes),
+                    contentDescription = navIconContentDescription
+                )
+            }
+        },
+        modifier = modifier
+            .testTag("toolbar")
+            .windowInsetsPadding(WindowInsets.displayCutout)
+            .graphicsLayer { clip = false }
+            .drawWithContent {
+                drawContent()
+                drawRect(
+                    brush = Brush.verticalGradient(
+                        colors = listOf(Color.Black.copy(alpha = 0.1f), Color.Transparent),
+                        startY = size.height,
+                        endY = size.height + 4.dp.toPx()
+                    ),
+                    topLeft = Offset(0f, size.height),
+                    size = Size(size.width, 4.dp.toPx())
+                )
+            },
+        actions = actions,
+        windowInsets = windowInsets
+    )
+}
+
+/**
+ * App bar for edit screens/modal screens, the colors are always the same and has elevation.
+ */
+@Composable
+fun CanvasAppBar(
+    content: @Composable () -> Unit,
+    navigationActionClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    @DrawableRes navIconRes: Int = R.drawable.ic_close,
+    navIconContentDescription: String = stringResource(id = R.string.close),
+    actions: @Composable RowScope.() -> Unit = {},
+    backgroundColor: Color = colorResource(id = R.color.backgroundLightestElevated),
+    textColor: Color = colorResource(id = R.color.textDarkest),
+    windowInsets: WindowInsets = if (ApiPrefs.isMasquerading) {
+        WindowInsets.statusBars.only(WindowInsetsSides.Horizontal)
+    } else {
+        WindowInsets.statusBars
+    }
+) {
+    val activity = LocalContext.current.getActivityOrNull()
+    activity?.let {
+        ViewStyler.themeStatusBar(activity)
+    }
+
+    TopAppBar(
+        title = {
+            Column(
+                modifier = Modifier.semantics(mergeDescendants = true) {
+                    isTraversalGroup = true
+                    traversalIndex = -1f
+                    heading()
+                }
+            ) {
+                content()
+            }
+        },
+        elevation = 0.dp,
         backgroundColor = backgroundColor,
         contentColor = textColor,
         navigationIcon = {
@@ -90,8 +186,24 @@ fun CanvasAppBar(
                 )
             }
         },
-        modifier = modifier.testTag("toolbar"),
-        actions = actions
+        modifier = modifier
+            .testTag("toolbar")
+            .windowInsetsPadding(WindowInsets.displayCutout)
+            .graphicsLayer { clip = false }
+            .drawWithContent {
+                drawContent()
+                drawRect(
+                    brush = Brush.verticalGradient(
+                        colors = listOf(Color.Black.copy(alpha = 0.1f), Color.Transparent),
+                        startY = size.height,
+                        endY = size.height + 4.dp.toPx()
+                    ),
+                    topLeft = Offset(0f, size.height),
+                    size = Size(size.width, 4.dp.toPx())
+                )
+            },
+        actions = actions,
+        windowInsets = windowInsets
     )
 }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasScaffold.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasScaffold.kt
new file mode 100644
index 0000000000..7f561456c5
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasScaffold.kt
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2025 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.pandautils.compose.composables
+
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.union
+import androidx.compose.material.DrawerDefaults
+import androidx.compose.material.FabPosition
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.ScaffoldState
+import androidx.compose.material.SnackbarHost
+import androidx.compose.material.SnackbarHostState
+import androidx.compose.material.contentColorFor
+import androidx.compose.material.rememberScaffoldState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.unit.Dp
+
+/**
+ * Canvas Scaffold with edge-to-edge support.
+ *
+ * This scaffold is configured for edge-to-edge display:
+ * - TopBar should handle its own status bar insets (CanvasAppBar and CanvasThemedAppBar do this automatically)
+ * - Content area respects window insets via contentWindowInsets parameter
+ * - Horizontal insets are handled at the Activity level, so this scaffold only applies bottom insets by default
+ * - Use this as a drop-in replacement for Material Scaffold in Canvas screens
+ *
+ * @param contentWindowInsets Window insets to apply to content area. Defaults to bottom navigation bar only.
+ *   Horizontal insets (left/right) are handled at the Activity level.
+ *   For screens with text input, use: WindowInsets.ime.union(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom))
+ *   For read-only screens, use: WindowInsets(0, 0, 0, 0) or default
+ */
+@Composable
+fun CanvasScaffold(
+    modifier: Modifier = Modifier,
+    scaffoldState: ScaffoldState = rememberScaffoldState(),
+    topBar: @Composable () -> Unit = {},
+    bottomBar: @Composable () -> Unit = {},
+    snackbarHost: @Composable (SnackbarHostState) -> Unit = { SnackbarHost(it) },
+    floatingActionButton: @Composable () -> Unit = {},
+    floatingActionButtonPosition: FabPosition = FabPosition.End,
+    isFloatingActionButtonDocked: Boolean = false,
+    drawerContent: @Composable (ColumnScope.() -> Unit)? = null,
+    drawerShape: Shape? = null,
+    drawerElevation: Dp = DrawerDefaults.Elevation,
+    drawerBackgroundColor: Color = MaterialTheme.colors.surface,
+    drawerContentColor: Color = contentColorFor(drawerBackgroundColor),
+    drawerScrimColor: Color = DrawerDefaults.scrimColor,
+    backgroundColor: Color = MaterialTheme.colors.background,
+    contentColor: Color = contentColorFor(backgroundColor),
+    contentWindowInsets: WindowInsets = WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).union(WindowInsets.ime),
+    content: @Composable (PaddingValues) -> Unit
+) {
+    Scaffold(
+        modifier = modifier,
+        scaffoldState = scaffoldState,
+        topBar = topBar,
+        bottomBar = bottomBar,
+        snackbarHost = snackbarHost,
+        floatingActionButton = floatingActionButton,
+        floatingActionButtonPosition = floatingActionButtonPosition,
+        isFloatingActionButtonDocked = isFloatingActionButtonDocked,
+        drawerContent = drawerContent,
+        drawerShape = drawerShape ?: MaterialTheme.shapes.large,
+        drawerElevation = drawerElevation,
+        drawerBackgroundColor = drawerBackgroundColor,
+        drawerContentColor = drawerContentColor,
+        drawerScrimColor = drawerScrimColor,
+        backgroundColor = backgroundColor,
+        contentColor = contentColor,
+        contentWindowInsets = contentWindowInsets,
+        content = content
+    )
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasThemedAppBar.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasThemedAppBar.kt
index efbcd9cef9..6b37461711 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasThemedAppBar.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/CanvasThemedAppBar.kt
@@ -18,6 +18,10 @@ package com.instructure.pandautils.compose.composables
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
@@ -37,12 +41,13 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.utils.ThemePrefs
 
 /**
- * App bar for main screens, colors are defined by the Canvas theme.
+ * App bar for main screens, colors are defined by the Canvas theme and has no elevation.
  */
 @Composable
 fun CanvasThemedAppBar(
@@ -54,6 +59,11 @@ fun CanvasThemedAppBar(
     navIconContentDescription: String = stringResource(id = R.string.back),
     backgroundColor: Color = Color(color = ThemePrefs.primaryColor),
     contentColor: Color = Color(color = ThemePrefs.primaryTextColor),
+    windowInsets: WindowInsets = if (ApiPrefs.isMasquerading) {
+        WindowInsets.statusBars.only(WindowInsetsSides.Horizontal)
+    } else {
+        WindowInsets.statusBars
+    },
     actions: @Composable RowScope.() -> Unit = {}
 ) {
     TopAppBar(
@@ -84,6 +94,52 @@ fun CanvasThemedAppBar(
         actions = actions,
         backgroundColor = backgroundColor,
         contentColor = contentColor,
+        navigationIcon = if (navIconRes == null) null else {
+            {
+                IconButton(onClick = navigationActionClick, modifier = Modifier.testTag("navigationButton")) {
+                    Icon(
+                        painterResource(id = navIconRes),
+                        contentDescription = navIconContentDescription
+                    )
+                }
+            }
+        },
+        modifier = modifier.testTag("toolbar"),
+        elevation = 0.dp,
+        windowInsets = windowInsets
+    )
+}
+
+/**
+ * App bar for main screens, colors are defined by the Canvas theme and has no elevation.
+ */
+@Composable
+fun CanvasThemedAppBar(
+    content: @Composable () -> Unit,
+    navigationActionClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    @DrawableRes navIconRes: Int? = R.drawable.ic_back_arrow,
+    navIconContentDescription: String = stringResource(id = R.string.back),
+    backgroundColor: Color = Color(color = ThemePrefs.primaryColor),
+    contentColor: Color = Color(color = ThemePrefs.primaryTextColor),
+    windowInsets: WindowInsets = WindowInsets.statusBars,
+    actions: @Composable RowScope.() -> Unit = {}
+) {
+    TopAppBar(
+        title = {
+            Column(
+                modifier = Modifier.semantics(mergeDescendants = true) {
+                    isTraversalGroup = true
+                    traversalIndex = -1f
+                    heading()
+                }
+            ) {
+                content()
+            }
+        },
+        actions = actions,
+        backgroundColor = backgroundColor,
+        contentColor = contentColor,
         navigationIcon = if (navIconRes == null) null else {
             {
                 IconButton(onClick = navigationActionClick) {
@@ -95,7 +151,8 @@ fun CanvasThemedAppBar(
             }
         },
         modifier = modifier.testTag("toolbar"),
-        elevation = 0.dp
+        elevation = 0.dp,
+        windowInsets = windowInsets
     )
 }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ColorPicker.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ColorPicker.kt
index 075abcefc7..57d8281df8 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ColorPicker.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ColorPicker.kt
@@ -67,6 +67,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.instructure.pandautils.R
 import com.instructure.pandautils.utils.ThemedColor
+import sdk.pendo.io.pendoTag
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -111,7 +112,8 @@ fun ColorPicker(
                 .fillMaxWidth()
                 .then(if (isCollapsible) Modifier.clickable { isExpanded = !isExpanded } else Modifier)
                 .padding(vertical = 12.dp)
-                .then(titleModifier),
+                .then(titleModifier)
+                .pendoTag("colorPickerTitle", true),
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(
@@ -193,7 +195,7 @@ private fun ColorCircle(
 ) {
     Card(
         onClick = onClick,
-        modifier = modifier.size(36.dp),
+        modifier = modifier.size(36.dp).pendoTag("colorOption", true),
         shape = RoundedCornerShape(16.dp),
         colors = CardDefaults.cardColors(
             containerColor = Color(displayColor or 0xFF000000.toInt())
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebView.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebView.kt
index 2c0378023a..a5af363996 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebView.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebView.kt
@@ -19,11 +19,10 @@ import android.webkit.WebView
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.os.bundleOf
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.instructure.pandautils.views.CanvasWebView
 
 data class ComposeWebViewCallbacks(
@@ -48,7 +47,8 @@ fun ComposeCanvasWebView(
     embeddedWebViewCallbacks: ComposeEmbeddedWebViewCallbacks = ComposeEmbeddedWebViewCallbacks(),
     applyOnWebView: (CanvasWebView.() -> Unit)? = null
 ) {
-    val webViewState = rememberSaveable { bundleOf() }
+    val stateViewModel: ComposeCanvasWebViewStateViewModel = viewModel()
+    val webViewState = stateViewModel.webViewState
 
     if (LocalInspectionMode.current) {
         Text(text = url)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebViewStateViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebViewStateViewModel.kt
new file mode 100644
index 0000000000..50b5d0c50f
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebViewStateViewModel.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.pandautils.compose.composables
+
+import android.os.Bundle
+import androidx.lifecycle.ViewModel
+
+/**
+ * Holds WebView instance state in memory so it survives configuration changes without
+ * going through the Binder IPC boundary (which has a ~1 MB limit). This prevents
+ * TransactionTooLargeException when the WebView state is large.
+ */
+class ComposeCanvasWebViewStateViewModel : ViewModel() {
+    val webViewState = Bundle()
+}
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebViewWrapper.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebViewWrapper.kt
index 22cc1b0909..7fe30e9c02 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebViewWrapper.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/ComposeCanvasWebViewWrapper.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.os.bundleOf
+import androidx.lifecycle.viewmodel.compose.viewModel
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.HtmlContentFormatter
 import com.instructure.pandautils.utils.JsExternalToolInterface
@@ -50,7 +51,8 @@ fun ComposeCanvasWebViewWrapper(
     webViewCallbacks: ComposeWebViewCallbacks? = null,
     embeddedWebViewCallbacks: ComposeEmbeddedWebViewCallbacks? = null,
 ) {
-    val webViewState = rememberSaveable(content) { bundleOf() }
+    val stateViewModel: ComposeCanvasWebViewStateViewModel = viewModel()
+    val webViewState = stateViewModel.webViewState
     val savedHtml = rememberSaveable(content, stateSaver = Saver(
         save = { it },
         restore = { it }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/FullScreenDialog.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/FullScreenDialog.kt
index 04632a2170..57753fe62c 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/FullScreenDialog.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/FullScreenDialog.kt
@@ -19,18 +19,26 @@ package com.instructure.pandautils.compose.composables
 
 import android.view.WindowManager
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
+import androidx.core.view.WindowCompat
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.pandautils.R
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 
 
 @Composable
@@ -49,8 +57,31 @@ fun FullScreenDialog(
         (LocalView.current.parent as? DialogWindowProvider)?.window?.apply {
             setDimAmount(0f)
             clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+            if (EdgeToEdgeHelper.isEdgeToEdgeEnforced()) {
+                WindowCompat.setDecorFitsSystemWindows(this, false)
+
+                // Enable drawing behind system bars
+                addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
+                addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
+            }
+
+            // Ensure the window extends to full screen height
+            setLayout(
+                WindowManager.LayoutParams.MATCH_PARENT,
+                WindowManager.LayoutParams.MATCH_PARENT
+            )
         }
-        var modifier = Modifier.fillMaxSize()
+        val layoutDirection = LocalLayoutDirection.current
+        val insets = WindowInsets.systemBars.union(WindowInsets.displayCutout).asPaddingValues()
+        var modifier = Modifier
+            .fillMaxSize()
+            .padding(
+                start = insets.calculateLeftPadding(layoutDirection),
+                end = insets.calculateRightPadding(layoutDirection)
+                // Intentionally not applying top or bottom padding:
+                // - Top: Let content (Scaffold/AppBar) handle status bar insets to avoid double padding
+                // - Bottom: Content background extends behind navigation bar
+            )
         if (ApiPrefs.isMasquerading) {
             modifier = modifier.padding(
                 top = dimensionResource(R.dimen.masqueradeButtonSize),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/OverflowMenu.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/OverflowMenu.kt
index bd287d174c..19d36923c6 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/OverflowMenu.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/OverflowMenu.kt
@@ -17,6 +17,7 @@
 
 package com.instructure.pandautils.compose.composables
 
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.material.DropdownMenu
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
@@ -28,6 +29,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import com.instructure.pandautils.R
 
 @Composable
@@ -50,7 +52,7 @@ fun OverflowMenu(
         )
     }
     DropdownMenu(
-        modifier = modifier,
+        modifier = modifier.widthIn(min = 196.dp),
         expanded = showMenu,
         onDismissRequest = {
             onDismissRequest()
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/SelectContextScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/SelectContextScreen.kt
index dcff8f4c1e..2c7155738e 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/SelectContextScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/SelectContextScreen.kt
@@ -29,7 +29,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.RadioButton
 import androidx.compose.material.RadioButtonDefaults
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -73,7 +72,7 @@ fun SelectContextScreen(
     @DrawableRes navIconRes: Int = R.drawable.ic_close,
 ) {
     CanvasTheme {
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 CanvasAppBar(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/TriStateBottomSheet.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/TriStateBottomSheet.kt
index fbabb10864..a8fabff8a7 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/TriStateBottomSheet.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/TriStateBottomSheet.kt
@@ -52,7 +52,14 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.geometry.CornerRadius
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
@@ -209,14 +216,30 @@ fun TriStateBottomSheet(
                         state = anchoredDraggableState,
                         orientation = Orientation.Vertical,
                     )
-                    .zIndex(1f),
+                    .zIndex(1f)
+                    .graphicsLayer { clip = false }
+                    .drawWithContent {
+                        val shadowHeight = 10.dp.toPx()
+                        val cornerRadius = 16.dp.toPx()
+                        drawRoundRect(
+                            brush = Brush.verticalGradient(
+                                colors = listOf(Color.Transparent, Color.Black.copy(alpha = 0.15f)),
+                                startY = -shadowHeight,
+                                endY = cornerRadius
+                            ),
+                            topLeft = Offset(0f, -shadowHeight),
+                            size = Size(size.width, shadowHeight + cornerRadius),
+                            cornerRadius = CornerRadius(cornerRadius, cornerRadius)
+                        )
+                        drawContent()
+                    },
                 shape = RoundedCornerShape(
                     topStart = 16.dp,
                     topEnd = 16.dp,
                     bottomStart = 0.dp,
                     bottomEnd = 0.dp
                 ),
-                elevation = CardDefaults.elevatedCardElevation(defaultElevation = 6.dp),
+                elevation = CardDefaults.elevatedCardElevation(defaultElevation = 0.dp),
             ) {
                 Column(Modifier.fillMaxSize()) {
                     Row(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/todo/ToDoItem.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/todo/ToDoItem.kt
index 8b5910f5ea..ab3cfb9fb3 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/todo/ToDoItem.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/compose/composables/todo/ToDoItem.kt
@@ -336,7 +336,8 @@ private fun ToDoItemContent(
                         fontSize = 14.sp,
                         color = colorResource(id = R.color.textDark),
                         maxLines = 1,
-                        overflow = TextOverflow.Ellipsis
+                        overflow = TextOverflow.Ellipsis,
+                        modifier = Modifier.testTag("todoItemTag")
                     )
                 }
 
@@ -346,7 +347,8 @@ private fun ToDoItemContent(
                         fontSize = 14.sp,
                         color = colorResource(id = R.color.textDark),
                         maxLines = 1,
-                        overflow = TextOverflow.Ellipsis
+                        overflow = TextOverflow.Ellipsis,
+                        modifier = Modifier.testTag("todoItemTime")
                     )
                 }
             }
diff --git a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/AccountDomainManager.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepository.kt
similarity index 50%
rename from libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/AccountDomainManager.kt
rename to libs/pandautils/src/main/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepository.kt
index cfec8c3e17..5207aba2ee 100644
--- a/libs/canvas-api-2/src/main/java/com/instructure/canvasapi2/managers/AccountDomainManager.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepository.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 - present Instructure, Inc.
+ * Copyright (C) 2026 - present Instructure, Inc.
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -12,22 +12,12 @@
  *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
- *
  */
-package com.instructure.canvasapi2.managers
+package com.instructure.pandautils.data.repository.accountdomain
 
-import com.instructure.canvasapi2.StatusCallback
-import com.instructure.canvasapi2.apis.AccountDomainAPI
 import com.instructure.canvasapi2.models.AccountDomain
 
-object AccountDomainManager {
+interface AccountDomainRepository {
 
-    /**
-     * Searches by campus name or domain based on query input
-     * @param query Any string, strings less than 3 characters are rejected. Any string with a "." will use the domain search.
-     * @param callback Any valid status callback
-     */
-    fun searchAccounts(query: String, callback: StatusCallback<List<AccountDomain>>) {
-        AccountDomainAPI.searchAccounts(query, callback)
-    }
-}
+    suspend fun search(query: String): List<AccountDomain>
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepositoryImpl.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepositoryImpl.kt
new file mode 100644
index 0000000000..fa31b3e32d
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepositoryImpl.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.pandautils.data.repository.accountdomain
+
+import com.instructure.canvasapi2.apis.AccountDomainInterface
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.canvasapi2.utils.depaginate
+
+class AccountDomainRepositoryImpl(private val api: AccountDomainInterface) :
+    AccountDomainRepository {
+    override suspend fun search(query: String): List<AccountDomain> {
+        val restParams = RestParams(
+            usePerPageQueryParam = true,
+            isForceReadFromNetwork = true,
+        )
+        val result = api.campusSearch(query, restParams).depaginate {
+            api.next(it, restParams)
+        }
+        return result.dataOrNull.orEmpty()
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/di/RepositoryModule.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/di/RepositoryModule.kt
index 9ab13b781d..845a6803af 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/di/RepositoryModule.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/di/RepositoryModule.kt
@@ -16,6 +16,7 @@
  */
 package com.instructure.pandautils.di
 
+import com.instructure.canvasapi2.apis.AccountDomainInterface
 import com.instructure.canvasapi2.apis.AccountNotificationAPI
 import com.instructure.canvasapi2.apis.AnnouncementAPI
 import com.instructure.canvasapi2.apis.AssignmentAPI
@@ -27,6 +28,8 @@ import com.instructure.canvasapi2.apis.GroupAPI
 import com.instructure.canvasapi2.apis.PlannerAPI
 import com.instructure.canvasapi2.apis.UserAPI
 import com.instructure.canvasapi2.managers.graphql.RecentGradedSubmissionsManager
+import com.instructure.pandautils.data.repository.accountdomain.AccountDomainRepository
+import com.instructure.pandautils.data.repository.accountdomain.AccountDomainRepositoryImpl
 import com.instructure.pandautils.data.repository.accountnotification.AccountNotificationRepository
 import com.instructure.pandautils.data.repository.accountnotification.AccountNotificationRepositoryImpl
 import com.instructure.pandautils.data.repository.announcement.AnnouncementLocalDataSource
@@ -101,7 +104,12 @@ class RepositoryModule {
         networkStateProvider: NetworkStateProvider,
         featureFlagProvider: FeatureFlagProvider
     ): CourseRepository {
-        return CourseRepositoryImpl(localDataSource, networkDataSource, networkStateProvider, featureFlagProvider)
+        return CourseRepositoryImpl(
+            localDataSource,
+            networkDataSource,
+            networkStateProvider,
+            featureFlagProvider
+        )
     }
 
     @Provides
@@ -142,7 +150,12 @@ class RepositoryModule {
         networkStateProvider: NetworkStateProvider,
         featureFlagProvider: FeatureFlagProvider
     ): AnnouncementRepository {
-        return AnnouncementRepositoryImpl(localDataSource, networkDataSource, networkStateProvider, featureFlagProvider)
+        return AnnouncementRepositoryImpl(
+            localDataSource,
+            networkDataSource,
+            networkStateProvider,
+            featureFlagProvider
+        )
     }
 
     @Provides
@@ -173,7 +186,12 @@ class RepositoryModule {
         networkStateProvider: NetworkStateProvider,
         featureFlagProvider: FeatureFlagProvider
     ): GroupRepository {
-        return GroupRepositoryImpl(localDataSource, networkDataSource, networkStateProvider, featureFlagProvider)
+        return GroupRepositoryImpl(
+            localDataSource,
+            networkDataSource,
+            networkStateProvider,
+            featureFlagProvider
+        )
     }
 
     @Provides
@@ -208,4 +226,12 @@ class RepositoryModule {
     ): ConferenceRepository {
         return ConferenceRepositoryImpl(conferencesApi)
     }
+
+    @Provides
+    @ActivityRetainedScoped
+    fun provideAccountDomainRepository(
+        accountDomainApi: AccountDomainInterface
+    ): AccountDomainRepository {
+        return AccountDomainRepositoryImpl(accountDomainApi)
+    }
 }
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/domain/usecase/accountdomain/SearchAccountDomainUseCase.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/domain/usecase/accountdomain/SearchAccountDomainUseCase.kt
new file mode 100644
index 0000000000..841de7cfe7
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/domain/usecase/accountdomain/SearchAccountDomainUseCase.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */package com.instructure.pandautils.domain.usecase.accountdomain
+
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.pandautils.data.repository.accountdomain.AccountDomainRepository
+import com.instructure.pandautils.domain.usecase.BaseUseCase
+import javax.inject.Inject
+
+class SearchAccountDomainUseCase @Inject constructor(private val repository: AccountDomainRepository) : BaseUseCase<SearchAccountDomainUseCase.Params, List<AccountDomain>>() {
+
+    override suspend fun execute(params: Params): List<AccountDomain> {
+        if (params.query.length < 3) return emptyList()
+        return repository.search(params.query)
+    }
+
+    data class Params(
+        val query: String
+    )
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsFragment.kt
index af6b557589..9c894f293b 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/details/AssignmentDetailsFragment.kt
@@ -33,6 +33,8 @@ import android.view.ViewGroup
 import android.webkit.WebView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.collectAsState
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import com.google.android.material.snackbar.Snackbar
@@ -59,6 +61,8 @@ import com.instructure.pandautils.navigation.WebViewRouter
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.PermissionUtils
+import com.instructure.pandautils.utils.applyBottomSystemBarMargin
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.needsPermissions
 import com.instructure.pandautils.utils.orDefault
@@ -127,6 +131,7 @@ class AssignmentDetailsFragment : BaseCanvasFragment(), FragmentInteractions, Bo
 
     override fun applyTheme() {
         binding?.toolbar?.apply {
+            applyTopSystemBarInsets()
             setupAsBackButton {
                 activity?.onBackPressed()
             }
@@ -194,6 +199,7 @@ class AssignmentDetailsFragment : BaseCanvasFragment(), FragmentInteractions, Bo
                 ) { options ->
                     assignmentDetailsRouter.navigateToSendMessage(requireActivity(), options)
                 }
+                binding?.submitButton?.applyBottomSystemBarMargin()
             }
         }
     }
@@ -343,6 +349,26 @@ class AssignmentDetailsFragment : BaseCanvasFragment(), FragmentInteractions, Bo
     }
 
     private fun setupDescriptionView() {
+        // Apply bottom insets to the scroll content container instead of individual views
+        // to ensure proper padding in portrait mode for all content (including quizzes)
+        binding?.scrollView?.let { scrollView ->
+            val scrollContent = scrollView.getChildAt(0)
+            scrollContent?.let {
+                ViewCompat.setOnApplyWindowInsetsListener(it) { view, windowInsets ->
+                    val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+                    val configuration = resources.configuration
+                    val isPortrait = configuration.orientation == android.content.res.Configuration.ORIENTATION_PORTRAIT
+
+                    if (isPortrait) {
+                        view.setPadding(view.paddingLeft, view.paddingTop, view.paddingRight, insets.bottom)
+                    } else {
+                        view.setPadding(view.paddingLeft, view.paddingTop, view.paddingRight, 0)
+                    }
+                    windowInsets
+                }
+                ViewCompat.requestApplyInsets(scrollContent)
+            }
+        }
         binding?.descriptionWebViewWrapper?.webView?.addVideoClient(requireActivity())
         binding?.descriptionWebViewWrapper?.webView?.canvasWebViewClientCallback = object : CanvasWebView.CanvasWebViewClientCallback {
             override fun openMediaFromWebView(mime: String, url: String, filename: String) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/composables/AssignmentListScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/composables/AssignmentListScreen.kt
index cb5c1133ea..17adc11d4d 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/composables/AssignmentListScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/composables/AssignmentListScreen.kt
@@ -28,13 +28,18 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -44,7 +49,6 @@ import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
@@ -78,6 +82,7 @@ import com.instructure.canvasapi2.models.GradingPeriod
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.CheckpointItem
 import com.instructure.pandautils.compose.composables.EmptyContent
@@ -120,7 +125,7 @@ fun AssignmentListScreen(
     CanvasTheme {
         when (state.screenOption) {
             AssignmentListScreenOption.List -> {
-                Scaffold(
+                CanvasScaffold(
                     backgroundColor = colorResource(id = R.color.backgroundLightest),
                     topBar = {
                         AppBar(
@@ -220,7 +225,9 @@ private fun AppBar(
                     ) {
                         state.overFlowItems.forEach { item ->
                             DropdownMenuItem(
-                                modifier = Modifier.background(color = colorResource(id = R.color.backgroundLightestElevated)),
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .background(color = colorResource(id = R.color.backgroundLightestElevated)),
                                 onClick = {
                                     item.onClick()
                                     screenActionHandler(
@@ -266,6 +273,7 @@ private fun AssignmentListWrapper(
 
     Box(
         modifier = modifier
+            .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
             .pullRefresh(pullRefreshState)
     ) {
         when (state.state) {
@@ -287,7 +295,7 @@ private fun AssignmentListWrapper(
             ScreenState.Empty -> {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
-                    modifier = modifier
+                    modifier = Modifier
                         .fillMaxSize()
                         .background(colorResource(R.color.backgroundLightest))
                         .verticalScroll(rememberScrollState())
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/filter/AssignmentListFilterScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/filter/AssignmentListFilterScreen.kt
index 1b781a8f29..118cc8dc31 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/filter/AssignmentListFilterScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/assignments/list/filter/AssignmentListFilterScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
@@ -39,6 +38,7 @@ import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.GradingPeriod
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.MultiChoicePicker
 import com.instructure.pandautils.compose.composables.SingleChoicePicker
@@ -57,7 +57,7 @@ fun AssignmentListFilterScreen(
     onBackPressed: () -> Unit
 ) {
     var selectedFilters by remember { mutableStateOf(selectedOptions) }
-    Scaffold(
+    CanvasScaffold(
         backgroundColor = colorResource(id = com.instructure.pandares.R.color.backgroundLightest),
         topBar = {
             CanvasThemedAppBar(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/CalendarViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/CalendarViewModel.kt
index 3776767f89..314a2b0fc2 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/CalendarViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/CalendarViewModel.kt
@@ -317,9 +317,9 @@ class CalendarViewModel @Inject constructor(
     private fun getContextNameForPlannerItem(plannerItem: PlannerItem): String {
         return if (plannerItem.plannableType == PlannableType.PLANNER_NOTE) {
             if (plannerItem.contextName.isNullOrEmpty()) {
-                context.getString(R.string.userCalendarToDo)
+                context.getString(R.string.userCalendarToDoNew)
             } else {
-                context.getString(R.string.courseToDo, plannerItem.contextName)
+                context.getString(R.string.courseToDoNew, plannerItem.contextName)
             }
         } else {
             plannerItem.contextName.orEmpty()
@@ -363,8 +363,8 @@ class CalendarViewModel @Inject constructor(
             when {
                 submissionState.excused -> context.getString(R.string.calendarEventExcused)
                 submissionState.missing -> context.getString(R.string.calendarEventMissing)
-                submissionState.graded -> context.getString(R.string.calendarEventGraded)
-                submissionState.needsGrading -> context.getString(R.string.calendarEventSubmitted)
+                submissionState.graded && submissionState.postedAt != null -> context.getString(R.string.calendarEventGraded)
+                submissionState.graded || submissionState.needsGrading -> context.getString(R.string.calendarEventSubmitted)
                 plannerItem.plannable.pointsPossible != null -> context.getString(
                     R.string.calendarEventPoints,
                     NumberHelper.formatDecimal(plannerItem.plannable.pointsPossible!!, 1, true)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/Calendar.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/Calendar.kt
index 14023deefa..64929c84f2 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/Calendar.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/Calendar.kt
@@ -63,6 +63,7 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
@@ -127,7 +128,7 @@ fun Calendar(
     todayFocusRequester: FocusRequester? = null
 ) {
     Column(modifier = modifier) {
-        var centerIndex by remember { mutableIntStateOf(PAGE_COUNT / 2) }
+        var centerIndex by rememberSaveable { mutableIntStateOf(PAGE_COUNT / 2) }
         val pagerState = rememberPagerState(
             initialPage = PAGE_COUNT / 2,
             initialPageOffsetFraction = 0f
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/CalendarScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/CalendarScreen.kt
index f7fc41fd60..596426a3eb 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/CalendarScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/composables/CalendarScreen.kt
@@ -21,11 +21,11 @@ import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Icon
-import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
 import androidx.compose.material.SnackbarResult
@@ -58,6 +58,7 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.ExpandableFabItem
 import com.instructure.pandautils.compose.composables.ExpandableFloatingActionButton
@@ -106,8 +107,9 @@ fun CalendarScreen(
                 }
             }
         }
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             topBar = {
                 if (showToolbar) {
                     CanvasThemedAppBar(
@@ -195,7 +197,7 @@ fun CalendarScreen(
                         {
                             ExpandableFabItem(
                                 icon = painterResource(id = R.drawable.ic_todo),
-                                text = stringResource(id = R.string.calendarAddToDo),
+                                text = stringResource(id = R.string.calendarAddToDoNew),
                                 modifier = Modifier
                                     .clickable {
                                         fabExpandedState.value = false
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/CalendarFilterFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/CalendarFilterFragment.kt
index 0460e65e47..958620be86 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/CalendarFilterFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/CalendarFilterFragment.kt
@@ -12,11 +12,10 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.instructure.pandautils.base.BaseCanvasBottomSheetDialogFragment
 import com.instructure.pandautils.features.calendar.CalendarSharedEvents
 import com.instructure.pandautils.features.calendar.filter.composables.CalendarFiltersScreen
-import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.WindowInsetsHelper
 import com.instructure.pandautils.utils.collectOneOffEvents
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -54,7 +53,8 @@ class CalendarFilterFragment : BaseCanvasBottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        ViewStyler.setStatusBarLight(requireActivity())
+        // Set status bar icons to light (white) for visibility over the dialog
+        WindowInsetsHelper.setStatusBarAppearance(requireActivity().window, isLightStatusBar = false)
         setFullScreen()
     }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/composables/CalendarFilterScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/composables/CalendarFilterScreen.kt
index 287266a8d9..5a20b24f91 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/composables/CalendarFilterScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendar/filter/composables/CalendarFilterScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.selection.toggleable
 import androidx.compose.material.Checkbox
 import androidx.compose.material.CheckboxDefaults
-import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
 import androidx.compose.material.SnackbarResult
@@ -55,6 +54,7 @@ import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.CanvasAppBar
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.ListHeaderItem
 import com.instructure.pandautils.compose.composables.Loading
@@ -90,7 +90,7 @@ fun CalendarFiltersScreen(
                 }
             }
         }
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 CanvasAppBar(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CreateUpdateEventScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CreateUpdateEventScreen.kt
index 03e98d5036..5a6e5e5233 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CreateUpdateEventScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CreateUpdateEventScreen.kt
@@ -23,19 +23,25 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
 import androidx.compose.material.SnackbarResult
@@ -80,6 +86,7 @@ import com.instructure.canvasapi2.utils.DateHelper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.CanvasAppBar
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.LabelValueRow
 import com.instructure.pandautils.compose.composables.SelectContextScreen
 import com.instructure.pandautils.compose.composables.SelectContextUiState
@@ -177,7 +184,7 @@ internal fun CreateUpdateEventScreen(
         }
     }
 
-    Scaffold(
+    CanvasScaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
         topBar = {
             CreateUpdateEventTopAppBar(
@@ -187,6 +194,8 @@ internal fun CreateUpdateEventScreen(
             )
         },
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
+        contentWindowInsets = WindowInsets.ime.union(WindowInsets.displayCutout)
+            .union(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom)),
         content = { padding ->
             CreateUpdateEventContent(
                 uiState = uiState,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CustomFrequencyScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CustomFrequencyScreen.kt
index b58445c907..4d08b72cd6 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CustomFrequencyScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/createupdate/composables/CustomFrequencyScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -90,6 +91,7 @@ internal fun CustomFrequencyScreen(
 ) {
     Scaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
+        contentWindowInsets = WindowInsets(0, 0, 0, 0),
         topBar = {
             CanvasAppBar(
                 title = stringResource(id = R.string.eventCustomFrequencyScreenTitle),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/details/composables/EventScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/details/composables/EventScreen.kt
index 946c8657bd..01a326f1fd 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/details/composables/EventScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendarevent/details/composables/EventScreen.kt
@@ -17,13 +17,21 @@
 
 package com.instructure.pandautils.features.calendarevent.details.composables
 
+import android.content.res.Configuration
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -49,6 +57,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
@@ -108,6 +117,7 @@ internal fun EventScreen(
 
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal),
             topBar = {
                 CanvasThemedAppBar(
                     title = title,
@@ -148,17 +158,27 @@ internal fun EventScreen(
             },
             floatingActionButton = {
                 if (eventUiState.isMessageFabEnabled) {
-                    FloatingActionButton(
-                        backgroundColor = Color(color = eventUiState.toolbarUiState.toolbarColor),
-                        onClick = {
-                            actionHandler(EventAction.OnMessageFabClicked)
-                        }
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_chat),
-                            tint = Color(ThemePrefs.buttonTextColor),
-                            contentDescription = stringResource(id = R.string.sendMessageAboutEvent)
+                    val configuration = LocalConfiguration.current
+                    val isPortrait = configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+                    val navigationBarPadding = WindowInsets.navigationBars.asPaddingValues()
+
+                    Box(
+                        modifier = Modifier.padding(
+                            bottom = if (isPortrait) navigationBarPadding.calculateBottomPadding() else 0.dp
                         )
+                    ) {
+                        FloatingActionButton(
+                            backgroundColor = Color(color = eventUiState.toolbarUiState.toolbarColor),
+                            onClick = {
+                                actionHandler(EventAction.OnMessageFabClicked)
+                            }
+                        ) {
+                            Icon(
+                                painter = painterResource(id = R.drawable.ic_chat),
+                                tint = Color(ThemePrefs.buttonTextColor),
+                                contentDescription = stringResource(id = R.string.sendMessageAboutEvent)
+                            )
+                        }
                     }
                 }
             },
@@ -372,6 +392,7 @@ private fun EventContent(
                         applyOnWebView = applyOnWebView
                     )
                 }
+                Spacer(Modifier.size(WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()))
             }
         }
     }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoFragment.kt
index b899ee93df..93e67da659 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoFragment.kt
@@ -89,12 +89,12 @@ class CreateUpdateToDoFragment : BaseCanvasFragment(), NavigationCallbacks, Frag
     }
 
     private fun announceToDoCreation(title: String) {
-        val textToAnnounce = getString(R.string.a11y_toDoCreatedAnnouncement, title)
+        val textToAnnounce = getString(R.string.a11y_toDoCreatedAnnouncementNew, title)
         announceAccessibilityText(requireContext(), textToAnnounce)
     }
 
     private fun announceToDoUpdate(title: String) {
-        val textToAnnounce = getString(R.string.a11y_toDoUpdatedAnnouncement, title)
+        val textToAnnounce = getString(R.string.a11y_toDoUpdatedAnnouncementNew, title)
         announceAccessibilityText(requireContext(), textToAnnounce)
     }
 
@@ -103,9 +103,9 @@ class CreateUpdateToDoFragment : BaseCanvasFragment(), NavigationCallbacks, Frag
 
     override fun title(): String = getString(
         if (arguments?.containsKey(PLANNER_ITEM).orDefault()) {
-            R.string.editTodoScreenTitle
+            R.string.editTodoScreenTitleNew
         } else {
-            R.string.createTodoScreenTitle
+            R.string.createTodoScreenTitleNew
         }
     )
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModel.kt
index f84efde101..d1fc262b36 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModel.kt
@@ -230,7 +230,7 @@ class CreateUpdateToDoViewModel @Inject constructor(
             _uiState.update {
                 it.copy(
                     saving = false,
-                    errorSnack = resources.getString(R.string.todoSaveErrorMessage)
+                    errorSnack = resources.getString(R.string.todoSaveErrorMessageNew)
                 )
             }
         }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/composables/CreateUpdateToDoScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/composables/CreateUpdateToDoScreen.kt
index fe73ef8595..0bce7c0a5d 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/composables/CreateUpdateToDoScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/createupdate/composables/CreateUpdateToDoScreen.kt
@@ -17,18 +17,24 @@
 
 package com.instructure.pandautils.features.calendartodo.createupdate.composables
 
+import android.content.res.Configuration
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.verticalScroll
@@ -58,6 +64,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalView
@@ -154,8 +161,17 @@ private fun CreateUpdateToDoScreen(
         }
     }
 
+    val configuration = LocalConfiguration.current
+    val isPortrait = configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+    val contentInsets = if (isPortrait) {
+        WindowInsets.ime.union(WindowInsets.navigationBars).union(WindowInsets.displayCutout)
+    } else {
+        WindowInsets.ime.union(WindowInsets.displayCutout)
+    }
+
     Scaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
+        contentWindowInsets = contentInsets,
         topBar = {
             CreateUpdateToDoTopAppBar(
                 title = title,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoFragment.kt
index b1b1293ccb..af6481382b 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoFragment.kt
@@ -162,7 +162,7 @@ class ToDoFragment : BaseCanvasFragment(), NavigationCallbacks, FragmentInteract
     override val navigation: Navigation?
         get() = activity as? Navigation
 
-    override fun title(): String = getString(R.string.userCalendarToDo)
+    override fun title(): String = getString(R.string.userCalendarToDoNew)
 
     override fun applyTheme() {
         ViewStyler.setStatusBarDark(requireActivity(), ThemePrefs.primaryColor)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModel.kt
index b3721e332c..2a460e218f 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModel.kt
@@ -108,7 +108,7 @@ class ToDoViewModel @Inject constructor(
             _uiState.update {
                 it.copy(
                     loading = false,
-                    loadError = context.getString(R.string.errorLoadingTodo)
+                    loadError = context.getString(R.string.errorLoadingTodoNew)
                 )
             }
         }
@@ -156,7 +156,7 @@ class ToDoViewModel @Inject constructor(
             _uiState.update {
                 it.copy(
                     deleting = false,
-                    errorSnack = context.getString(R.string.todoDeleteErrorMessage)
+                    errorSnack = context.getString(R.string.todoDeleteErrorMessageNew)
                 )
             }
         }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/composables/ToDoScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/composables/ToDoScreen.kt
index e385dfd2db..ff99f33d3b 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/composables/ToDoScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/calendartodo/details/composables/ToDoScreen.kt
@@ -19,9 +19,15 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -91,6 +97,7 @@ internal fun ToDoScreen(
 
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal),
             topBar = {
                 CanvasThemedAppBar(
                     title = title,
@@ -132,8 +139,8 @@ private fun OverFlowMenuSegment(
     var showDeleteConfirmationDialog by rememberSaveable { mutableStateOf(false) }
     if (showDeleteConfirmationDialog) {
         SimpleAlertDialog(
-            dialogTitle = stringResource(id = R.string.todoDeleteConfirmationTitle),
-            dialogText = stringResource(id = R.string.todoDeleteConfirmationText),
+            dialogTitle = stringResource(id = R.string.todoDeleteConfirmationTitleNew),
+            dialogText = stringResource(id = R.string.todoDeleteConfirmationTextNew),
             dismissButtonText = stringResource(id = R.string.cancel),
             confirmationButtonText = stringResource(id = R.string.delete),
             onDismissRequest = {
@@ -264,7 +271,7 @@ private fun ToDoContent(
                         fontSize = 16.sp
                     )
                 }
-                Spacer(modifier = Modifier.height(24.dp))
+                Spacer(Modifier.size(WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding()))
             }
         }
     }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/customize/CustomizeDashboardScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/customize/CustomizeDashboardScreen.kt
index 963dc7fab1..d189462cd8 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/customize/CustomizeDashboardScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/customize/CustomizeDashboardScreen.kt
@@ -94,6 +94,7 @@ import com.instructure.pandautils.utils.ThemedColor
 import com.instructure.pandautils.utils.toast
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun CustomizeDashboardScreen(router: DashboardRouter, onNavigateBack: () -> Unit) {
@@ -304,6 +305,7 @@ private fun WidgetListItem(
                                 modifier = Modifier
                                     .size(24.dp)
                                     .testTag("moveUpButton_${widgetItem.metadata.id}")
+                                    .pendoTag("moveUpButton", true)
                             ) {
                                 Icon(
                                     modifier = Modifier.rotate(180f),
@@ -330,6 +332,7 @@ private fun WidgetListItem(
                                 modifier = Modifier
                                     .size(24.dp)
                                     .testTag("moveDownButton_${widgetItem.metadata.id}")
+                                    .pendoTag("moveDownButton", true)
                             ) {
                                 Icon(
                                     painter = painterResource(R.drawable.ic_chevron_down_small),
@@ -351,7 +354,7 @@ private fun WidgetListItem(
                 CanvasSwitch(
                     checked = widgetItem.metadata.isVisible,
                     onCheckedChange = { onToggleVisibility() },
-                    modifier = Modifier.testTag("visibilitySwitch_${widgetItem.metadata.id}")
+                    modifier = Modifier.testTag("visibilitySwitch_${widgetItem.metadata.id}").pendoTag("widgetVisibilitySwitch", true)
                 )
             }
             if (hasSettings) {
@@ -466,7 +469,8 @@ private fun BooleanSettingRow(
 
         CanvasSwitch(
             checked = checked,
-            onCheckedChange = onCheckedChange
+            onCheckedChange = onCheckedChange,
+            modifier = Modifier.pendoTag("widgetSettingSwitch", true)
         )
     }
 }
@@ -566,7 +570,9 @@ private fun ConfirmationDialog(
                 colors = ButtonDefaults.textButtonColors(
                     contentColor = Color(ThemePrefs.textButtonColor)
                 ),
-                modifier = Modifier.testTag("confirmationDialogConfirmButton")
+                modifier = Modifier
+                    .testTag("confirmationDialogConfirmButton")
+                    .pendoTag("confirmationDialogRestartButton", true)
             ) {
                 Text(
                     text = stringResource(R.string.restart_now)
@@ -579,7 +585,9 @@ private fun ConfirmationDialog(
                 colors = ButtonDefaults.textButtonColors(
                     contentColor = Color(ThemePrefs.textButtonColor)
                 ),
-                modifier = Modifier.testTag("confirmationDialogDismissButton")
+                modifier = Modifier
+                    .testTag("confirmationDialogDismissButton")
+                    .pendoTag("confirmationDialogCancelButton", true)
             ) {
                 Text(
                     text = stringResource(R.string.cancel)
@@ -596,9 +604,18 @@ private data class SurveyOptionData(
 )
 
 private val SURVEY_OPTIONS = listOf(
-    SurveyOptionData(AnalyticsEventConstants.SURVEY_OPTION_HARD_TO_FIND, R.string.survey_option_hard_to_find),
-    SurveyOptionData(AnalyticsEventConstants.SURVEY_OPTION_PREFER_OLD_LAYOUT, R.string.survey_option_prefer_old_layout),
-    SurveyOptionData(AnalyticsEventConstants.SURVEY_OPTION_SOMETHING_BROKEN, R.string.survey_option_something_broken)
+    SurveyOptionData(
+        AnalyticsEventConstants.SURVEY_OPTION_HARD_TO_FIND,
+        R.string.survey_option_hard_to_find
+    ),
+    SurveyOptionData(
+        AnalyticsEventConstants.SURVEY_OPTION_PREFER_OLD_LAYOUT,
+        R.string.survey_option_prefer_old_layout
+    ),
+    SurveyOptionData(
+        AnalyticsEventConstants.SURVEY_OPTION_SOMETHING_BROKEN,
+        R.string.survey_option_something_broken
+    )
 )
 
 @Composable
@@ -675,7 +692,7 @@ private fun SurveyDialog(
                     contentColor = Color(ThemePrefs.textButtonColor),
                     disabledContentColor = Color(ThemePrefs.textButtonColor).copy(alpha = 0.6f),
                 ),
-                modifier = Modifier.testTag("surveyDialogSubmitButton")
+                modifier = Modifier.testTag("surveyDialogSubmitButton").pendoTag("surveyDialogSubmitButton", true)
             ) {
                 Text(
                     text = stringResource(R.string.submit)
@@ -691,7 +708,7 @@ private fun SurveyDialog(
                 colors = ButtonDefaults.textButtonColors(
                     contentColor = Color(ThemePrefs.textButtonColor),
                 ),
-                modifier = Modifier.testTag("surveyDialogSkipButton")
+                modifier = Modifier.testTag("surveyDialogSkipButton").pendoTag("surveyDialogSkipButton", true)
             ) {
                 Text(
                     text = stringResource(R.string.skip)
@@ -780,6 +797,7 @@ private fun FeedbackButton(
             modifier = Modifier
                 .height(30.dp)
                 .testTag(testTag)
+                .pendoTag("surveyDialogLetUsKnowButton", true)
         ) {
             Text(
                 text = stringResource(R.string.let_us_know),
@@ -804,12 +822,19 @@ private fun CustomizeDashboardScreenPreview() {
     CanvasTheme {
         CustomizeDashboardScreenContent(
             uiState = CustomizeDashboardUiState(
+                globalSettings = listOf(
+                    WidgetSettingItem(
+                        key = "Dashboard Main Color",
+                        value = "#FF0000",
+                        type = SettingType.COLOR
+                    )
+                ),
                 widgets = listOf(
                     WidgetItem(
                         metadata = WidgetMetadata(
                             id = WidgetMetadata.WIDGET_ID_WELCOME,
                             position = 0,
-                            isVisible = true
+                            isVisible = false
                         ),
                         displayName = "Hello, [Riley]",
                         settings = listOf(
@@ -827,21 +852,21 @@ private fun CustomizeDashboardScreenPreview() {
                     ),
                     WidgetItem(
                         metadata = WidgetMetadata(
-                            id = WidgetMetadata.WIDGET_ID_WELCOME,
-                            position = 0,
-                            isVisible = false
+                            id = WidgetMetadata.WIDGET_ID_COURSES,
+                            position = 1,
+                            isVisible = true
                         ),
-                        displayName = "Hello, [Riley]",
+                        displayName = "Courses",
                         settings = listOf(
                             WidgetSettingItem(
-                                key = "showGreeting",
-                                value = false,
+                                key = CoursesConfig.KEY_SHOW_GRADES,
+                                value = true,
                                 type = SettingType.BOOLEAN
                             ),
                             WidgetSettingItem(
-                                key = "backgroundColor",
-                                value = 0x2573DF,
-                                type = SettingType.COLOR
+                                key = CoursesConfig.KEY_SHOW_COLOR_OVERLAY,
+                                value = false,
+                                type = SettingType.BOOLEAN
                             )
                         )
                     )
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/edit/EditDashboardFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/edit/EditDashboardFragment.kt
index e5c4accbe2..0ffaff7115 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/edit/EditDashboardFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/edit/EditDashboardFragment.kt
@@ -22,7 +22,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.instructure.pandautils.base.BaseCanvasFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
@@ -32,8 +31,15 @@ import com.instructure.interactions.router.Route
 import com.instructure.pandautils.R
 import com.instructure.pandautils.analytics.SCREEN_VIEW_EDIT_DASHBOARD
 import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.databinding.FragmentEditDashboardBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.addSearch
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.setupAsBackButton
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -67,6 +73,9 @@ class EditDashboardFragment : BaseCanvasFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.swipeRefreshLayout.applyImeAndSystemBarInsets()
+        binding.recyclerView.clipToPadding = false
     }
 
     override fun onHiddenChanged(hidden: Boolean) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/notifications/DashboardNotificationsViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/notifications/DashboardNotificationsViewModel.kt
index 31a0339725..9672fd8533 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/notifications/DashboardNotificationsViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/notifications/DashboardNotificationsViewModel.kt
@@ -144,7 +144,6 @@ class DashboardNotificationsViewModel @Inject constructor(
     override fun onCleared() {
         _data.value?.uploadItems?.forEach { it.clear() }
         aggregateProgressObserver.progressData.removeObserver(syncProgressObserver)
-        aggregateProgressObserver.onCleared()
         fileUploads.removeObserver(runningWorkersObserver)
         super.onCleared()
     }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/conferences/ConferencesWidget.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/conferences/ConferencesWidget.kt
index aae4d0677e..fc14e19076 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/conferences/ConferencesWidget.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/conferences/ConferencesWidget.kt
@@ -63,6 +63,7 @@ import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.composables.PagerIndicator
 import kotlinx.coroutines.flow.SharedFlow
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun ConferencesWidget(
@@ -180,6 +181,7 @@ private fun ConferenceCard(
     Card(
         modifier = modifier
             .fillMaxWidth()
+            .pendoTag("conferencesWidget_joinConference", true)
             .clickable(enabled = !isJoining, onClick = onJoin),
         shape = RoundedCornerShape(16.dp),
         elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
@@ -246,7 +248,7 @@ private fun ConferenceCard(
             } else {
                 IconButton(
                     onClick = onDismiss,
-                    modifier = Modifier.padding(end = 4.dp)
+                    modifier = Modifier.padding(end = 4.dp).pendoTag("conferencesWidget_dismissConference", true)
                 ) {
                     Icon(
                         painter = painterResource(R.drawable.ic_close),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courseinvitation/CourseInvitationsWidget.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courseinvitation/CourseInvitationsWidget.kt
index b38dfb5e7a..6253753c7f 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courseinvitation/CourseInvitationsWidget.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courseinvitation/CourseInvitationsWidget.kt
@@ -62,6 +62,7 @@ import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.composables.PagerIndicator
 import com.instructure.pandautils.domain.models.enrollment.CourseInvitation
 import kotlinx.coroutines.flow.SharedFlow
+import sdk.pendo.io.pendoTag
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -200,7 +201,8 @@ fun CourseInvitationsContent(
                     onClick = {
                         uiState.onDeclineInvitation(invitation)
                         invitationToDecline = null
-                    }
+                    },
+                    modifier = Modifier.pendoTag("courseInvitationsWidget_confirmDeclineButton", true)
                 ) {
                     Text(
                         text = stringResource(R.string.declineCourseInvitation),
@@ -209,7 +211,7 @@ fun CourseInvitationsContent(
                 }
             },
             dismissButton = {
-                TextButton(onClick = { invitationToDecline = null }) {
+                TextButton(onClick = { invitationToDecline = null }, modifier = Modifier.pendoTag("courseInvitationsWidget_cancelDeclineButton", true)) {
                     Text(
                         text = stringResource(android.R.string.cancel),
                         color = colorResource(R.color.textDark)
@@ -267,7 +269,8 @@ private fun InvitationCard(
                     enabled = actionsEnabled,
                     modifier = Modifier
                         .weight(1f)
-                        .height(32.dp),
+                        .height(32.dp)
+                        .pendoTag("courseInvitationsWidget_declineButton", true),
                     shape = RoundedCornerShape(100.dp),
                     colors = ButtonDefaults.outlinedButtonColors(
                         containerColor = colorResource(R.color.backgroundLightest),
@@ -295,7 +298,8 @@ private fun InvitationCard(
                     enabled = actionsEnabled,
                     modifier = Modifier
                         .weight(1f)
-                        .height(32.dp),
+                        .height(32.dp)
+                        .pendoTag("courseInvitationsWidget_acceptButton", true),
                     shape = RoundedCornerShape(100.dp),
                     colors = ButtonDefaults.buttonColors(
                         containerColor = buttonColor,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CollapsibleSection.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CollapsibleSection.kt
index 74723195e0..43cee01436 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CollapsibleSection.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CollapsibleSection.kt
@@ -43,6 +43,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.instructure.pandautils.R
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun CollapsibleSection(
@@ -57,6 +58,7 @@ fun CollapsibleSection(
         Row(
             modifier = Modifier
                 .fillMaxWidth()
+                .pendoTag("coursesWidget_collapsibleSection", true)
                 .clickable { onToggleExpanded() }
                 .padding(horizontal = 16.dp, vertical = 12.dp),
             horizontalArrangement = Arrangement.SpaceBetween,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CourseCard.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CourseCard.kt
index 62596afa86..a2c44f136e 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CourseCard.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CourseCard.kt
@@ -75,6 +75,7 @@ import com.instructure.pandautils.features.dashboard.widget.courses.model.GradeD
 import com.instructure.pandautils.utils.ThemedColor
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getFragmentActivityOrNull
+import sdk.pendo.io.pendoTag
 
 internal val COURSE_CARD_HEIGHT = 76.dp
 
@@ -102,191 +103,222 @@ fun CourseCard(
 
     val cardShape = RoundedCornerShape(16.dp)
 
-    Box(modifier = modifier.testTag("CourseCard_${courseCard.id}")) {
-    Card(
-        modifier = Modifier
-            .fillMaxWidth(),
-        shape = cardShape,
-        colors = CardDefaults.cardColors(
-            containerColor = colorResource(R.color.backgroundLightest)
-        ),
-        elevation = CardDefaults.cardElevation(
-            defaultElevation = if (courseCard.isClickable) 2.dp else 0.dp
-        )
+    Box(
+        modifier = modifier
+            .testTag("CourseCard_${courseCard.id}")
+            .pendoTag("coursesWidget_courseCard", true)
     ) {
-        Row(
+        Card(
             modifier = Modifier
-                .fillMaxWidth()
-                .height(COURSE_CARD_HEIGHT)
-                .alpha(if (courseCard.isClickable) 1f else 0.5f)
-                .clickable(enabled = courseCard.isClickable) { activity?.let { onCourseClick(it, courseCard.id) } },
-            verticalAlignment = Alignment.CenterVertically
+                .fillMaxWidth(),
+            shape = cardShape,
+            colors = CardDefaults.cardColors(
+                containerColor = colorResource(R.color.backgroundLightest)
+            ),
+            elevation = CardDefaults.cardElevation(
+                defaultElevation = if (courseCard.isClickable) 2.dp else 0.dp
+            )
         ) {
-            Box(
+            Row(
                 modifier = Modifier
-                    .padding(start = 2.dp, top = 2.dp, bottom = 2.dp)
-                    .size(72.dp)
+                    .fillMaxWidth()
+                    .height(COURSE_CARD_HEIGHT)
+                    .alpha(if (courseCard.isClickable) 1f else 0.5f)
+                    .clickable(enabled = courseCard.isClickable) {
+                        activity?.let {
+                            onCourseClick(
+                                it,
+                                courseCard.id
+                            )
+                        }
+                    },
+                verticalAlignment = Alignment.CenterVertically
             ) {
                 Box(
                     modifier = Modifier
-                        .fillMaxSize()
-                        .background(
-                            color = Color(courseCard.color),
-                            shape = RoundedCornerShape(14.dp)
-                        )
-                )
-
-                if (courseCard.imageUrl != null) {
-                    GlideImage(
-                        model = courseCard.imageUrl,
-                        contentDescription = null,
+                        .padding(start = 2.dp, top = 2.dp, bottom = 2.dp)
+                        .size(72.dp)
+                ) {
+                    Box(
                         modifier = Modifier
                             .fillMaxSize()
-                            .clip(RoundedCornerShape(14.dp))
-                            .alpha(if (showColorOverlay) 0.4f else 1f),
-                        contentScale = ContentScale.Crop
+                            .background(
+                                color = Color(courseCard.color),
+                                shape = RoundedCornerShape(14.dp)
+                            )
                     )
-                }
 
-                if (hasMenu && courseCard.isClickable) {
-                    Box(
-                        modifier = Modifier
-                            .align(Alignment.TopStart)
-                            .padding(start = 8.dp, top = 8.dp)
-                    ) {
+                    if (courseCard.imageUrl != null) {
+                        GlideImage(
+                            model = courseCard.imageUrl,
+                            contentDescription = null,
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .clip(RoundedCornerShape(14.dp))
+                                .alpha(if (showColorOverlay) 0.4f else 1f),
+                            contentScale = ContentScale.Crop
+                        )
+                    }
+
+                    if (hasMenu && courseCard.isClickable) {
                         Box(
                             modifier = Modifier
-                                .size(24.dp)
-                                .clickable(onClick = openMenuClick)
-                                .background(
-                                    color = colorResource(R.color.backgroundLightest),
-                                    shape = RoundedCornerShape(12.dp)
-                                ),
-                            contentAlignment = Alignment.Center
+                                .align(Alignment.TopStart)
+                                .padding(start = 8.dp, top = 8.dp)
                         ) {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_kebab),
-                                contentDescription = stringResource(R.string.a11y_contentDescription_moreOptions),
-                                modifier = Modifier.size(16.dp),
-                                tint = Color(CanvasContext.emptyCourseContext(id = courseCard.id).color)
-                            )
-                        }
+                            Box(
+                                modifier = Modifier
+                                    .size(24.dp)
+                                    .pendoTag("coursesWidget_courseCardMenu", true)
+                                    .clickable(onClick = openMenuClick)
+                                    .background(
+                                        color = colorResource(R.color.backgroundLightest),
+                                        shape = RoundedCornerShape(12.dp)
+                                    ),
+                                contentAlignment = Alignment.Center
+                            ) {
+                                Icon(
+                                    painter = painterResource(R.drawable.ic_kebab),
+                                    contentDescription = stringResource(R.string.a11y_contentDescription_moreOptions),
+                                    modifier = Modifier.size(16.dp),
+                                    tint = Color(CanvasContext.emptyCourseContext(id = courseCard.id).color)
+                                )
+                            }
 
-                        DropdownMenu(
-                            expanded = showMenu,
-                            onDismissRequest = { showMenu = false },
-                            shape = RoundedCornerShape(8.dp),
-                            containerColor = colorResource(R.color.backgroundLightest)
-                        ) {
-                            DropdownMenuItem(
-                                text = {
-                                    Text(
-                                        text = stringResource(R.string.course_menu_manage_offline_content),
-                                        fontSize = 16.sp,
-                                        color = colorResource(R.color.textDarkest)
+                            DropdownMenu(
+                                expanded = showMenu,
+                                onDismissRequest = { showMenu = false },
+                                shape = RoundedCornerShape(8.dp),
+                                containerColor = colorResource(R.color.backgroundLightest)
+                            ) {
+                                DropdownMenuItem(
+                                    text = {
+                                        Text(
+                                            text = stringResource(R.string.course_menu_manage_offline_content),
+                                            fontSize = 16.sp,
+                                            color = colorResource(R.color.textDarkest)
+                                        )
+                                    },
+                                    onClick = {
+                                        showMenu = false
+                                        activity?.let {
+                                            onManageOfflineContent.invoke(
+                                                it,
+                                                courseCard.id
+                                            )
+                                        }
+                                    },
+                                    modifier = Modifier.pendoTag(
+                                        "coursesWidget_manageOfflineContent",
+                                        true
                                     )
-                                },
-                                onClick = {
-                                    showMenu = false
-                                    activity?.let { onManageOfflineContent.invoke(it, courseCard.id) }
-                                }
-                            )
-                            DropdownMenuItem(
-                                text = {
-                                    Text(
-                                        text = stringResource(R.string.customizeCourse),
-                                        fontSize = 16.sp,
-                                        color = colorResource(R.color.textDarkest)
+                                )
+                                DropdownMenuItem(
+                                    text = {
+                                        Text(
+                                            text = stringResource(R.string.customizeCourse),
+                                            fontSize = 16.sp,
+                                            color = colorResource(R.color.textDarkest)
+                                        )
+                                    },
+                                    onClick = {
+                                        showMenu = false
+                                        activity?.let {
+                                            onCustomizeCourse.invoke(
+                                                it,
+                                                courseCard.id
+                                            )
+                                        }
+                                    },
+                                    modifier = Modifier.pendoTag(
+                                        "coursesWidget_customizeCourse",
+                                        true
                                     )
-                                },
-                                onClick = {
-                                    showMenu = false
-                                    activity?.let { onCustomizeCourse.invoke(it, courseCard.id) }
-                                }
-                            )
+                                )
+                            }
                         }
                     }
-                }
 
-                if (showGrade && courseCard.grade !is GradeDisplay.Hidden) {
-                    GradeBadge(
-                        grade = courseCard.grade,
-                        courseColor = Color(CanvasContext.emptyCourseContext(id = courseCard.id).color),
-                        modifier = Modifier
-                            .align(Alignment.BottomStart)
-                            .padding(bottom = 8.dp, start = 8.dp)
-                    )
+                    if (showGrade && courseCard.grade !is GradeDisplay.Hidden) {
+                        GradeBadge(
+                            grade = courseCard.grade,
+                            courseColor = Color(CanvasContext.emptyCourseContext(id = courseCard.id).color),
+                            modifier = Modifier
+                                .align(Alignment.BottomStart)
+                                .padding(bottom = 8.dp, start = 8.dp)
+                        )
+                    }
                 }
-            }
-
-            Text(
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(start = 16.dp, end = 8.dp),
-                text = courseCard.name,
-                fontSize = 16.sp,
-                fontWeight = FontWeight.Medium,
-                color = colorResource(R.color.textDarkest),
-                maxLines = 2,
-                overflow = TextOverflow.Ellipsis,
-                lineHeight = 21.sp
-            )
 
-            if (courseCard.isSynced) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_offline_synced),
-                    contentDescription = stringResource(R.string.offline_content_available),
+                Text(
                     modifier = Modifier
-                        .padding(end = 8.dp)
-                        .size(24.dp),
-                    tint = colorResource(R.color.textDark)
+                        .weight(1f)
+                        .padding(start = 16.dp, end = 8.dp),
+                    text = courseCard.name,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.Medium,
+                    color = colorResource(R.color.textDarkest),
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis,
+                    lineHeight = 21.sp
                 )
-            }
 
-            if (courseCard.announcements.isNotEmpty()) {
-                Box(
-                    modifier = Modifier
-                        .clip(CircleShape)
-                        .size(48.dp)
-                        .clickable(enabled = courseCard.isClickable) {
-                            activity?.let {
-                                onAnnouncementClick?.invoke(
-                                    it,
-                                    courseCard.id
-                                )
-                            }
-                        },
-                    contentAlignment = Alignment.Center
-                ) {
+                if (courseCard.isSynced) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_announcement),
-                        contentDescription = stringResource(R.string.announcements),
-                        modifier = Modifier.requiredSize(24.dp),
+                        painter = painterResource(R.drawable.ic_offline_synced),
+                        contentDescription = stringResource(R.string.offline_content_available),
+                        modifier = Modifier
+                            .padding(end = 8.dp)
+                            .size(24.dp),
                         tint = colorResource(R.color.textDark)
                     )
+                }
+
+                if (courseCard.announcements.isNotEmpty()) {
                     Box(
                         modifier = Modifier
-                            .align(Alignment.TopEnd)
-                            .offset(x = (-8).dp, y = 6.dp)
-                            .background(
-                                color = dashboardColor,
-                                shape = RoundedCornerShape(12.dp)
-                            )
-                            .padding(horizontal = 5.dp, vertical = 2.dp)
+                            .clip(CircleShape)
+                            .size(48.dp)
+                            .pendoTag("coursesWidget_announcementBell", true)
+                            .clickable(enabled = courseCard.isClickable) {
+                                activity?.let {
+                                    onAnnouncementClick?.invoke(
+                                        it,
+                                        courseCard.id
+                                    )
+                                }
+                            },
+                        contentAlignment = Alignment.Center
                     ) {
-                        Text(
-                            text = courseCard.announcements.size.toString(),
-                            fontSize = 10.sp,
-                            fontWeight = FontWeight.SemiBold,
-                            color = colorResource(R.color.textLightest),
-                            lineHeight = 8.sp
+                        Icon(
+                            painter = painterResource(R.drawable.ic_announcement),
+                            contentDescription = stringResource(R.string.announcements),
+                            modifier = Modifier.requiredSize(24.dp),
+                            tint = colorResource(R.color.textDark)
                         )
+                        Box(
+                            modifier = Modifier
+                                .align(Alignment.TopEnd)
+                                .offset(x = (-8).dp, y = 6.dp)
+                                .background(
+                                    color = dashboardColor,
+                                    shape = RoundedCornerShape(12.dp)
+                                )
+                                .padding(horizontal = 5.dp, vertical = 2.dp)
+                        ) {
+                            Text(
+                                text = courseCard.announcements.size.toString(),
+                                fontSize = 10.sp,
+                                fontWeight = FontWeight.SemiBold,
+                                color = colorResource(R.color.textLightest),
+                                lineHeight = 8.sp
+                            )
+                        }
                     }
                 }
             }
         }
     }
-    }
 }
 
 @Composable
@@ -317,6 +349,7 @@ private fun GradeBadge(
                         lineHeight = 19.sp
                     )
                 }
+
                 is GradeDisplay.Letter -> {
                     Text(
                         text = grade.grade,
@@ -326,6 +359,7 @@ private fun GradeBadge(
                         lineHeight = 19.sp
                     )
                 }
+
                 GradeDisplay.Locked -> {
                     Icon(
                         painter = painterResource(R.drawable.ic_lock),
@@ -334,6 +368,7 @@ private fun GradeBadge(
                         tint = courseColor
                     )
                 }
+
                 GradeDisplay.NotAvailable -> {
                     Text(
                         text = stringResource(R.string.noGradeText),
@@ -343,6 +378,7 @@ private fun GradeBadge(
                         lineHeight = 19.sp
                     )
                 }
+
                 GradeDisplay.Hidden -> {
                     // Don't show anything for hidden grades
                 }
@@ -412,10 +448,10 @@ private fun CourseCardPreview() {
         ),
         showGrade = true,
         showColorOverlay = true,
-        onCourseClick = {_, _ ->},
-        onCustomizeCourse = {_, _ ->},
-        onManageOfflineContent = {_, _ ->},
-        onAnnouncementClick = {_, _ ->}
+        onCourseClick = { _, _ -> },
+        onCustomizeCourse = { _, _ -> },
+        onManageOfflineContent = { _, _ -> },
+        onAnnouncementClick = { _, _ -> }
     )
 }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CoursesWidget.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CoursesWidget.kt
index 18d6757008..d12b005481 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CoursesWidget.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/CoursesWidget.kt
@@ -61,6 +61,7 @@ import com.instructure.pandautils.features.dashboard.widget.courses.model.GradeD
 import com.instructure.pandautils.features.dashboard.widget.courses.model.GroupCardItem
 import com.instructure.pandautils.utils.getFragmentActivityOrNull
 import kotlinx.coroutines.flow.SharedFlow
+import sdk.pendo.io.pendoTag
 import sh.calvin.reorderable.ReorderableItem
 import sh.calvin.reorderable.rememberReorderableLazyGridState
 
@@ -178,7 +179,7 @@ fun CoursesWidgetContent(
                 Button(
                     onClick = { activity?.let { uiState.onAllCourses(it) } },
                     shape = RoundedCornerShape(24.dp),
-                    modifier = Modifier.height(30.dp),
+                    modifier = Modifier.height(30.dp).pendoTag("coursesWidget_allCoursesButton", true),
                     contentPadding = PaddingValues(
                         start = 12.dp,
                         0.dp,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/GroupCard.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/GroupCard.kt
index 4e1b1b3c9b..f5e213a86d 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/GroupCard.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/GroupCard.kt
@@ -59,6 +59,7 @@ import com.instructure.pandautils.compose.composables.Shimmer
 import com.instructure.pandautils.features.dashboard.widget.courses.model.GroupCardItem
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getFragmentActivityOrNull
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun GroupCard(
@@ -85,6 +86,7 @@ fun GroupCard(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(76.dp)
+                .pendoTag("coursesWidget_groupCard", true)
                 .clickable { activity?.let { onGroupClick(it, groupCard.id) } },
             verticalAlignment = Alignment.CenterVertically
         ) {
@@ -174,6 +176,7 @@ fun GroupCard(
                     .padding(end = 16.dp)
                     .clip(CircleShape)
                     .size(48.dp)
+                    .pendoTag("coursesWidget_groupMessage", true)
                     .clickable { activity?.let { onMessageClick.invoke(it, groupCard.id) } },
                 contentAlignment = Alignment.Center
             ) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/SectionExpandedStateDataStore.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/SectionExpandedStateDataStore.kt
index 121dda89bf..924586ed15 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/SectionExpandedStateDataStore.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/SectionExpandedStateDataStore.kt
@@ -18,16 +18,21 @@ package com.instructure.pandautils.features.dashboard.widget.courses
 
 import android.content.Context
 import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.preferencesDataStore
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
-private val Context.coursesWidgetDataStore by preferencesDataStore(name = SectionExpandedStateDataStore.STORE_NAME)
+private val Context.coursesWidgetDataStore by preferencesDataStore(
+    name = SectionExpandedStateDataStore.STORE_NAME,
+    corruptionHandler = ReplaceFileCorruptionHandler { emptyPreferences() }
+)
 
 class SectionExpandedStateDataStore @Inject constructor(
     @ApplicationContext private val context: Context
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/customize/CustomizeCourseScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/customize/CustomizeCourseScreen.kt
index 5a3f8438bd..d375965503 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/customize/CustomizeCourseScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/courses/customize/CustomizeCourseScreen.kt
@@ -70,6 +70,7 @@ import com.bumptech.glide.integration.compose.GlideImage
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.ColorPicker
 import com.instructure.pandautils.utils.ColorKeeper
@@ -120,101 +121,106 @@ fun CustomizeCourseScreenContent(
         }
     }
 
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(colorResource(R.color.backgroundLightest))
-            .testTag("customizeCourseScreen")
-    ) {
-        LazyColumn(
-            modifier = Modifier.fillMaxSize(),
-            contentPadding = PaddingValues(top = if (!uiState.showColorOverlay) appBarHeight else 0.dp)
+    CanvasScaffold(
+        backgroundColor = colorResource(id = R.color.backgroundLightest)
+    ) { padding ->
+        Box(
+            modifier = Modifier
+                .padding(padding)
+                .fillMaxSize()
+                .background(colorResource(R.color.backgroundLightest))
+                .testTag("customizeCourseScreen")
         ) {
-            item {
-                CourseHeader(
-                    imageUrl = uiState.imageUrl,
-                    color = uiState.selectedColor,
-                    showColorOverlay = uiState.showColorOverlay
-                )
-            }
+            LazyColumn(
+                modifier = Modifier.fillMaxSize(),
+                contentPadding = PaddingValues(top = if (!uiState.showColorOverlay) appBarHeight else 0.dp)
+            ) {
+                item {
+                    CourseHeader(
+                        imageUrl = uiState.imageUrl,
+                        color = uiState.selectedColor,
+                        showColorOverlay = uiState.showColorOverlay
+                    )
+                }
 
-            item {
-                Spacer(modifier = Modifier.height(16.dp))
-            }
+                item {
+                    Spacer(modifier = Modifier.height(16.dp))
+                }
 
-            item {
-                NicknameCard(
-                    nickname = uiState.nickname,
-                    onNicknameChanged = uiState.onNicknameChanged,
-                    modifier = Modifier
-                        .padding(horizontal = 16.dp)
-                        .testTag("nicknameCard")
-                )
-            }
+                item {
+                    NicknameCard(
+                        nickname = uiState.nickname,
+                        onNicknameChanged = uiState.onNicknameChanged,
+                        modifier = Modifier
+                            .padding(horizontal = 16.dp)
+                            .testTag("nicknameCard")
+                    )
+                }
 
-            item {
-                Spacer(modifier = Modifier.height(16.dp))
-            }
+                item {
+                    Spacer(modifier = Modifier.height(16.dp))
+                }
 
-            item {
-                Card(
-                    modifier = Modifier
-                        .padding(horizontal = 16.dp)
-                        .fillMaxWidth()
-                        .testTag("colorPickerCard"),
-                    colors = CardDefaults.cardColors(
-                        containerColor = colorResource(R.color.backgroundLightest)
-                    ),
-                    shape = RoundedCornerShape(16.dp),
-                    elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
-                ) {
-                    ColorPicker(
-                        label = stringResource(R.string.dashboardCourseColor),
-                        selectedColor = uiState.selectedColor,
-                        colors = uiState.availableColors.map { ColorKeeper.createThemedColor(it) },
-                        onColorSelected = uiState.onColorSelected,
-                        isCollapsible = false,
-                        expandedBackgroundColor = Color.Transparent,
-                        titleModifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp)
-                    )
+                item {
+                    Card(
+                        modifier = Modifier
+                            .padding(horizontal = 16.dp)
+                            .fillMaxWidth()
+                            .testTag("colorPickerCard"),
+                        colors = CardDefaults.cardColors(
+                            containerColor = colorResource(R.color.backgroundLightest)
+                        ),
+                        shape = RoundedCornerShape(16.dp),
+                        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp)
+                    ) {
+                        ColorPicker(
+                            label = stringResource(R.string.dashboardCourseColor),
+                            selectedColor = uiState.selectedColor,
+                            colors = uiState.availableColors.map { ColorKeeper.createThemedColor(it) },
+                            onColorSelected = uiState.onColorSelected,
+                            isCollapsible = false,
+                            expandedBackgroundColor = Color.Transparent,
+                            titleModifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp)
+                        )
+                    }
                 }
             }
-        }
 
-        SnackbarHost(
-            hostState = snackbarHostState,
-            modifier = Modifier.align(Alignment.BottomCenter)
-        )
+            SnackbarHost(
+                hostState = snackbarHostState,
+                modifier = Modifier.align(Alignment.BottomCenter)
+            )
 
-        CanvasThemedAppBar(
-            title = uiState.courseName,
-            subtitle = uiState.courseCode,
-            navIconRes = R.drawable.ic_close_lined,
-            navIconContentDescription = stringResource(R.string.close),
-            navigationActionClick = onNavigateBack,
-            backgroundColor = if (uiState.showColorOverlay) Color.Transparent else Color(uiState.initialColor),
-            contentColor = colorResource(R.color.textLightest),
-            modifier = Modifier.onGloballyPositioned { coordinates ->
-                appBarHeight = with(density) {
-                    coordinates.size.height.toDp()
-                }
-            },
-            actions = {
-                TextButton(
-                    onClick = uiState.onDone,
-                    enabled = !uiState.isLoading,
-                    modifier = Modifier.testTag("doneButton")
-                ) {
-                    Text(
-                        text = stringResource(R.string.done),
-                        color = colorResource(R.color.textLightest),
-                        fontSize = 14.sp,
-                        fontWeight = FontWeight.SemiBold,
-                        lineHeight = 19.sp
-                    )
+            CanvasThemedAppBar(
+                title = uiState.courseName,
+                subtitle = uiState.courseCode,
+                navIconRes = R.drawable.ic_close_lined,
+                navIconContentDescription = stringResource(R.string.close),
+                navigationActionClick = onNavigateBack,
+                backgroundColor = if (uiState.showColorOverlay) Color.Transparent else Color(uiState.initialColor),
+                contentColor = colorResource(R.color.textLightest),
+                modifier = Modifier.onGloballyPositioned { coordinates ->
+                    appBarHeight = with(density) {
+                        coordinates.size.height.toDp()
+                    }
+                },
+                actions = {
+                    TextButton(
+                        onClick = uiState.onDone,
+                        enabled = !uiState.isLoading,
+                        modifier = Modifier.testTag("doneButton")
+                    ) {
+                        Text(
+                            text = stringResource(R.string.done),
+                            color = colorResource(R.color.textLightest),
+                            fontSize = 14.sp,
+                            fontWeight = FontWeight.SemiBold,
+                            lineHeight = 19.sp
+                        )
+                    }
                 }
-            }
-        )
+            )
+        }
     }
 }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/AssignmentListItem.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/AssignmentListItem.kt
index 22d302aad3..836d4b751b 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/AssignmentListItem.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/AssignmentListItem.kt
@@ -55,6 +55,7 @@ import com.instructure.pandautils.compose.composables.SubmissionStateLabel
 import com.instructure.pandautils.utils.color
 import com.instructure.pandautils.utils.getFragmentActivity
 import java.util.Date
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun AssignmentListItem(
@@ -68,6 +69,7 @@ fun AssignmentListItem(
     Row(
         modifier = modifier
             .fillMaxWidth()
+            .pendoTag("forecastWidget_assignmentItem", true)
             .clickable {
                 assignment.onClick?.invoke(context.getFragmentActivity())
             }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastSegmentedControl.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastSegmentedControl.kt
index 47bb766767..bd08c1f489 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastSegmentedControl.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastSegmentedControl.kt
@@ -50,6 +50,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.instructure.pandautils.R
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun ForecastSegmentedControl(
@@ -148,6 +149,7 @@ private fun SegmentButton(
     Box(
         modifier = modifier
             .fillMaxHeight()
+            .pendoTag("forecastWidget_segmentButton", true)
             .clickable { onSelected(section) }
             .shadow(
                 elevation = if (isSelected) 2.dp else 0.dp,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastWidget.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastWidget.kt
index 98ec33b0a9..4ce78b1e4c 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastWidget.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/ForecastWidget.kt
@@ -65,6 +65,7 @@ import com.instructure.pandautils.compose.composables.TodayButton
 import kotlinx.coroutines.flow.SharedFlow
 import java.time.LocalDate
 import java.util.Date
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun ForecastWidget(
@@ -115,7 +116,8 @@ fun ForecastWidgetContent(
                     title = stringResource(R.string.forecastWidget_currentWeek),
                     onClick = uiState.onJumpToCurrentWeek,
                     buttonColor = Color(uiState.backgroundColor.color()),
-                    textColor = colorResource(R.color.textLightest)
+                    textColor = colorResource(R.color.textLightest),
+                    modifier = Modifier.pendoTag("forecastWidget_currentWeekButton", true)
                 )
             } else {
                 Spacer(modifier = Modifier.height(24.dp))
@@ -344,6 +346,7 @@ private fun ForecastWidgetErrorState(
         buttonText = stringResource(R.string.retry),
         buttonClick = onRetry,
         modifier = modifier
+            .pendoTag("forecastWidget_retryButton", true)
             .padding(top = 8.dp)
             .shadow(elevation = 2.dp, shape = RoundedCornerShape(14.dp))
             .background(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/WeekNavigationHeader.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/WeekNavigationHeader.kt
index 91b4038d0b..7d2a9baf83 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/WeekNavigationHeader.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/forecast/WeekNavigationHeader.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.instructure.pandautils.R
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun WeekNavigationHeader(
@@ -53,7 +54,7 @@ fun WeekNavigationHeader(
     ) {
         IconButton(
             onClick = onNavigatePrevious,
-            modifier = Modifier.size(24.dp)
+            modifier = Modifier.size(24.dp).pendoTag("forecastWidget_previousWeek", true)
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_chevron_left),
@@ -78,7 +79,7 @@ fun WeekNavigationHeader(
 
         IconButton(
             onClick = onNavigateNext,
-            modifier = Modifier.size(24.dp)
+            modifier = Modifier.size(24.dp).pendoTag("forecastWidget_nextWeek", true)
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_chevron_right),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/institutionalannouncements/InstitutionalAnnouncementsWidget.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/institutionalannouncements/InstitutionalAnnouncementsWidget.kt
index 253bf7c5e3..d032bd6038 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/institutionalannouncements/InstitutionalAnnouncementsWidget.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/institutionalannouncements/InstitutionalAnnouncementsWidget.kt
@@ -67,6 +67,7 @@ import com.instructure.pandautils.features.dashboard.widget.GlobalConfig
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ThemedColor
 import kotlinx.coroutines.flow.SharedFlow
+import sdk.pendo.io.pendoTag
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -194,6 +195,7 @@ private fun AnnouncementCard(
         Row(
             modifier = Modifier
                 .fillMaxWidth()
+                .pendoTag("institutionalAnnouncementsWidget_announcementCard", true)
                 .clickable(onClick = onClick)
                 .padding(16.dp),
             horizontalArrangement = Arrangement.spacedBy(12.dp),
@@ -287,6 +289,7 @@ private fun AnnouncementCard(
                 contentDescription = null,
                 modifier = Modifier
                     .size(24.dp)
+                    .pendoTag("institutionalAnnouncementsWidget_dismissAnnouncement", true)
                     .clickable(onClick = onDismiss),
                 tint = colorResource(R.color.textDark)
             )
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/progress/ProgressWidget.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/progress/ProgressWidget.kt
index af698847b0..ab2a55d996 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/progress/ProgressWidget.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/progress/ProgressWidget.kt
@@ -62,6 +62,7 @@ import com.instructure.pandautils.features.offline.sync.ProgressState
 import com.instructure.pandautils.utils.getFragmentActivityOrNull
 import kotlinx.coroutines.flow.SharedFlow
 import java.util.UUID
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun ProgressWidget(
@@ -175,7 +176,8 @@ private fun UploadProgressCard(
     Card(
         modifier = modifier
             .fillMaxWidth()
-            .clickable(onClick = onClick),
+            .pendoTag("progressWidget_uploadCard", true)
+        .clickable(onClick = onClick),
         shape = RoundedCornerShape(16.dp),
         elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
         colors = CardDefaults.cardColors(
@@ -248,6 +250,7 @@ private fun UploadInProgressContent(
             modifier = Modifier
                 .size(20.dp)
                 .align(Alignment.TopEnd)
+                .pendoTag("progressWidget_dismissUpload", true)
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_close),
@@ -316,6 +319,7 @@ private fun UploadSuccessContent(
                 modifier = Modifier
                     .size(20.dp)
                     .align(Alignment.TopEnd)
+                    .pendoTag("progressWidget_dismissUpload", true)
             ) {
                 Icon(
                     painter = painterResource(R.drawable.ic_close),
@@ -385,6 +389,7 @@ private fun UploadErrorContent(
                 modifier = Modifier
                     .size(20.dp)
                     .align(Alignment.TopEnd)
+                    .pendoTag("progressWidget_dismissUpload", true)
             ) {
                 Icon(
                     painter = painterResource(R.drawable.ic_close),
@@ -410,6 +415,7 @@ private fun SyncProgressCard(
     Card(
         modifier = modifier
             .fillMaxWidth()
+            .pendoTag("progressWidget_syncCard", true)
             .clickable(onClick = onClick),
         shape = RoundedCornerShape(16.dp),
         elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
@@ -489,6 +495,7 @@ private fun SyncProgressContent(
             modifier = Modifier
                 .size(20.dp)
                 .align(Alignment.TopEnd)
+                .pendoTag("progressWidget_dismissSync", true)
         ) {
             Icon(
                 painter = painterResource(R.drawable.ic_close),
@@ -555,6 +562,7 @@ private fun SyncErrorContent(
                 modifier = Modifier
                     .size(20.dp)
                     .align(Alignment.TopEnd)
+                    .pendoTag("progressWidget_dismissSync", true)
             ) {
                 Icon(
                     painter = painterResource(R.drawable.ic_close),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/todo/TodoWidget.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/todo/TodoWidget.kt
index b8760d6530..c45e76b853 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/todo/TodoWidget.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/dashboard/widget/todo/TodoWidget.kt
@@ -87,6 +87,7 @@ import org.threeten.bp.LocalDate
 import org.threeten.bp.format.TextStyle
 import java.util.Date
 import java.util.Locale
+import sdk.pendo.io.pendoTag
 
 @Composable
 fun TodoWidget(
@@ -169,7 +170,8 @@ fun TodoWidgetContent(
                     title = stringResource(R.string.todoWidget_today),
                     onClick = uiState.onJumpToToday,
                     buttonColor = Color(uiState.color.color()),
-                    textColor = colorResource(R.color.textLightest)
+                    textColor = colorResource(R.color.textLightest),
+                    modifier = Modifier.pendoTag("todoWidget_todayButton", true)
                 )
             } else {
                 Spacer(modifier = Modifier.height(24.dp))
@@ -230,7 +232,7 @@ fun TodoWidgetContent(
                                 checked = uiState.showCompleted,
                                 onCheckedChange = { uiState.onToggleShowCompleted() },
                                 color = Color(uiState.color.color()),
-                                modifier = Modifier.testTag("ShowCompletedSwitch")
+                                modifier = Modifier.testTag("ShowCompletedSwitch").pendoTag("todoWidget_showCompletedSwitch", true)
                             )
                         }
                     }
@@ -294,6 +296,7 @@ fun TodoWidgetContent(
                         modifier = Modifier
                             .align(Alignment.TopStart)
                             .offset(x = 8.dp, y = calendarCenterY - 12.dp)
+                            .pendoTag("todoWidget_previousWeek", true)
                     )
 
                     CalendarNavigationButton(
@@ -305,6 +308,7 @@ fun TodoWidgetContent(
                         modifier = Modifier
                             .align(Alignment.TopEnd)
                             .offset(x = (-8).dp, y = calendarCenterY - 12.dp)
+                            .pendoTag("todoWidget_nextWeek", true)
                     )
                 }
             }
@@ -479,7 +483,7 @@ private fun TodoItemsError(
                     containerColor = buttonColor
                 ),
                 shape = RoundedCornerShape(100.dp),
-                modifier = Modifier.height(30.dp),
+                modifier = Modifier.height(30.dp).pendoTag("todoWidget_refreshButton", true),
                 contentPadding = PaddingValues(
                     start = 12.dp,
                     top = 4.dp,
@@ -570,7 +574,7 @@ private fun AddTodoButton(
             containerColor = buttonColor
         ),
         shape = RoundedCornerShape(24.dp),
-        modifier = modifier.height(30.dp),
+        modifier = modifier.height(30.dp).pendoTag("todoWidget_addTodoButton", true),
         contentPadding = PaddingValues(
             start = 8.dp,
             top = 4.dp,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/create/CreateDiscussionWebViewFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/create/CreateDiscussionWebViewFragment.kt
index da0155aff6..e113726a0f 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/create/CreateDiscussionWebViewFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/create/CreateDiscussionWebViewFragment.kt
@@ -44,10 +44,14 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.PermissionRequester
 import com.instructure.pandautils.utils.PermissionUtils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.setupAsCloseButton
 import com.instructure.pandautils.views.CanvasWebView
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import dagger.hilt.android.AndroidEntryPoint
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -158,6 +162,7 @@ class CreateDiscussionWebViewFragment : BaseCanvasFragment() {
     }
 
     private fun setupToolbar(title: String) = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.title = title
 
         toolbar.setupAsCloseButton(this@CreateDiscussionWebViewFragment)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/details/DiscussionDetailsWebViewFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/details/DiscussionDetailsWebViewFragment.kt
index 9ff21a0476..c88dab27e3 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/details/DiscussionDetailsWebViewFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/discussion/details/DiscussionDetailsWebViewFragment.kt
@@ -41,6 +41,7 @@ import com.instructure.pandautils.features.discussion.DiscussionSharedAction
 import com.instructure.pandautils.features.discussion.DiscussionSharedEvents
 import com.instructure.pandautils.features.discussion.router.DiscussionRouter
 import com.instructure.pandautils.navigation.WebViewRouter
+import com.instructure.pandautils.utils.BooleanArg
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.LongArg
 import com.instructure.pandautils.utils.NullableParcelableArg
@@ -48,6 +49,8 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.PermissionRequester
 import com.instructure.pandautils.utils.PermissionUtils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
 import com.instructure.pandautils.utils.makeBundle
 import com.instructure.pandautils.utils.setMenu
@@ -79,6 +82,7 @@ class DiscussionDetailsWebViewFragment : BaseCanvasFragment() {
     var canvasContext: CanvasContext by ParcelableArg(key = Const.CANVAS_CONTEXT)
     private var discussionTopicHeader: DiscussionTopicHeader? by NullableParcelableArg(key = DISCUSSION_TOPIC_HEADER)
     private var discussionTopicHeaderId: Long by LongArg(default = 0L, key = DISCUSSION_TOPIC_HEADER_ID)
+    private var isInModulesPager: Boolean by BooleanArg(key = IS_IN_MODULES_PAGER, default = false)
 
     private val viewModel: DiscussionDetailsWebViewViewModel by viewModels()
 
@@ -190,6 +194,10 @@ class DiscussionDetailsWebViewFragment : BaseCanvasFragment() {
     }
 
     private fun setupToolbar(title: String) = with(binding) {
+        toolbar.applyTopSystemBarInsets()
+        if (!isInModulesPager) {
+            discussionWebView.applyBottomSystemBarInsets()
+        }
         toolbar.title = title
 
         if (discussionDetailsWebViewFragmentBehavior.showBackButton) {
@@ -210,19 +218,22 @@ class DiscussionDetailsWebViewFragment : BaseCanvasFragment() {
         const val DISCUSSION_TOPIC_HEADER = "discussion_topic_header"
         const val DISCUSSION_TOPIC_HEADER_ID = "discussion_topic_header_id"
         const val DISCUSSION_TOPIC = "discussion_topic"
+        private const val IS_IN_MODULES_PAGER = "isInModulesPager"
 
-        fun makeRoute(canvasContext: CanvasContext, discussionTopicHeader: DiscussionTopicHeader): Route {
+        fun makeRoute(canvasContext: CanvasContext, discussionTopicHeader: DiscussionTopicHeader, isInModulesPager: Boolean = false): Route {
             val bundle = Bundle().apply {
                 putParcelable(DISCUSSION_TOPIC_HEADER, discussionTopicHeader)
                 putLong(DISCUSSION_TOPIC_HEADER_ID, discussionTopicHeader.id)
+                putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
             }
 
             return Route(null, DiscussionDetailsWebViewFragment::class.java, canvasContext, bundle)
         }
 
-        fun makeRoute(canvasContext: CanvasContext, discussionTopicHeaderId: Long): Route {
+        fun makeRoute(canvasContext: CanvasContext, discussionTopicHeaderId: Long, isInModulesPager: Boolean = false): Route {
             val bundle = Bundle().apply {
                 putLong(DISCUSSION_TOPIC_HEADER_ID, discussionTopicHeaderId)
+                putBoolean(IS_IN_MODULES_PAGER, isInModulesPager)
             }
 
             return Route(null, DiscussionDetailsWebViewFragment::class.java, canvasContext, bundle)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/homeroom/HomeroomFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/homeroom/HomeroomFragment.kt
index 6925b1f4a8..4a9c184fdd 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/homeroom/HomeroomFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/homeroom/HomeroomFragment.kt
@@ -23,7 +23,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.webkit.WebView
-import com.instructure.pandautils.base.BaseCanvasFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
@@ -35,10 +34,12 @@ import com.instructure.pandautils.BuildConfig
 import com.instructure.pandautils.R
 import com.instructure.pandautils.analytics.SCREEN_VIEW_K5_HOMEROOM
 import com.instructure.pandautils.analytics.ScreenView
+import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.databinding.FragmentHomeroomBinding
 import com.instructure.pandautils.discussions.DiscussionUtils
 import com.instructure.pandautils.features.dashboard.notifications.DashboardNotificationsFragment
 import com.instructure.pandautils.navigation.WebViewRouter
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
 import com.instructure.pandautils.utils.children
 import com.instructure.pandautils.utils.toast
 import com.instructure.pandautils.views.CanvasWebView
@@ -90,6 +91,8 @@ class HomeroomFragment : BaseCanvasFragment() {
             viewModel.refresh()
             (childFragmentManager.findFragmentByTag("notifications_fragment") as DashboardNotificationsFragment).refresh()
         }
+
+        binding.homeroomSwipeRefreshLayout.applyBottomSystemBarInsets()
     }
 
     private fun setUpRecyclerViewSpan() {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModel.kt
index 5d6af97b41..88775f1141 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModel.kt
@@ -287,7 +287,7 @@ class ScheduleViewModel @Inject constructor(
                 .map { entry ->
                     val color = if (coursesMap.containsKey(entry.key?.id)) coursesMap[entry.key?.id].color else resources.getColor(R.color.textInfo)
                     val scheduleViewData = ScheduleCourseViewData(
-                            entry.key?.name ?: resources.getString(R.string.schedule_todo_title),
+                            entry.key?.name ?: resources.getString(R.string.schedule_todo_title_new),
                             entry.key != null && !entry.key!!.homeroomCourse,
                             color,
                             entry.key?.imageUrl ?: "",
@@ -404,7 +404,7 @@ class ScheduleViewModel @Inject constructor(
             PlannableType.ASSIGNMENT, PlannableType.SUB_ASSIGNMENT -> resources.getString(R.string.a11y_assignment)
             PlannableType.PLANNER_NOTE -> resources.getString(R.string.a11y_planner_note)
             PlannableType.QUIZ -> resources.getString(R.string.a11y_quiz)
-            PlannableType.TODO -> resources.getString(R.string.a11y_todo)
+            PlannableType.TODO -> resources.getString(R.string.a11y_todo_new)
             PlannableType.WIKI_PAGE -> resources.getString(R.string.a11y_page)
             PlannableType.ASSESSMENT_REQUEST -> resources.getString(R.string.a11y_assessment_request)
         }
@@ -555,7 +555,7 @@ class ScheduleViewModel @Inject constructor(
             PlannableType.ANNOUNCEMENT -> simpleDateFormat.format(plannerItem.plannableDate)
             PlannableType.CALENDAR_EVENT -> getCalendarEventDueText(plannerItem)
             PlannableType.PLANNER_NOTE -> resources.getString(
-                    R.string.schedule_todo_due_text,
+                    R.string.schedule_todo_due_text_new,
                     simpleDateFormat.format(plannerItem.plannable.todoDate.toDate() ?: plannerItem.plannableDate)
             )
             else -> resources.getString(R.string.schedule_due_text, simpleDateFormat.format(plannerItem.plannableDate))
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/pager/SchedulePagerFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/pager/SchedulePagerFragment.kt
index 7835167551..697024ee61 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/pager/SchedulePagerFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/elementary/schedule/pager/SchedulePagerFragment.kt
@@ -21,13 +21,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintSet
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
-import com.instructure.pandautils.base.BaseCanvasFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
+import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.databinding.FragmentSchedulePagerBinding
 import com.instructure.pandautils.features.elementary.schedule.ScheduleFragment
 import com.instructure.pandautils.utils.isAccessibilityEnabled
@@ -57,6 +60,30 @@ class SchedulePagerFragment : BaseCanvasFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        // Consume bottom insets for schedulePager so child fragments don't apply them
+        // The controls section handles bottom spacing
+        ViewCompat.setOnApplyWindowInsetsListener(binding.schedulePager) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            WindowInsetsCompat.Builder(insets)
+                .setInsets(
+                    WindowInsetsCompat.Type.navigationBars(),
+                    androidx.core.graphics.Insets.of(
+                        navigationBars.left,
+                        navigationBars.top,
+                        navigationBars.right,
+                        0 // Consume bottom insets
+                    )
+                )
+                .build()
+        }
+
+        // Apply bottom system bar insets to controls (Previous/Next Week buttons)
+        ViewCompat.setOnApplyWindowInsetsListener(binding.controls) { view, insets ->
+            val navigationBars = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            view.updatePadding(bottom = navigationBars.bottom)
+            insets
+        }
+
         viewModel.data.observe(viewLifecycleOwner, { schedulePagerViewData ->
             schedulePagerViewData?.let {
                 binding.schedulePager.adapter = object : FragmentStateAdapter(this@SchedulePagerFragment) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogFragment.kt
index 82072ba28a..352e43e18c 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogFragment.kt
@@ -17,6 +17,7 @@
 package com.instructure.pandautils.features.file.upload
 
 import android.Manifest
+import android.app.Activity
 import android.app.Dialog
 import android.content.DialogInterface
 import android.content.pm.PackageManager
@@ -27,6 +28,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Toast
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
@@ -44,6 +47,7 @@ import com.instructure.pandautils.R
 import com.instructure.pandautils.base.BaseCanvasDialogFragment
 import com.instructure.pandautils.databinding.FragmentFileUploadDialogBinding
 import com.instructure.pandautils.features.shareextension.ShareExtensionActivity
+import com.instructure.pandautils.features.file.upload.scanner.DocumentScannerManager
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.FileUploadUtils
 import com.instructure.pandautils.utils.IntArg
@@ -72,6 +76,9 @@ class FileUploadDialogFragment : BaseCanvasDialogFragment() {
     @Inject
     lateinit var fileUploadEventHandler: FileUploadEventHandler
 
+    @Inject
+    lateinit var documentScannerManager: DocumentScannerManager
+
     private var uploadType: FileUploadType by SerializableArg(FileUploadType.ASSIGNMENT)
     private var canvasContext: CanvasContext by ParcelableArg(ApiPrefs.user)
     private var position: Int by IntArg()
@@ -117,6 +124,16 @@ class FileUploadDialogFragment : BaseCanvasDialogFragment() {
         }
     }
 
+    private val scannerLauncher = registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result: ActivityResult ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            val scanResult = documentScannerManager.handleScanResultFromIntent(result.data)
+            val pdfUri = scanResult.pdfUri
+            if (pdfUri != null) {
+                viewModel.addFile(pdfUri)
+            }
+        }
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View {
         binding.lifecycleOwner = this
@@ -236,6 +253,7 @@ class FileUploadDialogFragment : BaseCanvasDialogFragment() {
             is FileUploadAction.PickFile -> pickFromFiles()
             is FileUploadAction.PickMultipleFile -> pickMultipleFile()
             is FileUploadAction.PickMultipleImage -> pickMultipleImage()
+            is FileUploadAction.LaunchScanner -> launchScanner()
             is FileUploadAction.ShowToast -> Toast.makeText(requireContext(), action.toast, Toast.LENGTH_SHORT).show()
             is FileUploadAction.UploadStarted -> dismiss()
             is FileUploadAction.AttachmentSelectedAction -> {
@@ -302,6 +320,16 @@ class FileUploadDialogFragment : BaseCanvasDialogFragment() {
         multipleFilePickerContract.launch("image/*")
     }
 
+    private fun launchScanner() {
+        documentScannerManager.getStartScanIntent(requireActivity())
+            .addOnSuccessListener { intentSender ->
+                scannerLauncher.launch(IntentSenderRequest.Builder(intentSender).build())
+            }
+            .addOnFailureListener {
+                Toast.makeText(requireContext(), R.string.errorOccurred, Toast.LENGTH_SHORT).show()
+            }
+    }
+
     companion object {
 
         const val TAG = "FileUploadDialogFragment"
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewData.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewData.kt
index 185b8efb7e..697819de27 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewData.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewData.kt
@@ -39,6 +39,7 @@ sealed class FileUploadAction {
     object PickFile : FileUploadAction()
     object PickMultipleImage : FileUploadAction()
     object PickMultipleFile : FileUploadAction()
+    object LaunchScanner : FileUploadAction()
     object UploadStarted : FileUploadAction()
     data class ShowToast(val toast: String) : FileUploadAction()
     data class AttachmentSelectedAction(val event: Int, val attachment: FileSubmitObject?) : FileUploadAction()
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewModel.kt
index 5819dfac76..d56bd07199 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/FileUploadDialogViewModel.kt
@@ -29,6 +29,7 @@ import com.instructure.canvasapi2.models.CanvasContext
 import com.instructure.canvasapi2.models.postmodels.FileSubmitObject
 import com.instructure.pandautils.R
 import com.instructure.pandautils.features.file.upload.itemviewmodels.FileItemViewModel
+import com.instructure.pandautils.features.file.upload.scanner.DocumentScannerManager
 import com.instructure.pandautils.features.file.upload.worker.FileUploadWorker
 import com.instructure.pandautils.mvvm.Event
 import com.instructure.pandautils.room.appdatabase.daos.FileUploadInputDao
@@ -46,7 +47,8 @@ class FileUploadDialogViewModel @Inject constructor(
         private val fileUploadUtils: FileUploadUtilsHelper,
         private val resources: Resources,
         private val workManager: WorkManager,
-        private val fileUploadInputDao: FileUploadInputDao
+        private val fileUploadInputDao: FileUploadInputDao,
+        private val documentScannerManager: DocumentScannerManager
 ) : ViewModel() {
 
     val data: LiveData<FileUploadDialogViewData>
@@ -57,6 +59,9 @@ class FileUploadDialogViewModel @Inject constructor(
         get() = _events
     private val _events = MutableLiveData<Event<FileUploadAction>>()
 
+    val scannerAvailable: Boolean
+        get() = documentScannerManager.isDeviceSupported()
+
     private var assignment: Assignment? = null
     private var uploadType: FileUploadType = FileUploadType.ASSIGNMENT
     private var canvasContext: CanvasContext = CanvasContext.defaultCanvasContext()
@@ -141,6 +146,14 @@ class FileUploadDialogViewModel @Inject constructor(
         }
     }
 
+    fun onScannerClicked() {
+        if (isOneFileOnly && filesToUpload.isNotEmpty()) {
+            _events.value = Event(FileUploadAction.ShowToast(resources.getString(R.string.oneFileOnly)))
+            return
+        }
+        _events.value = Event(FileUploadAction.LaunchScanner)
+    }
+
     fun addFile(fileUri: Uri) {
         val submitObject = getUriContents(fileUri)
         if (submitObject != null) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/scanner/DocumentScannerManager.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/scanner/DocumentScannerManager.kt
new file mode 100644
index 0000000000..383f1dd46b
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/file/upload/scanner/DocumentScannerManager.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.pandautils.features.file.upload.scanner
+
+import android.app.Activity
+import android.app.ActivityManager
+import android.content.Context
+import android.content.Intent
+import android.content.IntentSender
+import android.net.Uri
+import com.google.android.gms.tasks.Task
+import com.google.mlkit.vision.documentscanner.GmsDocumentScannerOptions
+import com.google.mlkit.vision.documentscanner.GmsDocumentScannerOptions.RESULT_FORMAT_JPEG
+import com.google.mlkit.vision.documentscanner.GmsDocumentScannerOptions.RESULT_FORMAT_PDF
+import com.google.mlkit.vision.documentscanner.GmsDocumentScannerOptions.SCANNER_MODE_FULL
+import com.google.mlkit.vision.documentscanner.GmsDocumentScanning
+import com.google.mlkit.vision.documentscanner.GmsDocumentScanningResult
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import javax.inject.Inject
+import javax.inject.Singleton
+
+data class DocumentScanResult(
+    val pdfUri: Uri?,
+    val pageUris: List<Uri>
+)
+
+@Singleton
+class DocumentScannerManager @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+
+    fun isDeviceSupported(): Boolean {
+        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val memoryInfo = ActivityManager.MemoryInfo()
+        activityManager.getMemoryInfo(memoryInfo)
+        val totalMemoryGB = memoryInfo.totalMem.toDouble() / (1024 * 1024 * 1024)
+        return totalMemoryGB >= 1.7
+    }
+
+    fun getStartScanIntent(activity: Activity, pageLimit: Int = 50): Task<IntentSender> {
+        val options = GmsDocumentScannerOptions.Builder()
+            .setScannerMode(SCANNER_MODE_FULL)
+            .setGalleryImportAllowed(true)
+            .setPageLimit(pageLimit)
+            .setResultFormats(RESULT_FORMAT_PDF, RESULT_FORMAT_JPEG)
+            .build()
+        return GmsDocumentScanning.getClient(options).getStartScanIntent(activity)
+    }
+
+    fun handleScanResultFromIntent(intent: Intent?): DocumentScanResult {
+        val result = GmsDocumentScanningResult.fromActivityResultIntent(intent)
+            ?: return DocumentScanResult(null, emptyList())
+        val pdfUri = result.pdf?.uri
+        val pageUris = result.pages?.map { it.imageUri } ?: emptyList()
+        return DocumentScanResult(pdfUri, pageUris)
+    }
+
+    fun generateFileName(): String {
+        val dateFormat = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US)
+        val timestamp = dateFormat.format(Date())
+        return "Scanned_Document_$timestamp.pdf"
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/GradesScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/GradesScreen.kt
index 795de173cc..79b6fd25bb 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/GradesScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/GradesScreen.kt
@@ -42,13 +42,21 @@ import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -67,7 +75,6 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.OutlinedTextField
-import androidx.compose.material.Scaffold
 import androidx.compose.material.SnackbarHost
 import androidx.compose.material.SnackbarHostState
 import androidx.compose.material.SnackbarResult
@@ -119,6 +126,7 @@ import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.NoRippleInteractionSource
 import com.instructure.pandautils.compose.composables.CanvasDivider
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasSwitch
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.CheckpointItem
@@ -149,6 +157,7 @@ fun GradesScreen(
     actionHandler: (GradesAction) -> Unit,
     canvasContextColor: Int,
     appBarUiState: AppBarUiState? = null,
+    applyInsets: Boolean = true
 ) {
     CanvasTheme {
         val snackbarHostState = remember { SnackbarHostState() }
@@ -163,9 +172,11 @@ fun GradesScreen(
                 }
             }
         }
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             snackbarHost = { SnackbarHost(hostState = snackbarHostState, modifier = Modifier.testTag("snackbarHost")) },
+            contentWindowInsets = if (applyInsets) WindowInsets.navigationBars.only(WindowInsetsSides.Bottom)
+                .union(WindowInsets.ime) else WindowInsets(0, 0, 0, 0),
             topBar = {
                 appBarUiState?.let {
                     CanvasThemedAppBar(
@@ -205,9 +216,11 @@ fun GradesScreen(
                                         iconColor = colorResource(R.color.textLightest)
                                     ) {
                                         DropdownMenuItem(
-                                            modifier = Modifier.background(
-                                                color = colorResource(id = R.color.backgroundLightestElevated)
-                                            ),
+                                            modifier = Modifier
+                                                .fillMaxWidth()
+                                                .background(
+                                                    color = colorResource(id = R.color.backgroundLightestElevated)
+                                                ),
                                             onClick = {
                                                 overflowMenuExpanded = !overflowMenuExpanded
                                                 it.addBookmarkClick()
@@ -255,7 +268,6 @@ fun GradesScreen(
             )
             Box(
                 modifier = Modifier
-                    .padding(padding)
                     .pullRefresh(pullRefreshState)
             ) {
                 when {
@@ -283,7 +295,11 @@ fun GradesScreen(
                             contextColor = canvasContextColor,
                             actionHandler = actionHandler,
                             canvasContextColor = canvasContextColor,
-                            showActionsOnCard = appBarUiState == null
+                            showActionsOnCard = appBarUiState == null,
+                            scaffoldPadding = padding,
+                            modifier = if (uiState.gradePreferencesUiState.show) Modifier.padding(
+                                bottom = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
+                            ) else Modifier
                         )
                     }
                 }
@@ -335,7 +351,9 @@ private fun GradesScreenContent(
     contextColor: Int,
     actionHandler: (GradesAction) -> Unit,
     showActionsOnCard: Boolean,
-    canvasContextColor: Int
+    canvasContextColor: Int,
+    modifier: Modifier = Modifier,
+    scaffoldPadding: PaddingValues = PaddingValues(0.dp),
 ) {
     val lazyListState = rememberLazyListState()
 
@@ -347,7 +365,7 @@ private fun GradesScreenContent(
 
     val isPortrait = LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT
 
-    Column(modifier = Modifier.fillMaxSize()) {
+    Column(modifier = modifier.fillMaxSize()) {
         if (isPortrait) {
             SearchCardTransition(
                 uiState = uiState,
@@ -361,7 +379,7 @@ private fun GradesScreenContent(
         LazyColumn(
             state = lazyListState,
             modifier = Modifier.testTag("gradesList"),
-            contentPadding = PaddingValues(bottom = 64.dp)
+            contentPadding = scaffoldPadding
         ) {
             item {
                 if (!isPortrait) {
@@ -409,7 +427,8 @@ private fun GradesScreenContent(
                             .height(24.dp)
                             .semantics {
                                 hideFromAccessibility()
-                            }.testTag("basedOnGradedAssignmentsSwitch")
+                            }
+                            .testTag("basedOnGradedAssignmentsSwitch")
                     )
                 }
 
@@ -452,7 +471,8 @@ private fun GradesScreenContent(
                                 .height(24.dp)
                                 .semantics {
                                     hideFromAccessibility()
-                                }.testTag("showWhatIfScoreSwitch")
+                                }
+                                .testTag("showWhatIfScoreSwitch")
                         )
                     }
                 }
@@ -782,7 +802,9 @@ private fun GradesCard(
                         } else {
                             colorResource(id = R.color.textDarkest)
                         },
-                        modifier = Modifier.padding(start = 8.dp).testTag("totalGradeScoreText")
+                        modifier = Modifier
+                            .padding(start = 8.dp)
+                            .testTag("totalGradeScoreText")
                     )
                 }
             }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/gradepreferences/GradePreferencesScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/gradepreferences/GradePreferencesScreen.kt
index 1f51586281..72c69db172 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/gradepreferences/GradePreferencesScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/grades/gradepreferences/GradePreferencesScreen.kt
@@ -18,6 +18,7 @@
 package com.instructure.pandautils.features.grades.gradepreferences
 
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/InboxComposeFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/InboxComposeFragment.kt
index c8097976b8..fa151cea74 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/InboxComposeFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/InboxComposeFragment.kt
@@ -122,7 +122,9 @@ class InboxComposeFragment : BaseCanvasFragment(), FragmentInteractions, FileUpl
     private fun handleAction(action: InboxComposeViewModelAction) {
         when (action) {
             is InboxComposeViewModelAction.NavigateBack -> {
-                requireActivity().onBackPressed()
+                if (isAdded && !parentFragmentManager.isStateSaved) {
+                    requireActivity().onBackPressed()
+                }
             }
             is InboxComposeViewModelAction.OpenAttachmentPicker -> {
                 val bundle = FileUploadDialogFragment.createMessageAttachmentsBundle(arrayListOf())
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/InboxComposeScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/InboxComposeScreen.kt
index 57204944bf..e4546ded76 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/InboxComposeScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/InboxComposeScreen.kt
@@ -42,7 +42,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.LocalContentAlpha
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -80,6 +79,7 @@ import com.instructure.pandares.R
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.CanvasAppBar
 import com.instructure.pandautils.compose.composables.CanvasDivider
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.LabelSwitchRow
 import com.instructure.pandautils.compose.composables.LabelTextFieldRow
 import com.instructure.pandautils.compose.composables.Loading
@@ -109,7 +109,7 @@ fun InboxComposeScreen(
     val bodyFocusRequester = remember { FocusRequester() }
 
     CanvasTheme {
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 CanvasAppBar(
@@ -183,8 +183,8 @@ private fun InboxComposeScreenContent(
     }
     Column(
         Modifier
-            .verticalScroll(rememberScrollState())
             .padding(padding)
+            .verticalScroll(rememberScrollState())
             .fillMaxSize()
             .testTag("InboxComposeScreenContent")
     ) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/RecipientPickerScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/RecipientPickerScreen.kt
index f15abd71cc..6226e2c319 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/RecipientPickerScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/compose/composables/RecipientPickerScreen.kt
@@ -24,10 +24,16 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -98,6 +104,7 @@ fun RecipientPickerScreen(
         CanvasTheme {
             Scaffold(
                 backgroundColor = colorResource(id = com.instructure.pandares.R.color.backgroundLightest),
+                contentWindowInsets = WindowInsets.ime.union(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom)),
                 topBar = { TopBar(title, uiState, actionHandler) },
                 content = { padding ->
                     Box(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsFragment.kt
index 57ee6e0744..d2a70bf0d1 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsFragment.kt
@@ -30,6 +30,7 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
+import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.canvasapi2.utils.pageview.PageView
 import com.instructure.interactions.FragmentInteractions
 import com.instructure.interactions.Navigation
@@ -45,8 +46,7 @@ import com.instructure.pandautils.features.inbox.utils.InboxSharedAction
 import com.instructure.pandautils.features.inbox.utils.InboxSharedEvents
 import com.instructure.pandautils.navigation.WebViewRouter
 import com.instructure.pandautils.utils.Const
-import com.instructure.pandautils.utils.ThemePrefs
-import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.WindowInsetsHelper
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.toast
 import com.instructure.pandautils.utils.withArgs
@@ -93,7 +93,14 @@ class InboxDetailsFragment : BaseCanvasFragment(), FragmentInteractions {
     override fun title(): String = getString(R.string.message)
 
     override fun applyTheme() {
-        ViewStyler.setStatusBarDark(requireActivity(), ThemePrefs.primaryColor)
+        // Always use light/white status bar icons for better visibility
+        WindowInsetsHelper.setSystemBarsAppearance(requireActivity().window, false)
+    }
+
+    override fun onConfigurationChanged(newConfig: android.content.res.Configuration) {
+        super.onConfigurationChanged(newConfig)
+        // Reapply status bar appearance when orientation changes
+        applyTheme()
     }
 
     override fun getFragment(): Fragment {
@@ -141,6 +148,7 @@ class InboxDetailsFragment : BaseCanvasFragment(), FragmentInteractions {
     companion object {
         const val CONVERSATION_ID = "conversation_id"
         const val UNREAD = "unread"
+        const val SCOPE = "scope"
 
         fun newInstance(): InboxDetailsFragment {
             return InboxDetailsFragment()
@@ -153,10 +161,11 @@ class InboxDetailsFragment : BaseCanvasFragment(), FragmentInteractions {
             return InboxDetailsFragment().withArgs(route.arguments)
         }
 
-        fun makeRoute(conversationId: Long, unread: Boolean = false): Route {
+        fun makeRoute(conversationId: Long, unread: Boolean = false, scope: InboxApi.Scope = InboxApi.Scope.INBOX): Route {
             val bundle = bundleOf().apply {
                 putLong(Const.CONVERSATION_ID, conversationId)
                 putBoolean(UNREAD, unread)
+                putString(SCOPE, scope.name)
             }
             return Route(null, InboxDetailsFragment::class.java, null, bundle)
         }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsUiState.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsUiState.kt
index ba66935ca5..e34e08e69f 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsUiState.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsUiState.kt
@@ -31,6 +31,7 @@ data class InboxDetailsUiState(
     val showBackButton: Boolean = true,
     val showDeleteButton: Boolean = true,
     val showReplyAllButton: Boolean = true,
+    val showArchiveOption: Boolean = true,
 )
 
 data class ConfirmationDialogState(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModel.kt
index 5c16d9f754..90a6f1d9c8 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModel.kt
@@ -19,6 +19,7 @@ import android.content.Context
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.canvasapi2.models.Conversation
 import com.instructure.canvasapi2.models.Message
 import com.instructure.pandares.R
@@ -48,6 +49,11 @@ class InboxDetailsViewModel @Inject constructor(
 
     val conversationId: Long? = savedStateHandle.get<Long>(InboxDetailsFragment.CONVERSATION_ID)
     val unread: Boolean = savedStateHandle.get<Boolean>(InboxDetailsFragment.UNREAD) ?: false
+    private val scope: InboxApi.Scope = try {
+        InboxApi.Scope.valueOf(savedStateHandle.get<String>(InboxDetailsFragment.SCOPE) ?: InboxApi.Scope.INBOX.name)
+    } catch (_: Exception) {
+        InboxApi.Scope.INBOX
+    }
 
     private val _uiState = MutableStateFlow(InboxDetailsUiState())
     val uiState = _uiState.asStateFlow()
@@ -62,7 +68,8 @@ class InboxDetailsViewModel @Inject constructor(
     init {
         _uiState.update { it.copy(
             conversationId = conversationId,
-            showBackButton = behavior.getShowBackButton(context)
+            showBackButton = behavior.getShowBackButton(context),
+            showArchiveOption = scope != InboxApi.Scope.SENT
         ) }
         viewModelScope.launch {
             checkAndApplyFeatureFlagRestrictions()
@@ -267,7 +274,12 @@ class InboxDetailsViewModel @Inject constructor(
             val result = repository.updateState(conversationId, state)
             if (result.isSuccess) {
                 _uiState.update { it.copy(conversation = it.conversation?.copy(workflowState = result.dataOrNull?.workflowState)) }
-
+                val message = if (state == Conversation.WorkflowState.ARCHIVED) {
+                    context.getString(R.string.conversationArchived)
+                } else {
+                    context.getString(R.string.conversationUnarchived)
+                }
+                _events.send(InboxDetailsFragmentAction.ShowScreenResult(message))
                 refreshParentFragment()
             } else {
                 _events.send(InboxDetailsFragmentAction.ShowScreenResult(context.getString(R.string.conversationUpdateFailed)))
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/composables/InboxDetailsScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/composables/InboxDetailsScreen.kt
index 12e6dd9e2d..adf17d56f6 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/composables/InboxDetailsScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/details/composables/InboxDetailsScreen.kt
@@ -23,11 +23,15 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Divider
@@ -35,9 +39,7 @@ import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
@@ -48,7 +50,6 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
@@ -66,6 +67,8 @@ import com.instructure.canvasapi2.models.Message
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.EmptyContent
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.Loading
@@ -77,7 +80,6 @@ import com.instructure.pandautils.features.inbox.utils.InboxMessageUiState
 import com.instructure.pandautils.features.inbox.utils.InboxMessageView
 import com.instructure.pandautils.features.inbox.utils.MessageAction
 import com.instructure.pandautils.utils.ScreenState
-import com.instructure.pandautils.utils.ThemePrefs
 import java.time.ZonedDateTime
 
 @Composable
@@ -88,7 +90,7 @@ fun InboxDetailsScreen(
     actionHandler: (InboxDetailsAction) -> Unit
 ) {
     CanvasTheme {
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 AppBar(title, uiState, actionHandler)
@@ -106,38 +108,36 @@ private fun AppBar(
     uiState: InboxDetailsUiState,
     actionHandler: (InboxDetailsAction) -> Unit
 ) {
-    TopAppBar(
-        title = {
+    val context = LocalContext.current
+    val isTeacherApp = context.packageName.contains("teacher")
+
+    CanvasThemedAppBar(
+        content = {
             Text(
                 text = title,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
             )
         },
-        navigationIcon = if (uiState.showBackButton) {
-            {
-                IconButton(onClick = { actionHandler(InboxDetailsAction.CloseFragment) }) {
-                    Icon(
-                        painterResource(id = R.drawable.ic_back_arrow),
-                        contentDescription = stringResource(id = R.string.back)
-                    )
-                }
-            }
-        } else null,
+        navIconRes = if (uiState.showBackButton) R.drawable.ic_back_arrow else null,
+        navIconContentDescription = stringResource(id = R.string.back),
+        navigationActionClick = {
+            actionHandler(InboxDetailsAction.CloseFragment)
+        },
         actions = {
             AppBarMenu(
                 conversation = uiState.conversation,
                 showDeleteButton = uiState.showDeleteButton,
                 showReplyAllButton = uiState.showReplyAllButton,
+                showArchiveOption = uiState.showArchiveOption,
                 actionHandler = actionHandler
             )
         },
-        backgroundColor = Color(color = ThemePrefs.primaryColor),
-        contentColor = Color(color = ThemePrefs.primaryTextColor),
-        elevation = 0.dp,
         modifier = Modifier
-            .height(64.dp)
-            .testTag("toolbar"),
+            .then(
+                if (isTeacherApp) Modifier.windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
+                else Modifier
+            )
     )
 }
 @OptIn(ExperimentalMaterialApi::class)
@@ -148,12 +148,19 @@ private fun InboxDetailsScreenContent(
     messageActionHandler: (MessageAction) -> Unit,
     actionHandler: (InboxDetailsAction) -> Unit
 ) {
+    val context = LocalContext.current
+    val isTeacherApp = context.packageName.contains("teacher")
+
     val pullToRefreshState = rememberPullRefreshState(refreshing = false, onRefresh = {
         actionHandler(InboxDetailsAction.RefreshCalled)
     })
 
     Box(
         modifier = Modifier
+            .then(
+                if (isTeacherApp) Modifier.windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
+                else Modifier
+            )
             .fillMaxSize()
             .pullRefresh(pullToRefreshState)
             .padding(padding)
@@ -299,6 +306,7 @@ private fun AppBarMenu(
     conversation: Conversation?,
     showDeleteButton: Boolean,
     showReplyAllButton: Boolean,
+    showArchiveOption: Boolean,
     actionHandler: (InboxDetailsAction) -> Unit
 ) {
     var showMenu by rememberSaveable { mutableStateOf(false) }
@@ -381,36 +389,38 @@ private fun AppBarMenu(
                 }
             }
 
-            if (conversation.workflowState != Conversation.WorkflowState.ARCHIVED) {
-                DropdownMenuItem(
-                    onClick = {
-                        showMenu = !showMenu
-                        actionHandler(
-                            InboxDetailsAction.UpdateState(
-                                conversation.id,
-                                Conversation.WorkflowState.ARCHIVED
+            if (showArchiveOption) {
+                if (conversation.workflowState != Conversation.WorkflowState.ARCHIVED) {
+                    DropdownMenuItem(
+                        onClick = {
+                            showMenu = !showMenu
+                            actionHandler(
+                                InboxDetailsAction.UpdateState(
+                                    conversation.id,
+                                    Conversation.WorkflowState.ARCHIVED
+                                )
                             )
-                        )
+                        }
+                    ) {
+                        MessageMenuItem(R.drawable.ic_archive, stringResource(id = R.string.archive))
                     }
-                ) {
-                    MessageMenuItem(R.drawable.ic_archive, stringResource(id = R.string.archive))
-                }
-            } else {
-                DropdownMenuItem(
-                    onClick = {
-                        showMenu = !showMenu
-                        actionHandler(
-                            InboxDetailsAction.UpdateState(
-                                conversation.id,
-                                Conversation.WorkflowState.READ
+                } else {
+                    DropdownMenuItem(
+                        onClick = {
+                            showMenu = !showMenu
+                            actionHandler(
+                                InboxDetailsAction.UpdateState(
+                                    conversation.id,
+                                    Conversation.WorkflowState.READ
+                                )
                             )
+                        }
+                    ) {
+                        MessageMenuItem(
+                            R.drawable.ic_unarchive,
+                            stringResource(id = R.string.unarchive)
                         )
                     }
-                ) {
-                    MessageMenuItem(
-                        R.drawable.ic_unarchive,
-                        stringResource(id = R.string.unarchive)
-                    )
                 }
             }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/InboxFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/InboxFragment.kt
index 5f4244663a..b745187c49 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/InboxFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/InboxFragment.kt
@@ -64,9 +64,14 @@ import com.instructure.pandautils.features.inbox.utils.InboxSharedAction
 import com.instructure.pandautils.features.inbox.utils.InboxSharedEvents
 import com.instructure.pandautils.interfaces.NavigationCallbacks
 import com.instructure.pandautils.mvvm.ViewState
+import com.instructure.pandautils.utils.AppType
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.addListener
+import com.instructure.pandautils.utils.applyBottomAndRightSystemBarMargin
+import com.instructure.pandautils.utils.applyBottomAndRightSystemBarPadding
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.isTablet
 import com.instructure.pandautils.utils.isVisible
@@ -343,9 +348,22 @@ class InboxFragment : BaseCanvasFragment(), NavigationCallbacks, FragmentInterac
         ViewStyler.themeToolbarColored(requireActivity(), binding.editToolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
         binding.toolbarWrapper.setBackgroundColor(ThemePrefs.primaryColor)
         ViewStyler.themeFAB(binding.addMessage)
+        // Parent app doesn't have bottom navigation on inbox screen, so use margin for positioning
+        // Teacher/Student apps have bottom navigation that handles bottom insets, so use padding
+        if (requireContext().packageName == AppType.PARENT.packageName) {
+            binding.addMessage.applyBottomAndRightSystemBarMargin()
+            // Parent app has no bottom bar, so apply bottom padding to the list
+            binding.inboxRecyclerView.clipToPadding = false
+            binding.inboxRecyclerView.applyBottomSystemBarInsets()
+        } else {
+            binding.addMessage.applyBottomAndRightSystemBarPadding()
+        }
+
         binding.scopeFilterText.setTextColor(ThemePrefs.textButtonColor)
         binding.scopeFilterIcon.setColorFilter(ThemePrefs.textButtonColor)
         inboxRouter.attachNavigationIcon(binding.toolbar)
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.editToolbar.applyTopSystemBarInsets()
     }
 
     override fun getFragment(): Fragment? = this
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/filter/ContextFilterFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/filter/ContextFilterFragment.kt
index 6bf68e14c3..d84df26581 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/filter/ContextFilterFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/inbox/list/filter/ContextFilterFragment.kt
@@ -16,11 +16,14 @@
  */
 package com.instructure.pandautils.features.inbox.list.filter
 
+import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -34,6 +37,8 @@ import com.instructure.pandautils.databinding.FragmentContextFilterBinding
 import com.instructure.pandautils.features.inbox.list.InboxSharedViewModel
 import com.instructure.pandautils.utils.ParcelableArrayListArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.WindowInsetsHelper
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setupAsCloseButton
 import com.instructure.pandautils.utils.withArgs
@@ -55,6 +60,25 @@ class ContextFilterFragment : BaseCanvasBottomSheetDialogFragment() {
 
     override fun isFullScreen() = true
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.setOnShowListener {
+            val bottomSheetDialog = dialog as? BottomSheetDialog ?: return@setOnShowListener
+            // Enable edge-to-edge for the dialog window
+            bottomSheetDialog.window?.let { window ->
+                WindowCompat.setDecorFitsSystemWindows(window, false)
+            }
+            // Disable fitsSystemWindows on the bottom sheet container
+            bottomSheetDialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)?.let { bottomSheet ->
+                bottomSheet.fitsSystemWindows = false
+                ViewCompat.requestApplyInsets(bottomSheet)
+            }
+            // Always use light/white status bar icons regardless of theme for better visibility
+            WindowInsetsHelper.setSystemBarsAppearance(requireActivity().window, false)
+        }
+        return dialog
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         binding = FragmentContextFilterBinding.inflate(inflater, container, false)
         binding.viewModel = viewModel
@@ -77,6 +101,7 @@ class ContextFilterFragment : BaseCanvasBottomSheetDialogFragment() {
         }
 
         ViewStyler.themeToolbarLight(requireActivity(), binding.toolbar)
+        binding.toolbar.applyTopSystemBarInsets()
         setFullScreen()
 
         viewModel.events.observe(viewLifecycleOwner) { event ->
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/lti/LtiLaunchFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/lti/LtiLaunchFragment.kt
index 0e659977ee..ae4c82a840 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/lti/LtiLaunchFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/lti/LtiLaunchFragment.kt
@@ -17,12 +17,16 @@
 package com.instructure.pandautils.features.lti
 
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebView
 import android.widget.Toast
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
@@ -53,6 +57,8 @@ import com.instructure.pandautils.utils.ParcelableArg
 import com.instructure.pandautils.utils.PermissionRequester
 import com.instructure.pandautils.utils.PermissionUtils
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.argsWithContext
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
@@ -104,6 +110,21 @@ class LtiLaunchFragment : BaseCanvasFragment(), NavigationCallbacks {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        view.applyDisplayCutoutInsets()
+
+        binding.toolbar.applyTopSystemBarInsets()
+
+        // Apply bottom insets only in portrait mode to avoid conflict with camera cutout in landscape
+        val isPortrait = resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
+        if (isPortrait) {
+            ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                v.updatePadding(bottom = systemBars.bottom)
+                insets
+            }
+        }
         binding.loadingView.setOverrideColor(ltiLaunchFragmentBehavior.toolbarColor)
         binding.toolName.setTextForVisibility(title.validOrNull())
         binding.toolbar.setupAsBackButton {
@@ -147,7 +168,7 @@ class LtiLaunchFragment : BaseCanvasFragment(), NavigationCallbacks {
             is LtiLaunchAction.LaunchCustomTab -> launchCustomTab(action.url)
             is LtiLaunchAction.ShowError -> {
                 toast(R.string.errorOccurred)
-                if (activity != null) {
+                if (isAdded && !parentFragmentManager.isStateSaved) {
                     requireActivity().onBackPressed()
                 }
             }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/EmailNotificationPreferencesFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/EmailNotificationPreferencesFragment.kt
index 2a5827a9bf..b748bdf6ca 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/EmailNotificationPreferencesFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/EmailNotificationPreferencesFragment.kt
@@ -33,6 +33,9 @@ import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.databinding.FragmentNotificationPreferencesBinding
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -58,6 +61,12 @@ class EmailNotificationPreferencesFragment : BaseCanvasFragment() {
         super.onViewCreated(view, savedInstanceState)
         binding.toolbar.setupAsBackButton { requireActivity().onBackPressed() }
         ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.swipeRefreshLayout.applyBottomSystemBarInsets()
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        binding.root.applyDisplayCutoutInsets()
+
         viewModel.events.observe(viewLifecycleOwner) { event ->
             event.getContentIfNotHandled()?.let {
                 handleAction(it)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/PushNotificationPreferencesFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/PushNotificationPreferencesFragment.kt
index aa9b240fd9..ab0d4f5254 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/PushNotificationPreferencesFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/notification/preferences/PushNotificationPreferencesFragment.kt
@@ -30,6 +30,9 @@ import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.databinding.FragmentNotificationPreferencesBinding
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -55,6 +58,12 @@ class PushNotificationPreferencesFragment : BaseCanvasFragment() {
         super.onViewCreated(view, savedInstanceState)
         binding.toolbar.setupAsBackButton { requireActivity().onBackPressed() }
         ViewStyler.themeToolbarColored(requireActivity(), binding.toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.swipeRefreshLayout.applyBottomSystemBarInsets()
+
+        // Apply display cutout insets to root view to prevent content from extending behind camera cutout
+        binding.root.applyDisplayCutoutInsets()
+
         viewModel.events.observe(viewLifecycleOwner) { event ->
             event.getContentIfNotHandled()?.let {
                 handleAction(it)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/offlinecontent/OfflineContentFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/offlinecontent/OfflineContentFragment.kt
index aa862cbbc9..653a8497b5 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/offlinecontent/OfflineContentFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/offlinecontent/OfflineContentFragment.kt
@@ -24,6 +24,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import com.instructure.canvasapi2.models.CanvasContext
@@ -38,6 +40,7 @@ import com.instructure.pandautils.utils.NullableParcelableArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.announceAccessibilityText
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.argsWithContext
 import com.instructure.pandautils.utils.items
 import com.instructure.pandautils.utils.setMenu
@@ -134,11 +137,20 @@ class OfflineContentFragment : BaseCanvasFragment(), FragmentInteractions {
             setMenu(R.menu.menu_offline_content) {
                 viewModel.toggleSelection()
             }
+            applyTopSystemBarInsets()
         }
 
         viewModel.data.value?.let { data ->
             updateMenuText(data.selectedCount)
         }
+
+        ViewCompat.setOnApplyWindowInsetsListener(binding.syncButton) { view, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val layoutParams = view.layoutParams as? ViewGroup.MarginLayoutParams
+            layoutParams?.bottomMargin = systemBars.bottom
+            view.layoutParams = layoutParams
+            insets
+        }
     }
 
     override fun getFragment(): Fragment = this
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/AggregateProgressObserver.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/AggregateProgressObserver.kt
index ab487fba23..c447b06f98 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/AggregateProgressObserver.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/AggregateProgressObserver.kt
@@ -19,10 +19,8 @@
 package com.instructure.pandautils.features.offline.sync
 
 import android.content.Context
-import androidx.annotation.MainThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.instructure.canvasapi2.utils.NumberHelper
 import com.instructure.pandautils.R
@@ -34,6 +32,7 @@ import com.instructure.pandautils.room.offline.entities.FileSyncProgressEntity
 import com.instructure.pandautils.room.offline.entities.StudioMediaProgressEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.launch
 
 class AggregateProgressObserver(
@@ -48,56 +47,45 @@ class AggregateProgressObserver(
         get() = _progressData
     private val _progressData = MutableLiveData<AggregateProgressViewData?>()
 
-    private var courseProgressLiveData: LiveData<List<CourseSyncProgressEntity>>? = null
-    private var fileProgressLiveData: LiveData<List<FileSyncProgressEntity>>? = null
-    private var studioMediaProgressLiveData: LiveData<List<StudioMediaProgressEntity>>? = null
-
     private var courseProgresses = mutableMapOf<Long, CourseSyncProgressEntity>()
     private var fileProgresses = mutableMapOf<Long, FileSyncProgressEntity>()
     private var studioMediaProgresses = mutableListOf<StudioMediaProgressEntity>()
 
-    private val courseProgressObserver = Observer<List<CourseSyncProgressEntity>> {
-        courseProgresses = it.associateBy { it.courseId }.toMutableMap()
-
-        calculateProgress()
-    }
-
-    private val fileProgressObserver = Observer<List<FileSyncProgressEntity>> {
-        fileProgresses = it.associateBy { it.fileId }.toMutableMap()
-
-        calculateProgress()
-    }
-
-    private val studioMediaProgressObserver = Observer<List<StudioMediaProgressEntity>> {
-        studioMediaProgresses = it.toMutableList()
-        calculateProgress()
-    }
-
     init {
         GlobalScope.launch(Dispatchers.Main) {
-            courseProgressLiveData = try {
-                courseSyncProgressDao.findAllLiveData()
-            } catch (e: Exception) {
-                firebaseCrashlytics.recordException(e)
-                null
-            }
-            courseProgressLiveData?.observeForever(courseProgressObserver)
+            courseSyncProgressDao.findAllFlow()
+                .catch { e ->
+                    firebaseCrashlytics.recordException(e)
+                    emit(emptyList())
+                }
+                .collect { entities ->
+                    courseProgresses = entities.associateBy { it.courseId }.toMutableMap()
+                    calculateProgress()
+                }
+        }
 
-            fileProgressLiveData = try {
-                fileSyncProgressDao.findAllLiveData()
-            } catch (e: Exception) {
-                firebaseCrashlytics.recordException(e)
-                null
-            }
-            fileProgressLiveData?.observeForever(fileProgressObserver)
+        GlobalScope.launch(Dispatchers.Main) {
+            fileSyncProgressDao.findAllFlow()
+                .catch { e ->
+                    firebaseCrashlytics.recordException(e)
+                    emit(emptyList())
+                }
+                .collect { entities ->
+                    fileProgresses = entities.associateBy { it.fileId }.toMutableMap()
+                    calculateProgress()
+                }
+        }
 
-            studioMediaProgressLiveData = try {
-                studioMediaProgressDao.findAllLiveData()
-            } catch (e: Exception) {
-                firebaseCrashlytics.recordException(e)
-                null
-            }
-            studioMediaProgressLiveData?.observeForever(studioMediaProgressObserver)
+        GlobalScope.launch(Dispatchers.Main) {
+            studioMediaProgressDao.findAllFlow()
+                .catch { e ->
+                    firebaseCrashlytics.recordException(e)
+                    emit(emptyList())
+                }
+                .collect { entities ->
+                    studioMediaProgresses = entities.toMutableList()
+                    calculateProgress()
+                }
         }
     }
 
@@ -164,13 +152,6 @@ class AggregateProgressObserver(
 
         _progressData.postValue(viewData)
     }
-
-    @MainThread
-    fun onCleared() {
-        courseProgressLiveData?.removeObserver(courseProgressObserver)
-        fileProgressLiveData?.removeObserver(fileProgressObserver)
-        studioMediaProgressLiveData?.removeObserver(studioMediaProgressObserver)
-    }
 }
 
 data class AggregateProgressViewData(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/CourseSync.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/CourseSync.kt
index b7a1f839a2..3c7a78af9b 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/CourseSync.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/CourseSync.kt
@@ -573,6 +573,7 @@ class CourseSync(
                     ModuleItem.Type.Page.name -> fetchPageModuleItem(courseId, it, params)
                     ModuleItem.Type.File.name -> fetchFileModuleItem(courseId, it, params, courseSettings)
                     ModuleItem.Type.Quiz.name -> fetchQuizModuleItem(courseId, it, params)
+                    ModuleItem.Type.ExternalTool.name -> processExternalToolModuleItem(it)
                 }
             }
 
@@ -663,6 +664,17 @@ class CourseSync(
         }
     }
 
+    private fun processExternalToolModuleItem(moduleItem: ModuleItem) {
+        val externalUrl = moduleItem.externalUrl ?: return
+        val mediaId = extractStudioMediaId(externalUrl) ?: return
+        studioMediaIdsToSync.add(mediaId)
+    }
+
+    private fun extractStudioMediaId(url: String): String? {
+        val regex = Regex("[?&]custom_arc_media_id=([^&]+)")
+        return regex.find(url)?.groupValues?.get(1)
+    }
+
     private suspend fun parseHtmlContent(htmlContent: String?, courseId: Long): String? {
         val htmlParsingResult = htmlParser.createHtmlStringWithLocalFiles(htmlContent, courseId, studioMetadata)
         additionalFileIdsToSync[courseId]?.let {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/OfflineSyncWorker.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/OfflineSyncWorker.kt
index c9e647665d..5bdb92cbed 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/OfflineSyncWorker.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/OfflineSyncWorker.kt
@@ -173,7 +173,6 @@ class OfflineSyncWorker @AssistedInject constructor(
 
         withContext(Dispatchers.Main) {
             aggregateProgressObserver.progressData.removeObserver(progressObserver)
-            aggregateProgressObserver.onCleared()
         }
 
         if (courseProgresses.isNotEmpty() && fileProgresses.isNotEmpty()) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/StudioOfflineVideoHelper.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/StudioOfflineVideoHelper.kt
new file mode 100644
index 0000000000..27b6f4db3e
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/StudioOfflineVideoHelper.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *
+ */
+
+package com.instructure.pandautils.features.offline.sync
+
+import android.content.Context
+import com.instructure.canvasapi2.utils.ApiPrefs
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StudioOfflineVideoHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val apiPrefs: ApiPrefs
+) {
+    private val studioMediaIdRegex = Regex("[?&]custom_arc_media_id=([^&]+)")
+
+    fun getStudioMediaId(externalUrl: String?): String? =
+        externalUrl?.let { studioMediaIdRegex.find(it)?.groupValues?.get(1) }
+
+    fun isStudioVideoAvailableOffline(mediaId: String): Boolean =
+        getStudioVideoFile(mediaId).exists()
+
+    fun getStudioVideoUri(mediaId: String): String =
+        "file://${getStudioVideoFile(mediaId).absolutePath}"
+
+    fun getStudioPosterUri(mediaId: String): String? {
+        val poster = File(getStudioVideoDir(mediaId), "poster.jpg")
+        return if (poster.exists()) "file://${poster.absolutePath}" else null
+    }
+
+    private fun getStudioVideoDir(ltiLaunchId: String): File {
+        val userDir = File(context.filesDir, apiPrefs.user?.id.toString())
+        return File(File(userDir, "studio"), ltiLaunchId)
+    }
+
+    private fun getStudioVideoFile(ltiLaunchId: String): File =
+        File(getStudioVideoDir(ltiLaunchId), "$ltiLaunchId.mp4")
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressFragment.kt
index 43a8afabb6..e7a02403c9 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressFragment.kt
@@ -31,6 +31,8 @@ import com.instructure.pandautils.databinding.FragmentSyncProgressBinding
 import com.instructure.pandautils.features.offline.sync.ProgressState
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applySystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.items
 import com.instructure.pandautils.utils.setMenu
 import com.instructure.pandautils.utils.setupAsBackButton
@@ -81,6 +83,8 @@ class SyncProgressFragment : BaseCanvasFragment() {
     }
 
     private fun applyTheme() {
+        binding.toolbar.applyTopSystemBarInsets()
+        binding.recyclerView.applySystemBarInsets(bottom = true)
         ViewStyler.themeToolbarColored(
             requireActivity(),
             binding.toolbar,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressViewModel.kt
index ff46c5cd24..ea6c8c078a 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/progress/SyncProgressViewModel.kt
@@ -149,7 +149,6 @@ class SyncProgressViewModel @Inject constructor(
 
     override fun onCleared() {
         super.onCleared()
-        aggregateProgressObserver.onCleared()
         _data.value?.items?.forEach { it.onCleared() }
     }
 }
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/settings/SyncSettingsFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/settings/SyncSettingsFragment.kt
index f2386ed014..13204a94b7 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/settings/SyncSettingsFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/offline/sync/settings/SyncSettingsFragment.kt
@@ -24,15 +24,17 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
-import com.instructure.pandautils.base.BaseCanvasFragment
 import androidx.fragment.app.viewModels
 import com.instructure.interactions.FragmentInteractions
 import com.instructure.interactions.Navigation
 import com.instructure.pandautils.R
+import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.databinding.FragmentSyncSettingsBinding
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.pandautils.utils.showThemed
 import dagger.hilt.android.AndroidEntryPoint
@@ -120,6 +122,9 @@ class SyncSettingsFragment : BaseCanvasFragment(), FragmentInteractions {
         )
 
         binding.toolbar.setupAsBackButton(this@SyncSettingsFragment)
+        binding.toolbar.applyTopSystemBarInsets()
+
+        view?.findViewById<View>(R.id.scrollView)?.applyBottomSystemBarInsets()
     }
 
     override fun getFragment(): Fragment = this
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/progress/composables/ProgressScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/progress/composables/ProgressScreen.kt
index aa0b43c28f..f6e05e9c4e 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/progress/composables/ProgressScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/progress/composables/ProgressScreen.kt
@@ -21,6 +21,7 @@ package com.instructure.pandautils.features.progress.composables
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -66,6 +67,7 @@ fun ProgressScreen(
         Scaffold(
             modifier = Modifier.clip(RoundedCornerShape(topStart = 8.dp, topEnd = 8.dp)),
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             topBar = {
                 ProgressTopBar(
                     title = progressUiState.title,
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/SettingsScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/SettingsScreen.kt
index 486007a89c..1759ee6575 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/SettingsScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/SettingsScreen.kt
@@ -27,18 +27,22 @@ import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Divider
 import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -70,6 +74,7 @@ import androidx.compose.ui.unit.sp
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.LabelValueSwitch
 import com.instructure.pandautils.compose.composables.LabelValueVerticalItem
@@ -84,7 +89,7 @@ fun SettingsScreen(
     navigationActionClick: () -> Unit
 ) {
     CanvasTheme {
-        Scaffold(
+        CanvasScaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
             topBar = {
                 CanvasThemedAppBar(
@@ -93,7 +98,8 @@ fun SettingsScreen(
                         navigationActionClick()
                     }
                 )
-            }) { padding ->
+            }
+        ) { padding ->
             if (uiState.loading) {
                 Loading(modifier = Modifier.fillMaxSize())
             } else {
@@ -114,6 +120,7 @@ private fun SettingsContent(uiState: SettingsUiState, modifier: Modifier = Modif
     }
     LazyColumn(
         modifier = modifier
+            .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
             .fillMaxSize()
             .scrollable(state = scrollState, orientation = Orientation.Vertical)
             .testTag("settingsList")
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/inboxsignature/InboxSignatureScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/inboxsignature/InboxSignatureScreen.kt
index 4ab51d32d5..fedff64935 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/inboxsignature/InboxSignatureScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/settings/inboxsignature/InboxSignatureScreen.kt
@@ -17,10 +17,18 @@ package com.instructure.pandautils.features.settings.inboxsignature
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.CircularProgressIndicator
@@ -57,6 +65,7 @@ fun InboxSignatureScreen(uiState: InboxSignatureUiState, actionHandler: (InboxSi
     CanvasTheme {
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets.ime.union(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom)),
             topBar = {
                 CanvasThemedAppBar(
                     title = stringResource(id = R.string.inboxSignatureScreenTitle),
@@ -94,6 +103,7 @@ fun InboxSignatureScreen(uiState: InboxSignatureUiState, actionHandler: (InboxSi
 fun InboxSignatureContent(uiState: InboxSignatureUiState, actionHandler: (InboxSignatureAction) -> Unit, modifier: Modifier = Modifier) {
     Column(
         modifier
+            .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
             .fillMaxSize()
             .verticalScroll(rememberScrollState())) {
         Spacer(modifier = Modifier.size(16.dp))
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchFragment.kt
index d549dd5117..8dcef085aa 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchFragment.kt
@@ -61,6 +61,11 @@ class SmartSearchFragment : BaseCanvasFragment() {
         super.onActivityCreated(savedInstanceState)
         ThemePrefs.reapplyCanvasTheme(requireActivity())
         ViewStyler.setStatusBarDark(requireActivity(), canvasContext.color)
+        // Clear any window dim that might be left from previous screen's search bar
+        requireActivity().window.clearFlags(android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+        requireActivity().window.attributes = requireActivity().window.attributes.apply {
+            dimAmount = 0f
+        }
     }
 
     override fun onCreateView(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchPreferencesScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchPreferencesScreen.kt
index 0960d89f57..dbb9b90a66 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchPreferencesScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchPreferencesScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -36,7 +37,6 @@ import androidx.compose.material.CheckboxDefaults
 import androidx.compose.material.Icon
 import androidx.compose.material.RadioButton
 import androidx.compose.material.RadioButtonDefaults
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
@@ -58,7 +58,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.instructure.canvasapi2.models.SmartSearchFilter
 import com.instructure.pandautils.R
-import com.instructure.pandautils.compose.composables.CanvasAppBar
+import com.instructure.pandautils.compose.composables.CanvasScaffold
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.FullScreenDialog
 
 enum class SmartSearchSortType {
@@ -77,11 +78,12 @@ fun SmartSearchPreferencesScreen(
     val selectedTypes = remember { filters.toMutableStateList() }
     var selectedSort by remember { mutableStateOf(sortType) }
     FullScreenDialog(onDismissRequest = onCancel) {
-        Scaffold(
+        CanvasScaffold(
+            contentWindowInsets = WindowInsets(0),
             topBar = {
-                CanvasAppBar(
+                CanvasThemedAppBar(
                     backgroundColor = color,
-                    textColor = colorResource(R.color.textLightest),
+                    contentColor = colorResource(R.color.textLightest),
                     title = stringResource(R.string.searchPreferencesTitle),
                     navigationActionClick = onCancel,
                     actions = {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchScreen.kt
index e38910f61e..ab7628d6ea 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/smartsearch/SmartSearchScreen.kt
@@ -39,9 +39,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Card
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -67,6 +65,8 @@ import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.CanvasDivider
+import com.instructure.pandautils.compose.composables.CanvasScaffold
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.EmptyContent
 import com.instructure.pandautils.compose.composables.ErrorContent
 import com.instructure.pandautils.compose.composables.Loading
@@ -112,20 +112,15 @@ private fun SmartSearchScreenContent(
     navigationItemClick: () -> Unit,
     onFilterClick: () -> Unit
 ) {
-    Scaffold(
+    CanvasScaffold(
         topBar = {
-            TopAppBar(
+            CanvasThemedAppBar(
                 backgroundColor = Color(uiState.canvasContext.color),
-                navigationIcon = {
-                    IconButton(onClick = { navigationItemClick() }) {
-                        Icon(
-                            painterResource(id = R.drawable.ic_back_arrow),
-                            contentDescription = stringResource(R.string.contentDescription_back),
-                            tint = colorResource(R.color.textLightest)
-                        )
-                    }
-                },
-                title = {
+                navIconRes = R.drawable.ic_back_arrow,
+                navIconContentDescription = stringResource(R.string.contentDescription_back),
+                navigationActionClick = navigationItemClick,
+                contentColor = colorResource(R.color.textLightest),
+                content = {
                     SearchBar(
                         modifier = Modifier.testTag("searchBar"),
                         icon = R.drawable.ic_smart_search,
@@ -194,8 +189,8 @@ private fun SmartSearchScreenContent(
                     modifier = Modifier
                         .testTag("results")
                         .fillMaxSize()
-                        .padding(padding)
                         .background(colorResource(R.color.backgroundLightest))
+                        .padding(padding)
                 ) {
                     item {
                         CourseHeader(uiState.canvasContext.name.orEmpty())
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/SpeedGraderScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/SpeedGraderScreen.kt
index 1f4ef75f47..b4da867567 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/SpeedGraderScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/SpeedGraderScreen.kt
@@ -18,15 +18,16 @@ package com.instructure.pandautils.features.speedgrader
 
 import android.view.WindowManager
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.ime
-import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Snackbar
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
@@ -53,7 +54,8 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.LocalCourseColor
-import com.instructure.pandautils.compose.composables.CanvasAppBar
+import com.instructure.pandautils.compose.composables.CanvasScaffold
+import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.Loading
 import com.instructure.pandautils.utils.getFragmentActivity
 import kotlinx.coroutines.launch
@@ -107,7 +109,8 @@ fun SpeedGraderScreen(
         }
     }
 
-    Scaffold(
+    CanvasScaffold(
+        backgroundColor = colorResource(id = R.color.backgroundLightest),
         snackbarHost = {
             SnackbarHost(snackbarHostState) { data ->
                 Snackbar(
@@ -117,13 +120,13 @@ fun SpeedGraderScreen(
             }
         },
         topBar = {
-            CanvasAppBar(
+            CanvasThemedAppBar(
                 title = uiState.assignmentName,
                 subtitle = uiState.courseName,
                 backgroundColor = LocalCourseColor.current,
                 navigationActionClick = navigationActionClick,
                 navIconRes = R.drawable.ic_back_arrow,
-                textColor = colorResource(id = R.color.textLightest),
+                contentColor = colorResource(id = R.color.textLightest),
                 modifier = Modifier.testTag("speedGraderAppBar"),
                 actions = {
                     IconButton(onClick = {
@@ -137,9 +140,7 @@ fun SpeedGraderScreen(
                     }
                 }
             )
-        },
-        modifier = Modifier.imePadding(),
-        contentWindowInsets = WindowInsets.ime
+        }
     ) { padding ->
         when {
             uiState.loading -> {
@@ -153,7 +154,10 @@ fun SpeedGraderScreen(
                 )
 
                 HorizontalPager(
-                    modifier = Modifier.padding(padding),
+                    modifier = Modifier
+                        .windowInsetsPadding(WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal))
+                        .padding(padding)
+                        .testTag("speedGraderPager"),
                     state = pagerState,
                     userScrollEnabled = viewPagerEnabled
                 ) { page ->
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/content/SpeedGraderContentScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/content/SpeedGraderContentScreen.kt
index 4a72d8997b..d71689bdfc 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/content/SpeedGraderContentScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/content/SpeedGraderContentScreen.kt
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -43,7 +44,6 @@ import androidx.compose.material3.ExposedDropdownMenuAnchorType
 import androidx.compose.material3.ExposedDropdownMenuBox
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.VerticalDivider
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
@@ -82,6 +82,7 @@ import com.instructure.canvasapi2.utils.DateHelper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.LocalCourseColor
 import com.instructure.pandautils.compose.composables.CanvasDivider
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.SimpleAlertDialog
 import com.instructure.pandautils.compose.composables.SubmissionStateLabel
 import com.instructure.pandautils.compose.composables.UserAvatar
@@ -128,11 +129,12 @@ private fun SpeedGraderContentScreen(
     onExpandClick: (() -> Unit)?,
     toggleViewPager: (Boolean) -> Unit
 ) {
-    Scaffold(
-        containerColor = colorResource(id = R.color.backgroundLightest),
-        modifier = Modifier.fillMaxSize()
-    ) {
-        Column(Modifier.padding(it)) {
+    CanvasScaffold(
+        backgroundColor = colorResource(id = R.color.backgroundLightest),
+        modifier = Modifier.fillMaxSize(),
+        contentWindowInsets = WindowInsets(0, 0, 0, 0)
+    ) { paddingValues ->
+        Column(modifier = Modifier.padding(paddingValues)) {
             UserHeader(
                 userUrl = uiState.userUrl,
                 userName = uiState.userName,
@@ -237,7 +239,8 @@ private fun UserHeader(
                 fontWeight = FontWeight.SemiBold,
                 fontSize = 16.sp,
                 maxLines = 2,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.testTag("speedGraderUserName")
             )
             if (submissionStatus != SubmissionStateLabel.None) {
                 SubmissionStatus(
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/comments/commentlibrary/SpeedGraderCommentLibraryScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/comments/commentlibrary/SpeedGraderCommentLibraryScreen.kt
index 4fb0695c90..68fdafcd50 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/comments/commentlibrary/SpeedGraderCommentLibraryScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/comments/commentlibrary/SpeedGraderCommentLibraryScreen.kt
@@ -21,8 +21,10 @@ import android.net.Uri
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -105,6 +107,7 @@ private fun SpeedGraderCommentLibraryScreen(
 ) {
     Scaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
+        contentWindowInsets = WindowInsets.ime,
         topBar = {
             CanvasThemedAppBar(
                 title = stringResource(id = R.string.toolbarCommentLibrary),
@@ -148,7 +151,7 @@ private fun SpeedGraderCommentLibraryContent(
         } else {
             LazyColumn(
                 contentPadding = PaddingValues(horizontal = 16.dp),
-                modifier = modifier
+                modifier = Modifier
                     .weight(1f)
                     .fillMaxWidth()
                     .testTag("commentLibraryListColumn"),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/grading/SpeedGraderGradingScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/grading/SpeedGraderGradingScreen.kt
index 692a3c16dc..41fc2ca9da 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/grading/SpeedGraderGradingScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/grade/grading/SpeedGraderGradingScreen.kt
@@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.text.KeyboardOptions
@@ -123,7 +122,6 @@ fun SpeedGraderGradingContent(uiState: SpeedGraderGradingUiState) {
         else -> {
             Column(
                 modifier = Modifier
-                    .imePadding()
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp, vertical = 12.dp)
             ) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListFragment.kt
index f1a255b00c..70634d8f8e 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListFragment.kt
@@ -73,7 +73,7 @@ class ToDoListFragment : BaseCanvasFragment(), FragmentInteractions, NavigationC
     override val navigation: Navigation?
         get() = activity as? Navigation
 
-    override fun title(): String = getString(R.string.Todo)
+    override fun title(): String = getString(R.string.TodoNew)
 
     override fun applyTheme() {
         ViewStyler.setStatusBarDark(requireActivity(), ThemePrefs.primaryColor)
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListScreen.kt
index 4350da21ac..3a780a8493 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/ToDoListScreen.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -37,7 +38,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
-import androidx.compose.material.Scaffold
 import androidx.compose.material.Snackbar
 import androidx.compose.material.SnackbarDuration
 import androidx.compose.material.SnackbarHost
@@ -88,6 +88,7 @@ import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.CanvasDivider
+import com.instructure.pandautils.compose.composables.CanvasScaffold
 import com.instructure.pandautils.compose.composables.CanvasThemedAppBar
 import com.instructure.pandautils.compose.composables.EmptyContent
 import com.instructure.pandautils.compose.composables.ErrorContent
@@ -179,11 +180,11 @@ fun ToDoListScreen(
         onRefresh = uiState.onRefresh
     )
 
-    Scaffold(
+    CanvasScaffold(
         backgroundColor = colorResource(R.color.backgroundLightest),
         topBar = {
             CanvasThemedAppBar(
-                title = stringResource(id = R.string.Todo),
+                title = stringResource(id = R.string.TodoNew),
                 navIconRes = R.drawable.ic_hamburger,
                 navIconContentDescription = stringResource(id = R.string.navigation_drawer_open),
                 navigationActionClick = navigationIconClick,
@@ -207,6 +208,7 @@ fun ToDoListScreen(
                 )
             }
         },
+        contentWindowInsets = WindowInsets(0, 0, 0, 0),
         modifier = modifier
     ) { padding ->
         Box(
@@ -287,7 +289,7 @@ internal fun ToDoListContent(
 
         filteredItemsByDate.isEmpty() -> {
             EmptyContent(
-                emptyTitle = stringResource(id = R.string.noToDosForNow),
+                emptyTitle = stringResource(id = R.string.noToDosForNowNew),
                 emptyMessage = stringResource(id = R.string.noToDosForNowSubtext),
                 imageRes = R.drawable.ic_no_events,
                 modifier = modifier
@@ -526,7 +528,8 @@ private fun DateBadge(
             fontSize = 12.sp,
             color = dateBadgeData.dateTextColor,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.testTag("dateBadgeDayOfWeek")
         )
         Box(
             contentAlignment = Alignment.Center,
@@ -542,7 +545,8 @@ private fun DateBadge(
                 text = dateBadgeData.day.toString(),
                 fontSize = 12.sp,
                 fontWeight = FontWeight.Bold,
-                color = dateBadgeData.dateTextColor
+                color = dateBadgeData.dateTextColor,
+                modifier = Modifier.testTag("dateBadgeDay")
             )
         }
         Text(
@@ -550,7 +554,8 @@ private fun DateBadge(
             fontSize = 10.sp,
             color = dateBadgeData.dateTextColor,
             maxLines = 1,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.testTag("dateBadgeMonth")
         )
     }
 }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreen.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreen.kt
index 43182ee86f..9bd2d80831 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreen.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterScreen.kt
@@ -17,11 +17,15 @@ package com.instructure.pandautils.features.todolist.filter
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -78,7 +82,7 @@ fun ToDoFilterScreen(
         backgroundColor = colorResource(R.color.backgroundLightest),
         topBar = {
             CanvasThemedAppBar(
-                title = stringResource(id = R.string.todoFilterPreferences),
+                title = stringResource(id = R.string.todoFilterPreferencesNew),
                 navIconRes = R.drawable.ic_close,
                 navIconContentDescription = stringResource(id = R.string.close),
                 navigationActionClick = onDismiss,
@@ -113,7 +117,11 @@ fun ToDoFilterContent(
     uiState: ToDoFilterUiState,
     modifier: Modifier = Modifier
 ) {
-    LazyColumn(modifier = modifier.testTag("ToDoFilterContent")) {
+    val navigationBarPadding = WindowInsets.navigationBars.asPaddingValues()
+    LazyColumn(
+        modifier = modifier.testTag("ToDoFilterContent"),
+        contentPadding = PaddingValues(bottom = navigationBarPadding.calculateBottomPadding())
+    ) {
         item {
             SectionHeader(title = stringResource(id = R.string.todoFilterVisibleItems))
         }
@@ -285,7 +293,7 @@ fun ToDoFilterScreenPreview() {
             uiState = ToDoFilterUiState(
                 checkboxItems = listOf(
                     FilterCheckboxItem(
-                        titleRes = R.string.todoFilterShowPersonalToDos,
+                        titleRes = R.string.todoFilterShowPersonalToDosNew,
                         checked = false,
                         onToggle = {}
                     ),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterViewModel.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterViewModel.kt
index fd2d672278..8516aaed55 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterViewModel.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/features/todolist/filter/ToDoFilterViewModel.kt
@@ -107,7 +107,7 @@ class ToDoFilterViewModel @Inject constructor(
     private fun createCheckboxItems(): List<FilterCheckboxItem> {
         return listOf(
             FilterCheckboxItem(
-                titleRes = R.string.todoFilterShowPersonalToDos,
+                titleRes = R.string.todoFilterShowPersonalToDosNew,
                 checked = checkboxStates[FILTER_PERSONAL_TODOS] ?: false,
                 onToggle = { handleCheckboxToggle(FILTER_PERSONAL_TODOS, it) }
             ),
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/HtmlContentFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/HtmlContentFragment.kt
index cf0f4f63ad..249a62188a 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/HtmlContentFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/HtmlContentFragment.kt
@@ -29,6 +29,8 @@ import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.StringArg
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsCloseButton
 import com.instructure.pandautils.views.CanvasWebView
 import dagger.hilt.android.AndroidEntryPoint
@@ -56,10 +58,12 @@ class HtmlContentFragment : BaseCanvasFragment() {
         setupToolbar()
         setupWebView(binding.canvasWebViewWrapper.webView)
 
+        binding.canvasWebViewWrapper.applyBottomSystemBarInsets()
         binding.canvasWebViewWrapper.loadHtml(html, title)
     }
 
     private fun setupToolbar() {
+        binding.toolbar.applyTopSystemBarInsets()
         binding.toolbar.title = title
         binding.toolbar.setupAsCloseButton(this)
         if (darkToolbar) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/RemoteConfigParamsFragment.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/RemoteConfigParamsFragment.kt
index 3b05eafa99..4f34031812 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/RemoteConfigParamsFragment.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/fragments/RemoteConfigParamsFragment.kt
@@ -29,11 +29,16 @@ import androidx.recyclerview.widget.RecyclerView
 import com.instructure.canvasapi2.utils.RemoteConfigParam
 import com.instructure.canvasapi2.utils.RemoteConfigPrefs
 import com.instructure.pandautils.R
+import com.instructure.pandautils.base.AppConfigProvider
 import com.instructure.pandautils.base.BaseCanvasFragment
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.databinding.FragmentRemoteConfigParamsBinding
+import com.instructure.pandautils.utils.AppType
 import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyImeAndSystemBarInsets
+import com.instructure.pandautils.utils.applyDisplayCutoutInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -51,6 +56,18 @@ class RemoteConfigParamsFragment : BaseCanvasFragment() {
         toolbar.setupAsBackButton { requireActivity().onBackPressed() }
         ViewStyler.themeToolbarColored(requireActivity(), toolbar, ThemePrefs.primaryColor, ThemePrefs.primaryTextColor)
         recyclerView.adapter = RemoteConfigParamAdapter()
+        setupWindowInsets()
+    }
+
+    private fun setupWindowInsets() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
+
+        // Apply display cutout insets only in Teacher app where Activity-level handling doesn't cover all containers
+        if (AppConfigProvider.appConfig?.appType == AppType.TEACHER) {
+            remoteConfigSettingsFragment.applyDisplayCutoutInsets()
+        }
+
+        recyclerView.applyImeAndSystemBarInsets()
     }
 }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDao.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDao.kt
index 9026a2722c..7416396c77 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDao.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/CourseSyncProgressDao.kt
@@ -24,6 +24,7 @@ import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
 import com.instructure.pandautils.room.offline.entities.CourseSyncProgressEntity
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface CourseSyncProgressDao {
@@ -43,6 +44,9 @@ interface CourseSyncProgressDao {
     @Query("SELECT * FROM CourseSyncProgressEntity")
     fun findAllLiveData(): LiveData<List<CourseSyncProgressEntity>>
 
+    @Query("SELECT * FROM CourseSyncProgressEntity")
+    fun findAllFlow(): Flow<List<CourseSyncProgressEntity>>
+
     @Query("SELECT * FROM CourseSyncProgressEntity WHERE courseId = :courseId")
     suspend fun findByCourseId(courseId: Long): CourseSyncProgressEntity?
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDao.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDao.kt
index 09a8b008e7..53deec346f 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDao.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/FileSyncProgressDao.kt
@@ -24,6 +24,7 @@ import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
 import com.instructure.pandautils.room.offline.entities.FileSyncProgressEntity
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface FileSyncProgressDao {
@@ -61,6 +62,9 @@ interface FileSyncProgressDao {
     @Query("SELECT * FROM FileSyncProgressEntity")
     fun findAllLiveData(): LiveData<List<FileSyncProgressEntity>>
 
+    @Query("SELECT * FROM FileSyncProgressEntity")
+    fun findAllFlow(): Flow<List<FileSyncProgressEntity>>
+
     @Query("SELECT * FROM FileSyncProgressEntity")
     suspend fun findAll(): List<FileSyncProgressEntity>
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDao.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDao.kt
index 1906415db5..9726b12a3d 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDao.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/room/offline/daos/StudioMediaProgressDao.kt
@@ -21,6 +21,7 @@ import androidx.room.Insert
 import androidx.room.Query
 import androidx.room.Update
 import com.instructure.pandautils.room.offline.entities.StudioMediaProgressEntity
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface StudioMediaProgressDao {
@@ -43,6 +44,9 @@ interface StudioMediaProgressDao {
     @Query("SELECT * FROM StudioMediaProgressEntity")
     fun findAllLiveData(): LiveData<List<StudioMediaProgressEntity>>
 
+    @Query("SELECT * FROM StudioMediaProgressEntity")
+    fun findAllFlow(): Flow<List<StudioMediaProgressEntity>>
+
     @Query("DELETE FROM StudioMediaProgressEntity")
     suspend fun deleteAll()
 }
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/EdgeToEdgeHelper.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/EdgeToEdgeHelper.kt
new file mode 100644
index 0000000000..c675311749
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/EdgeToEdgeHelper.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2025 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.instructure.pandautils.utils
+
+import android.app.Activity
+import android.os.Build
+import android.view.Window
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
+import androidx.annotation.ColorInt
+import androidx.core.view.WindowCompat
+
+object EdgeToEdgeHelper {
+
+    fun enableEdgeToEdge(
+        activity: Activity,
+        statusBarStyle: SystemBarStyle? = null,
+        navigationBarStyle: SystemBarStyle? = null
+    ) {
+        if (!isEdgeToEdgeEnforced()) return
+        when (activity) {
+            is ComponentActivity -> {
+                if (statusBarStyle != null && navigationBarStyle != null) {
+                    activity.enableEdgeToEdge(statusBarStyle, navigationBarStyle)
+                } else {
+                    activity.enableEdgeToEdge()
+                }
+            }
+            else -> {
+                WindowCompat.setDecorFitsSystemWindows(activity.window, false)
+            }
+        }
+    }
+
+    fun enableEdgeToEdge(
+        activity: Activity,
+        lightStatusBar: Boolean,
+        lightNavigationBar: Boolean
+    ) {
+        val statusBarStyle = if (lightStatusBar) {
+            SystemBarStyle.light(
+                android.graphics.Color.TRANSPARENT,
+                android.graphics.Color.TRANSPARENT
+            )
+        } else {
+            SystemBarStyle.dark(android.graphics.Color.TRANSPARENT)
+        }
+
+        val navigationBarStyle = if (lightNavigationBar) {
+            SystemBarStyle.light(
+                android.graphics.Color.TRANSPARENT,
+                android.graphics.Color.TRANSPARENT
+            )
+        } else {
+            SystemBarStyle.dark(android.graphics.Color.TRANSPARENT)
+        }
+
+        enableEdgeToEdge(activity, statusBarStyle, navigationBarStyle)
+    }
+
+    fun setStatusBarColor(window: Window, @ColorInt color: Int) {
+        window.statusBarColor = color
+    }
+
+    fun isEdgeToEdgeEnforced(): Boolean {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/HtmlContentFormatter.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/HtmlContentFormatter.kt
index eed3bf9079..740e461c31 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/HtmlContentFormatter.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/HtmlContentFormatter.kt
@@ -140,7 +140,7 @@ class HtmlContentFormatter(
     }
 
     private suspend fun authenticateLTIUrl(ltiUrl: String): String {
-        val ltiResult = apiAsync<AuthenticatedSession> { oAuthManager.getAuthenticatedSession(ltiUrl, it) }.await()
+        val ltiResult = apiAsync { oAuthManager.getAuthenticatedSession(ltiUrl, it, shouldRefreshToken = false) }.await()
         return if (ltiResult.isSuccess) {
             return ltiResult.dataOrNull?.sessionUrl ?: ltiUrl
         } else {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/MasqueradeUI.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/MasqueradeUI.kt
index 4210f37136..849933c36d 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/MasqueradeUI.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/MasqueradeUI.kt
@@ -26,6 +26,8 @@ import android.view.WindowManager
 import android.widget.LinearLayout
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.DialogFragment
 import com.instructure.canvasapi2.utils.ApiPrefs
 import com.instructure.canvasapi2.utils.MasqueradeHelper
@@ -88,6 +90,14 @@ private fun Window.showMasqueradeNotification() {
                     }
                     .show()
             }
+
+            // Apply top padding based on status bar height
+            ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets ->
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.setPadding(view.paddingLeft, systemBars.top, view.paddingRight, view.paddingBottom)
+                insets
+            }
+
             it.addView(binding.root, 0)
         }
     }
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/PlannerItemExtensions.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/PlannerItemExtensions.kt
index db545ff387..da5a19f890 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/PlannerItemExtensions.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/PlannerItemExtensions.kt
@@ -103,9 +103,9 @@ fun PlannerItem.getContextNameForPlannerItem(context: Context, courses: Collecti
     return when (plannableType) {
         PlannableType.PLANNER_NOTE -> {
             if (contextName.isNullOrEmpty()) {
-                context.getString(R.string.userCalendarToDo)
+                context.getString(R.string.userCalendarToDoNew)
             } else {
-                context.getString(R.string.courseToDo, courseTitle ?: contextName)
+                context.getString(R.string.courseToDoNew, courseTitle ?: contextName)
             }
         }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/ViewStyler.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/ViewStyler.kt
index 6c9d38853e..cf36c510d1 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/ViewStyler.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/ViewStyler.kt
@@ -23,6 +23,8 @@ import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
+import android.os.Handler
+import android.os.Looper
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
@@ -185,26 +187,23 @@ object ViewStyler {
     }
 
     fun setStatusBarDark(activity: Activity, @ColorInt color: Int) {
-        activity.window.statusBarColor = ThemePrefs.darker(color)
-        var flags = activity.window.decorView.systemUiVisibility
-        flags = flags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
-        activity.window.decorView.systemUiVisibility = flags
+        WindowInsetsHelper.setStatusBarDark(activity, color)
     }
 
     fun setStatusBarLight(activity: Activity) {
-        activity.window.statusBarColor = ContextCompat.getColor(activity, R.color.dimLighterGray)
-        activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+        WindowInsetsHelper.setStatusBarLight(activity)
+    }
+
+    fun setStatusBarLightDelayed(activity: Activity) {
+        // Due to the messed up navigation stack in the Student app some screens under this on config change can override the color of the statusbar,
+        // so we need to add a delay to make sure this gets called last.
+        Handler(Looper.getMainLooper()).postDelayed({
+            setStatusBarLight(activity)
+        }, 100)
     }
 
     fun setStatusBarColor(activity: Activity, @ColorInt color: Int, lightIcons: Boolean = false) {
-        activity.window.statusBarColor = color
-        var flags = activity.window.decorView.systemUiVisibility
-        flags = if (lightIcons) {
-            flags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
-        } else {
-            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-        }
-        activity.window.decorView.systemUiVisibility = flags
+        WindowInsetsHelper.setStatusBarColor(activity, color, lightIcons)
     }
 
     fun colorImageView(imageView: ImageView, color: Int) {
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/utils/WindowInsetsHelper.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/WindowInsetsHelper.kt
new file mode 100644
index 0000000000..f311e3bef5
--- /dev/null
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/utils/WindowInsetsHelper.kt
@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) 2025 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+
+package com.instructure.pandautils.utils
+
+import android.app.Activity
+import android.view.View
+import android.view.Window
+import androidx.annotation.ColorInt
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
+import androidx.core.view.updatePadding
+import com.instructure.canvasapi2.utils.ApiPrefs
+
+object WindowInsetsHelper {
+
+    fun setStatusBarAppearance(window: Window, isLightStatusBar: Boolean) {
+        val insetsController = WindowInsetsControllerCompat(window, window.decorView)
+        insetsController.isAppearanceLightStatusBars = isLightStatusBar
+    }
+
+    fun setSystemBarsAppearance(window: Window, isLight: Boolean) {
+        val insetsController = WindowInsetsControllerCompat(window, window.decorView)
+        insetsController.isAppearanceLightStatusBars = isLight
+        insetsController.isAppearanceLightNavigationBars = isLight
+    }
+
+    fun setStatusBarColor(activity: Activity, @ColorInt color: Int, lightIcons: Boolean = false) {
+        activity.window.statusBarColor = color
+        setStatusBarAppearance(activity.window, isLightStatusBar = !lightIcons)
+    }
+
+    fun setStatusBarDark(activity: Activity, @ColorInt color: Int) {
+        activity.window.statusBarColor = ThemePrefs.darker(color)
+        setStatusBarAppearance(activity.window, isLightStatusBar = false)
+    }
+
+    fun setStatusBarLight(activity: Activity) {
+        activity.window.statusBarColor = activity.getColor(com.instructure.pandautils.R.color.dimLighterGray)
+        setStatusBarAppearance(activity.window, isLightStatusBar = true)
+    }
+}
+
+fun View.applyTopSystemBarInsets() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced() || ApiPrefs.isMasquerading) return
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        view.updatePadding(top = systemBars.top)
+        insets
+    }
+    // Request insets to be dispatched immediately if view is attached
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
+
+fun View.applyBottomSystemBarInsets() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        view.updatePadding(bottom = systemBars.bottom)
+        insets
+    }
+    // Request insets to be dispatched immediately if view is attached
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
+
+private val TAG_ORIGINAL_BOTTOM_MARGIN = "originalBottomMargin".hashCode()
+
+fun View.applyBottomSystemBarMargin() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    // Only capture original margin once to prevent accumulation on multiple calls
+    val originalBottomMargin = getTag(TAG_ORIGINAL_BOTTOM_MARGIN) as? Int ?: run {
+        val margin = (layoutParams as? android.view.ViewGroup.MarginLayoutParams)?.bottomMargin ?: 0
+        setTag(TAG_ORIGINAL_BOTTOM_MARGIN, margin)
+        margin
+    }
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val layoutParams = view.layoutParams as? android.view.ViewGroup.MarginLayoutParams
+        layoutParams?.bottomMargin = originalBottomMargin + systemBars.bottom
+        view.layoutParams = layoutParams
+        insets
+    }
+    // Request insets to be dispatched immediately if view is attached
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
+
+fun View.applyImeAndSystemBarMargin() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    val originalBottomMargin = getTag(TAG_ORIGINAL_BOTTOM_MARGIN) as? Int ?: run {
+        val margin = (layoutParams as? android.view.ViewGroup.MarginLayoutParams)?.bottomMargin ?: 0
+        setTag(TAG_ORIGINAL_BOTTOM_MARGIN, margin)
+        margin
+    }
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val layoutParams = view.layoutParams as? android.view.ViewGroup.MarginLayoutParams
+        layoutParams?.bottomMargin = originalBottomMargin + maxOf(ime.bottom, systemBars.bottom)
+        view.layoutParams = layoutParams
+        insets
+    }
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
+
+private val TAG_ORIGINAL_BOTTOM_RIGHT_MARGINS = "originalBottomRightMargins".hashCode()
+
+fun View.applyBottomAndRightSystemBarMargin() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    // Only capture original margins once to prevent accumulation on multiple calls
+    val originalMargins = getTag(TAG_ORIGINAL_BOTTOM_RIGHT_MARGINS) as? Pair<Int, Int> ?: run {
+        val params = layoutParams as? android.view.ViewGroup.MarginLayoutParams
+        val margins = Pair(params?.bottomMargin ?: 0, params?.rightMargin ?: 0)
+        setTag(TAG_ORIGINAL_BOTTOM_RIGHT_MARGINS, margins)
+        margins
+    }
+    val (originalBottomMargin, originalRightMargin) = originalMargins
+
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val layoutParams = view.layoutParams as? android.view.ViewGroup.MarginLayoutParams
+
+        // In landscape mode, when nav bar is on the right, use original margin instead of adding system bars
+        // to avoid creating extra gap
+        val configuration = context.resources.configuration
+        val isLandscape = configuration.orientation == android.content.res.Configuration.ORIENTATION_LANDSCAPE
+
+        layoutParams?.bottomMargin = originalBottomMargin + systemBars.bottom
+        layoutParams?.rightMargin = if (isLandscape && systemBars.right > 0) {
+            // In landscape with right nav bar, don't add extra margin - the nav bar already creates space
+            originalRightMargin
+        } else {
+            originalRightMargin + systemBars.right
+        }
+        view.layoutParams = layoutParams
+        insets
+    }
+    // Request insets to be dispatched immediately if view is attached
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
+
+private val TAG_ORIGINAL_BOTTOM_RIGHT_PADDING = "originalBottomRightPadding".hashCode()
+
+fun View.applyBottomAndRightSystemBarPadding() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    // Only capture original padding once to prevent accumulation on multiple calls
+    val originalPadding = getTag(TAG_ORIGINAL_BOTTOM_RIGHT_PADDING) as? Pair<Int, Int> ?: run {
+        val padding = Pair(paddingBottom, paddingRight)
+        setTag(TAG_ORIGINAL_BOTTOM_RIGHT_PADDING, padding)
+        padding
+    }
+    val (originalBottomPadding, originalRightPadding) = originalPadding
+
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        view.updatePadding(
+            bottom = originalBottomPadding + systemBars.bottom,
+            right = originalRightPadding + systemBars.right
+        )
+        insets
+    }
+    // Request insets to be dispatched immediately if view is attached
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
+
+fun View.applySystemBarInsets(
+    top: Boolean = false,
+    bottom: Boolean = false,
+    left: Boolean = false,
+    right: Boolean = false,
+    consumed: Boolean = false
+) {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        view.updatePadding(
+            top = if (top) systemBars.top else view.paddingTop,
+            bottom = if (bottom) systemBars.bottom else view.paddingBottom,
+            left = if (left) systemBars.left else view.paddingLeft,
+            right = if (right) systemBars.right else view.paddingRight
+        )
+        if (consumed) WindowInsetsCompat.CONSUMED else insets
+    }
+}
+
+fun View.applyImeAndSystemBarInsets() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val ime = insets.getInsets(WindowInsetsCompat.Type.ime())
+        val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        view.updatePadding(bottom = maxOf(ime.bottom, systemBars.bottom))
+        insets
+    }
+    // Request insets to be dispatched immediately if view is attached
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
+
+/**
+ * Applies horizontal padding to prevent content from extending behind display cutouts (e.g., camera cutout).
+ * This is useful for constraining content width in landscape mode where the cutout may be on the sides.
+ * Also helps constrain keyboard width to match the content area.
+ */
+fun View.applyDisplayCutoutInsets() {
+    if (!EdgeToEdgeHelper.isEdgeToEdgeEnforced()) return
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val displayCutout = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+        view.updatePadding(left = displayCutout.left, right = displayCutout.right)
+        insets
+    }
+    // Request insets to be dispatched immediately if view is attached
+    if (isAttachedToWindow) {
+        ViewCompat.requestApplyInsets(this)
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/views/CanvasWebView.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/views/CanvasWebView.kt
index 0b41d05cc4..9e8a7ae15c 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/views/CanvasWebView.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/views/CanvasWebView.kt
@@ -440,6 +440,12 @@ class CanvasWebView @JvmOverloads constructor(
                 return WebResourceResponse(null, null, null)
             }
 
+            if (isCanvasFileDownload(url) && mediaDownloadCallback != null) {
+                val fileName = parseFileNameFromContentDisposition(url, url)
+                mediaDownloadCallback?.downloadInternalMedia(null, url, fileName)
+                view.post { stopLoading() }
+            }
+
             return super.shouldInterceptRequest(view, request)
         }
 
@@ -1013,7 +1019,7 @@ class CanvasWebView @JvmOverloads constructor(
                 .replace("src='www.".toRegex(), "src='https://www.")
         }
 
-        fun isStudioDownload(url: String): Boolean {
+        private fun isStudioDownload(url: String): Boolean {
             return url.contains("instructuremedia.com/fetch/") && url.contains("disposition=download")
         }
 
@@ -1041,7 +1047,7 @@ class CanvasWebView @JvmOverloads constructor(
             return false
         }
 
-        fun isInternalFileDownloadLink(url: String): Boolean {
+        private fun isInternalFileDownloadLink(url: String): Boolean {
             return try {
                 val uri = url.toUri()
                 uri.host?.contains("instructure-uploads") == true
@@ -1049,6 +1055,14 @@ class CanvasWebView @JvmOverloads constructor(
                 false
             }
         }
+
+        private fun isCanvasFileDownload(url: String): Boolean {
+            return url.contains("canvas-user-content.com") &&
+                    url.contains("/files/") &&
+                    url.contains("/download") &&
+                    url.contains("verifier=") &&
+                    url.contains("download_frd=1")
+        }
     }
 }
 
diff --git a/libs/pandautils/src/main/java/com/instructure/pandautils/views/EmptyView.kt b/libs/pandautils/src/main/java/com/instructure/pandautils/views/EmptyView.kt
index 402c781647..2eb718c8eb 100644
--- a/libs/pandautils/src/main/java/com/instructure/pandautils/views/EmptyView.kt
+++ b/libs/pandautils/src/main/java/com/instructure/pandautils/views/EmptyView.kt
@@ -51,6 +51,10 @@ class EmptyView @JvmOverloads constructor(
 
     init {
         binding = EmptyViewBinding.inflate(LayoutInflater.from(context), this, true)
+        // Initialize with current orientation
+        post {
+            handleConfigChange(context.resources.getBoolean(R.bool.isDeviceTablet), context.resources.configuration.orientation)
+        }
     }
 
     override fun setLoading() = with(binding) {
diff --git a/libs/pandautils/src/main/res/layout/base_layout.xml b/libs/pandautils/src/main/res/layout/base_layout.xml
index 842929f4d2..f660b23f43 100644
--- a/libs/pandautils/src/main/res/layout/base_layout.xml
+++ b/libs/pandautils/src/main/res/layout/base_layout.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2017 - present Instructure, Inc.
   ~
   ~     Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +22,10 @@
 
     <include
         android:id="@+id/toolbar"
-        layout="@layout/toolbar_layout" />
+        layout="@layout/toolbar_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize" />
 
     <FrameLayout
         android:id="@+id/container"
diff --git a/libs/pandautils/src/main/res/layout/fragment_assignment_details.xml b/libs/pandautils/src/main/res/layout/fragment_assignment_details.xml
index cd4c1d7b37..9f785560bf 100644
--- a/libs/pandautils/src/main/res/layout/fragment_assignment_details.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_assignment_details.xml
@@ -42,6 +42,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:accessibilityHeading="true"
             app:layout_constraintTop_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/libs/pandautils/src/main/res/layout/fragment_context_filter.xml b/libs/pandautils/src/main/res/layout/fragment_context_filter.xml
index 6fe5bf9ee7..bb2b02351e 100644
--- a/libs/pandautils/src/main/res/layout/fragment_context_filter.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_context_filter.xml
@@ -30,7 +30,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:layout_alignParentTop="true"
             android:background="@color/textDarkest"
             android:elevation="6dp"
diff --git a/libs/pandautils/src/main/res/layout/fragment_discussion_create_web_view.xml b/libs/pandautils/src/main/res/layout/fragment_discussion_create_web_view.xml
index b638cc24c2..c098c82127 100644
--- a/libs/pandautils/src/main/res/layout/fragment_discussion_create_web_view.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_discussion_create_web_view.xml
@@ -30,7 +30,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:elevation="6dp"
             app:layout_constraintTop_toTopOf="parent"
             app:theme="@style/ToolBarStyle" />
diff --git a/libs/pandautils/src/main/res/layout/fragment_discussion_details_web_view.xml b/libs/pandautils/src/main/res/layout/fragment_discussion_details_web_view.xml
index 3d6bd6b2f8..1f6e89f7c6 100644
--- a/libs/pandautils/src/main/res/layout/fragment_discussion_details_web_view.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_discussion_details_web_view.xml
@@ -30,7 +30,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/actionBarSize"
                 android:elevation="6dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:theme="@style/ToolBarStyle" />
diff --git a/libs/pandautils/src/main/res/layout/fragment_edit_dashboard.xml b/libs/pandautils/src/main/res/layout/fragment_edit_dashboard.xml
index d20f675003..3d28cddb65 100644
--- a/libs/pandautils/src/main/res/layout/fragment_edit_dashboard.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_edit_dashboard.xml
@@ -38,7 +38,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/actionBarSize"
                 android:elevation="8dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:theme="@style/SearchTheme" />
diff --git a/libs/pandautils/src/main/res/layout/fragment_file_upload_dialog.xml b/libs/pandautils/src/main/res/layout/fragment_file_upload_dialog.xml
index daa2d9909e..94e090efaf 100644
--- a/libs/pandautils/src/main/res/layout/fragment_file_upload_dialog.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_file_upload_dialog.xml
@@ -194,6 +194,35 @@
 
                     </LinearLayout>
 
+                    <LinearLayout
+                        android:id="@+id/fromScanner"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:gravity="center_horizontal"
+                        android:onClick="@{() -> viewModel.onScannerClicked()}"
+                        android:orientation="vertical"
+                        android:paddingTop="8dp"
+                        android:paddingBottom="8dp"
+                        android:visibility="@{viewModel.scannerAvailable ? View.VISIBLE : View.GONE}">
+
+                        <ImageView
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:importantForAccessibility="no"
+                            android:tint="@color/textDarkest"
+                            app:srcCompat="@drawable/ic_scan" />
+
+                        <TextView
+                            style="@style/TextFont.Regular"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/fromDocumentScanning"
+                            android:textColor="@color/textDarkest" />
+
+                    </LinearLayout>
+
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/libs/pandautils/src/main/res/layout/fragment_html_content.xml b/libs/pandautils/src/main/res/layout/fragment_html_content.xml
index 95336181f8..82fede4923 100644
--- a/libs/pandautils/src/main/res/layout/fragment_html_content.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_html_content.xml
@@ -26,7 +26,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:popupTheme="@style/ToolBarPopupStyle"
diff --git a/libs/pandautils/src/main/res/layout/fragment_inbox.xml b/libs/pandautils/src/main/res/layout/fragment_inbox.xml
index 2ac7d14fe0..430551a840 100644
--- a/libs/pandautils/src/main/res/layout/fragment_inbox.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_inbox.xml
@@ -43,7 +43,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/actionBarSize"
                 android:layout_alignParentTop="true"
                 android:background="@color/textDarkest"
                 android:elevation="6dp"
@@ -63,7 +64,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/editToolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/actionBarSize"
                 android:layout_alignParentTop="true"
                 android:background="@color/textDarkest"
                 android:elevation="6dp"
diff --git a/libs/pandautils/src/main/res/layout/fragment_lti_launch.xml b/libs/pandautils/src/main/res/layout/fragment_lti_launch.xml
index f956b41d2e..82b66559e0 100644
--- a/libs/pandautils/src/main/res/layout/fragment_lti_launch.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_lti_launch.xml
@@ -22,7 +22,8 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:attr/actionBarSize"
         android:background="@color/textDarkest"
         android:elevation="6dp"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/libs/pandautils/src/main/res/layout/fragment_notification_preferences.xml b/libs/pandautils/src/main/res/layout/fragment_notification_preferences.xml
index 5314d3a24c..d02fefd095 100644
--- a/libs/pandautils/src/main/res/layout/fragment_notification_preferences.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_notification_preferences.xml
@@ -42,7 +42,8 @@
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"
+                android:layout_height="wrap_content"
+                android:minHeight="?android:attr/actionBarSize"
                 android:background="@android:color/white"
                 android:elevation="2dp"
                 android:accessibilityHeading="true"
diff --git a/libs/pandautils/src/main/res/layout/fragment_offline_content.xml b/libs/pandautils/src/main/res/layout/fragment_offline_content.xml
index 337d30cbe7..22da373424 100644
--- a/libs/pandautils/src/main/res/layout/fragment_offline_content.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_offline_content.xml
@@ -221,6 +221,7 @@
             </com.google.android.material.appbar.AppBarLayout>
 
             <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                android:id="@+id/swipeRefreshLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior"
diff --git a/libs/pandautils/src/main/res/layout/fragment_sync_progress.xml b/libs/pandautils/src/main/res/layout/fragment_sync_progress.xml
index c86f098295..c774dc4cb9 100644
--- a/libs/pandautils/src/main/res/layout/fragment_sync_progress.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_sync_progress.xml
@@ -39,7 +39,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
             android:layout_alignParentTop="true"
             android:background="@color/textDarkest"
             android:elevation="6dp"
@@ -118,8 +119,10 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:clipToPadding="false"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toBottomOf="@id/downloadProgress"
diff --git a/libs/pandautils/src/main/res/layout/fragment_sync_settings.xml b/libs/pandautils/src/main/res/layout/fragment_sync_settings.xml
index 41a07b8b7b..ebac32f6b8 100644
--- a/libs/pandautils/src/main/res/layout/fragment_sync_settings.xml
+++ b/libs/pandautils/src/main/res/layout/fragment_sync_settings.xml
@@ -39,7 +39,8 @@
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="?android:attr/actionBarSize"
+            android:layout_height="wrap_content"
+            android:minHeight="?android:attr/actionBarSize"
             android:background="@color/textDarkest"
             android:elevation="6dp"
             app:layout_constraintTop_toTopOf="parent"
@@ -48,6 +49,7 @@
             app:title="@string/syncSettings_toolbarTitle" />
 
         <ScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/libs/pandautils/src/main/res/layout/toolbar_layout.xml b/libs/pandautils/src/main/res/layout/toolbar_layout.xml
index 4730099eec..77be933c94 100644
--- a/libs/pandautils/src/main/res/layout/toolbar_layout.xml
+++ b/libs/pandautils/src/main/res/layout/toolbar_layout.xml
@@ -20,7 +20,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/actionBarSize"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/actionBarSize"
     android:background="@color/textDarkest"
     app:theme="@style/ToolBarStyle"
     app:popupTheme="@style/ToolBarPopupStyle" />
diff --git a/libs/pandautils/src/main/res/values-ar/strings.xml b/libs/pandautils/src/main/res/values-ar/strings.xml
index 89dd6ce1bb..cf766b56fd 100644
--- a/libs/pandautils/src/main/res/values-ar/strings.xml
+++ b/libs/pandautils/src/main/res/values-ar/strings.xml
@@ -467,11 +467,13 @@
     <string name="schedule_calendar_event_due_text">في %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s إلى %2$s</string>
     <string name="schedule_todo_due_text">قائمة المهام: %s</string>
+    <string name="schedule_todo_due_text_new">المهمة: %s</string>
     <string name="schedule_due_text">تاريخ الاستحقاق: %s</string>
     <string name="show_missing_items_title">إظهار %d من العناصر المفقودة</string>
     <string name="hide_missing_items_title">إخفاء %d من العناصر المفقودة</string>
     <string name="schedule_error_message">لا يمكن إحضار جدولك</string>
     <string name="schedule_todo_title">قائمة المهام</string>
+    <string name="schedule_todo_title_new">المهمة</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s نقطة</item>
         <item quantity="one">%s نقطة</item>
@@ -502,6 +504,7 @@
     <string name="a11y_planner_note">ملاحظة المخطِط</string>
     <string name="a11y_quiz">الاختبار الموجز</string>
     <string name="a11y_todo">قائمة المهام</string>
+    <string name="a11y_todo_new">المهمة</string>
     <string name="a11y_page">صفحة</string>
     <string name="a11y_assessment_request">طلب التقييم</string>
     <string name="a11y_marked_as_done">تم وضع علامة "تم"</string>
diff --git a/libs/pandautils/src/main/res/values-b+da+DK+instk12/strings.xml b/libs/pandautils/src/main/res/values-b+da+DK+instk12/strings.xml
index e15c53ccd7..4e4561d5d3 100644
--- a/libs/pandautils/src/main/res/values-b+da+DK+instk12/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+da+DK+instk12/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Kl. %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s til %2$s</string>
     <string name="schedule_todo_due_text">Opgaveliste: %s</string>
+    <string name="schedule_todo_due_text_new">Element på opgaveliste: %s</string>
     <string name="schedule_due_text">Forfalder: %s</string>
     <string name="show_missing_items_title">Vis %d manglende elementer</string>
     <string name="hide_missing_items_title">Skjul %d manglende elementer</string>
     <string name="schedule_error_message">Din tidsplan kunne ikke hentes</string>
     <string name="schedule_todo_title">Opgaveliste</string>
+    <string name="schedule_todo_title_new">At gøre</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s point</item>
         <item quantity="one">%s point</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planlægger-bemærkning</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Opgaveliste</string>
+    <string name="a11y_todo_new">At gøre</string>
     <string name="a11y_page">Side</string>
     <string name="a11y_assessment_request">Vurderingsanmodning</string>
     <string name="a11y_marked_as_done">Markeret som færdig</string>
diff --git a/libs/pandautils/src/main/res/values-b+en+AU+unimelb/strings.xml b/libs/pandautils/src/main/res/values-b+en+AU+unimelb/strings.xml
index 59dcec616a..b9366e28f8 100644
--- a/libs/pandautils/src/main/res/values-b+en+AU+unimelb/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+en+AU+unimelb/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">At %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s to %2$s</string>
     <string name="schedule_todo_due_text">To Do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do: %s</string>
     <string name="schedule_due_text">Due: %s</string>
     <string name="show_missing_items_title">Show %d missing items</string>
     <string name="hide_missing_items_title">Hide %d missing items</string>
     <string name="schedule_error_message">Unable to fetch your schedule</string>
     <string name="schedule_todo_title">To Do</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planner note</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">To Do</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Assessment request</string>
     <string name="a11y_marked_as_done">Marked as done</string>
diff --git a/libs/pandautils/src/main/res/values-b+en+GB+instukhe/strings.xml b/libs/pandautils/src/main/res/values-b+en+GB+instukhe/strings.xml
index d08e45b4db..959cfdfa02 100644
--- a/libs/pandautils/src/main/res/values-b+en+GB+instukhe/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+en+GB+instukhe/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">At %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s to %2$s</string>
     <string name="schedule_todo_due_text">To-do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do: %s</string>
     <string name="schedule_due_text">Due: %s</string>
     <string name="show_missing_items_title">Show %d missing items</string>
     <string name="hide_missing_items_title">Hide %d missing items</string>
     <string name="schedule_error_message">Unable to fetch your schedule</string>
     <string name="schedule_todo_title">To-do</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planner note</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">To-do</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Assessment request</string>
     <string name="a11y_marked_as_done">Marked as done</string>
diff --git a/libs/pandautils/src/main/res/values-b+nb+NO+instk12/strings.xml b/libs/pandautils/src/main/res/values-b+nb+NO+instk12/strings.xml
index 311fbe0a4c..bee01b0fc7 100644
--- a/libs/pandautils/src/main/res/values-b+nb+NO+instk12/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+nb+NO+instk12/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">Den %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s til %2$s</string>
     <string name="schedule_todo_due_text">Gjøremål: %s</string>
+    <string name="schedule_todo_due_text_new">Gjøremål: %s</string>
     <string name="schedule_due_text">Frist: %s</string>
     <string name="show_missing_items_title">Vis %d manglende elementer</string>
     <string name="hide_missing_items_title">Skjul %d manglende elementer</string>
     <string name="schedule_error_message">Kunne ikke hente timeplanen din</string>
     <string name="schedule_todo_title">Gjøremål</string>
+    <string name="schedule_todo_title_new">Gjøremål</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s poeng</item>
         <item quantity="one">%s poeng</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planleggingsmerknad</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Gjøremål</string>
+    <string name="a11y_todo_new">Gjøremål</string>
     <string name="a11y_page">Side</string>
     <string name="a11y_assessment_request">Vurderingsforespørsel</string>
     <string name="a11y_marked_as_done">Merket som ferdig</string>
diff --git a/libs/pandautils/src/main/res/values-b+sv+SE+instk12/strings.xml b/libs/pandautils/src/main/res/values-b+sv+SE+instk12/strings.xml
index 05b75d9c0a..e35768a67d 100644
--- a/libs/pandautils/src/main/res/values-b+sv+SE+instk12/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+sv+SE+instk12/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Kl. %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s till %2$s</string>
     <string name="schedule_todo_due_text">Att göra: %s</string>
+    <string name="schedule_todo_due_text_new">Att göra: %s</string>
     <string name="schedule_due_text">Inlämningsdatum: %s</string>
     <string name="show_missing_items_title">Visa %d saknade objekt</string>
     <string name="hide_missing_items_title">Dölj %d saknade objekt</string>
     <string name="schedule_error_message">Det gick inte att hämta ditt schema</string>
     <string name="schedule_todo_title">Att göra</string>
+    <string name="schedule_todo_title_new">Att göra</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s poäng</item>
         <item quantity="one">%s poäng</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planeringsanteckning</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Att göra</string>
+    <string name="a11y_todo_new">Att göra</string>
     <string name="a11y_page">Sida</string>
     <string name="a11y_assessment_request">Uppgiftsbegäran</string>
     <string name="a11y_marked_as_done">Markera som färdig</string>
diff --git a/libs/pandautils/src/main/res/values-b+zh+HK/strings.xml b/libs/pandautils/src/main/res/values-b+zh+HK/strings.xml
index a98dcf51b4..ab186f8bd8 100644
--- a/libs/pandautils/src/main/res/values-b+zh+HK/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+zh+HK/strings.xml
@@ -445,11 +445,13 @@
     <string name="schedule_calendar_event_due_text">時間 %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s 至 %2$s</string>
     <string name="schedule_todo_due_text">待辦事項：%s</string>
+    <string name="schedule_todo_due_text_new">待辦事項：%s</string>
     <string name="schedule_due_text">截止日期：%s</string>
     <string name="show_missing_items_title">顯示 %d 個缺少的項目</string>
     <string name="hide_missing_items_title">隱藏 %d 個缺少的項目</string>
     <string name="schedule_error_message">無法取得您的排程</string>
     <string name="schedule_todo_title">待辦事項</string>
+    <string name="schedule_todo_title_new">待辦事項</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s 分</item>
         <item quantity="other">%s 分</item>
@@ -472,6 +474,7 @@
     <string name="a11y_planner_note">規劃註釋</string>
     <string name="a11y_quiz">測驗</string>
     <string name="a11y_todo">待辦事項</string>
+    <string name="a11y_todo_new">待辦事項</string>
     <string name="a11y_page">頁面</string>
     <string name="a11y_assessment_request">評估請求</string>
     <string name="a11y_marked_as_done">標記為已完成</string>
diff --git a/libs/pandautils/src/main/res/values-b+zh+Hans/strings.xml b/libs/pandautils/src/main/res/values-b+zh+Hans/strings.xml
index 29f7249f7b..ec2d3bf373 100644
--- a/libs/pandautils/src/main/res/values-b+zh+Hans/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+zh+Hans/strings.xml
@@ -445,11 +445,13 @@
     <string name="schedule_calendar_event_due_text">%s</string>
     <string name="schedule_calendar_event_interval_text">%1$s 至 %2$s</string>
     <string name="schedule_todo_due_text">待办事项：%s</string>
+    <string name="schedule_todo_due_text_new">待办：%s</string>
     <string name="schedule_due_text">到期：%s</string>
     <string name="show_missing_items_title">显示 %d 个缺失的项目</string>
     <string name="hide_missing_items_title">隐藏 %d 个缺失的项目</string>
     <string name="schedule_error_message">无法获取您的日程计划</string>
     <string name="schedule_todo_title">待办事项</string>
+    <string name="schedule_todo_title_new">待办</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s 分</item>
         <item quantity="other">%s 分</item>
@@ -472,6 +474,7 @@
     <string name="a11y_planner_note">计划者备注</string>
     <string name="a11y_quiz">测验</string>
     <string name="a11y_todo">待办事项</string>
+    <string name="a11y_todo_new">待办</string>
     <string name="a11y_page">页面</string>
     <string name="a11y_assessment_request">评估请求</string>
     <string name="a11y_marked_as_done">标记为完成</string>
diff --git a/libs/pandautils/src/main/res/values-b+zh+Hant/strings.xml b/libs/pandautils/src/main/res/values-b+zh+Hant/strings.xml
index a98dcf51b4..ab186f8bd8 100644
--- a/libs/pandautils/src/main/res/values-b+zh+Hant/strings.xml
+++ b/libs/pandautils/src/main/res/values-b+zh+Hant/strings.xml
@@ -445,11 +445,13 @@
     <string name="schedule_calendar_event_due_text">時間 %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s 至 %2$s</string>
     <string name="schedule_todo_due_text">待辦事項：%s</string>
+    <string name="schedule_todo_due_text_new">待辦事項：%s</string>
     <string name="schedule_due_text">截止日期：%s</string>
     <string name="show_missing_items_title">顯示 %d 個缺少的項目</string>
     <string name="hide_missing_items_title">隱藏 %d 個缺少的項目</string>
     <string name="schedule_error_message">無法取得您的排程</string>
     <string name="schedule_todo_title">待辦事項</string>
+    <string name="schedule_todo_title_new">待辦事項</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s 分</item>
         <item quantity="other">%s 分</item>
@@ -472,6 +474,7 @@
     <string name="a11y_planner_note">規劃註釋</string>
     <string name="a11y_quiz">測驗</string>
     <string name="a11y_todo">待辦事項</string>
+    <string name="a11y_todo_new">待辦事項</string>
     <string name="a11y_page">頁面</string>
     <string name="a11y_assessment_request">評估請求</string>
     <string name="a11y_marked_as_done">標記為已完成</string>
diff --git a/libs/pandautils/src/main/res/values-ca/strings.xml b/libs/pandautils/src/main/res/values-ca/strings.xml
index df967c9034..9255b6dfdf 100644
--- a/libs/pandautils/src/main/res/values-ca/strings.xml
+++ b/libs/pandautils/src/main/res/values-ca/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">A les %s</string>
     <string name="schedule_calendar_event_interval_text">De %1$s a %2$s</string>
     <string name="schedule_todo_due_text">Tasques pendents: %s</string>
+    <string name="schedule_todo_due_text_new">Tasques pendents: %s</string>
     <string name="schedule_due_text">Data de lliurament: %s</string>
     <string name="show_missing_items_title">Mostra %d elements no presentats</string>
     <string name="hide_missing_items_title">Amaga %d elements no presentats</string>
     <string name="schedule_error_message">No es pot obtenir la vostra planificació</string>
     <string name="schedule_todo_title">Tasques pendents</string>
+    <string name="schedule_todo_title_new">Tasques pendents</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s punt</item>
         <item quantity="one">%s punt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nota del planificador</string>
     <string name="a11y_quiz">Prova</string>
     <string name="a11y_todo">Tasques pendents</string>
+    <string name="a11y_todo_new">Tasques pendents</string>
     <string name="a11y_page">Pàgina</string>
     <string name="a11y_assessment_request">Sol·licitud d’avaluació</string>
     <string name="a11y_marked_as_done">Marcada com a feta</string>
diff --git a/libs/pandautils/src/main/res/values-cy/strings.xml b/libs/pandautils/src/main/res/values-cy/strings.xml
index 435226f187..fae08d8a7c 100644
--- a/libs/pandautils/src/main/res/values-cy/strings.xml
+++ b/libs/pandautils/src/main/res/values-cy/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Am %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s i %2$s</string>
     <string name="schedule_todo_due_text">Tasgau i’w Gwneud: %s</string>
+    <string name="schedule_todo_due_text_new">Tasgau i\'w gwneud: %s</string>
     <string name="schedule_due_text">Erbyn: %s</string>
     <string name="show_missing_items_title">Dangos %d eitem coll</string>
     <string name="hide_missing_items_title">Cuddio %d eitem coll</string>
     <string name="schedule_error_message">Doedd dim modd nôl eich amserlen</string>
     <string name="schedule_todo_title">Tasgau i’w Gwneud</string>
+    <string name="schedule_todo_title_new">Tasg i’w Gwneud</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pwynt</item>
         <item quantity="one">%s pwynt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nodyn gan y trefnydd</string>
     <string name="a11y_quiz">Cwis</string>
     <string name="a11y_todo">Tasgau i’w Gwneud</string>
+    <string name="a11y_todo_new">Tasg i’w Gwneud</string>
     <string name="a11y_page">Tudalen</string>
     <string name="a11y_assessment_request">Cais asesiad</string>
     <string name="a11y_marked_as_done">Wedi ei farcio ei fod wedi’i wneud</string>
diff --git a/libs/pandautils/src/main/res/values-da/strings.xml b/libs/pandautils/src/main/res/values-da/strings.xml
index f7ff7d9a76..71f35ca85b 100644
--- a/libs/pandautils/src/main/res/values-da/strings.xml
+++ b/libs/pandautils/src/main/res/values-da/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Kl. %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s til %2$s</string>
     <string name="schedule_todo_due_text">Opgaveliste: %s</string>
+    <string name="schedule_todo_due_text_new">Element på opgaveliste: %s</string>
     <string name="schedule_due_text">Forfalder: %s</string>
     <string name="show_missing_items_title">Vis %d manglende elementer</string>
     <string name="hide_missing_items_title">Skjul %d manglende elementer</string>
     <string name="schedule_error_message">Din tidsplan kunne ikke hentes</string>
     <string name="schedule_todo_title">Opgaveliste</string>
+    <string name="schedule_todo_title_new">Element på opgaveliste</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s point</item>
         <item quantity="one">%s point</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planlægger-bemærkning</string>
     <string name="a11y_quiz">Test</string>
     <string name="a11y_todo">Opgaveliste</string>
+    <string name="a11y_todo_new">Element på opgaveliste</string>
     <string name="a11y_page">Side</string>
     <string name="a11y_assessment_request">Vurderingsanmodning</string>
     <string name="a11y_marked_as_done">Markeret som færdig</string>
diff --git a/libs/pandautils/src/main/res/values-de/strings.xml b/libs/pandautils/src/main/res/values-de/strings.xml
index be384b91bf..b0de645a7e 100644
--- a/libs/pandautils/src/main/res/values-de/strings.xml
+++ b/libs/pandautils/src/main/res/values-de/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Um %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s bis %2$s</string>
     <string name="schedule_todo_due_text">Zu erledigen: %s</string>
+    <string name="schedule_todo_due_text_new">To-Do: %s</string>
     <string name="schedule_due_text">Fällig: %s</string>
     <string name="show_missing_items_title">%d fehlende Elemente anzeigen</string>
     <string name="hide_missing_items_title">%d fehlende Elemente ausblenden</string>
     <string name="schedule_error_message">Ihr Zeitplan konnte nicht abgerufen werden</string>
     <string name="schedule_todo_title">Zu erledigen</string>
+    <string name="schedule_todo_title_new">To-Do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s Pkt.</item>
         <item quantity="one">%s Pkt.</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planerhinweis</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Zu erledigen</string>
+    <string name="a11y_todo_new">To-Do</string>
     <string name="a11y_page">Seite</string>
     <string name="a11y_assessment_request">Bewertungsanfrage</string>
     <string name="a11y_marked_as_done">Als fertig markiert</string>
diff --git a/libs/pandautils/src/main/res/values-en-rAU/strings.xml b/libs/pandautils/src/main/res/values-en-rAU/strings.xml
index f80d578906..bf89909483 100644
--- a/libs/pandautils/src/main/res/values-en-rAU/strings.xml
+++ b/libs/pandautils/src/main/res/values-en-rAU/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">At %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s to %2$s</string>
     <string name="schedule_todo_due_text">To Do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do: %s</string>
     <string name="schedule_due_text">Due: %s</string>
     <string name="show_missing_items_title">Show %d missing items</string>
     <string name="hide_missing_items_title">Hide %d missing items</string>
     <string name="schedule_error_message">Unable to fetch your schedule</string>
     <string name="schedule_todo_title">To Do</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planner note</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">To Do</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Assessment request</string>
     <string name="a11y_marked_as_done">Marked as done</string>
diff --git a/libs/pandautils/src/main/res/values-en-rCY/strings.xml b/libs/pandautils/src/main/res/values-en-rCY/strings.xml
index d08e45b4db..959cfdfa02 100644
--- a/libs/pandautils/src/main/res/values-en-rCY/strings.xml
+++ b/libs/pandautils/src/main/res/values-en-rCY/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">At %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s to %2$s</string>
     <string name="schedule_todo_due_text">To-do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do: %s</string>
     <string name="schedule_due_text">Due: %s</string>
     <string name="show_missing_items_title">Show %d missing items</string>
     <string name="hide_missing_items_title">Hide %d missing items</string>
     <string name="schedule_error_message">Unable to fetch your schedule</string>
     <string name="schedule_todo_title">To-do</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planner note</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">To-do</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Assessment request</string>
     <string name="a11y_marked_as_done">Marked as done</string>
diff --git a/libs/pandautils/src/main/res/values-en-rGB/strings.xml b/libs/pandautils/src/main/res/values-en-rGB/strings.xml
index 3975251803..cf1ba9258a 100644
--- a/libs/pandautils/src/main/res/values-en-rGB/strings.xml
+++ b/libs/pandautils/src/main/res/values-en-rGB/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">At %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s to %2$s</string>
     <string name="schedule_todo_due_text">To-do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do: %s</string>
     <string name="schedule_due_text">Due: %s</string>
     <string name="show_missing_items_title">Show %d missing items</string>
     <string name="hide_missing_items_title">Hide %d missing items</string>
     <string name="schedule_error_message">Unable to fetch your schedule</string>
     <string name="schedule_todo_title">To-do</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planner note</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">To-do</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Assessment request</string>
     <string name="a11y_marked_as_done">Marked as done</string>
diff --git a/libs/pandautils/src/main/res/values-en/strings.xml b/libs/pandautils/src/main/res/values-en/strings.xml
index 2e5db4f548..51772cfc49 100644
--- a/libs/pandautils/src/main/res/values-en/strings.xml
+++ b/libs/pandautils/src/main/res/values-en/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">At %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s to %2$s</string>
     <string name="schedule_todo_due_text">To Do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do: %s</string>
     <string name="schedule_due_text">Due: %s</string>
     <string name="show_missing_items_title">Show %d missing items</string>
     <string name="hide_missing_items_title">Hide %d missing items</string>
     <string name="schedule_error_message">Unable to fetch your schedule</string>
     <string name="schedule_todo_title">To Do</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planner note</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">To Do</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Assessment request</string>
     <string name="a11y_marked_as_done">Marked as done</string>
diff --git a/libs/pandautils/src/main/res/values-es-rES/strings.xml b/libs/pandautils/src/main/res/values-es-rES/strings.xml
index f5f5d50b0c..30157ae374 100644
--- a/libs/pandautils/src/main/res/values-es-rES/strings.xml
+++ b/libs/pandautils/src/main/res/values-es-rES/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">A las %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s a %2$s</string>
     <string name="schedule_todo_due_text">Tareas pendientes: %s</string>
+    <string name="schedule_todo_due_text_new">Tareas pendientes: %s</string>
     <string name="schedule_due_text">Fecha de entrega: %s</string>
     <string name="show_missing_items_title">Mostrar %d ítems no presentados</string>
     <string name="hide_missing_items_title">Ocultar %d ítems no presentados</string>
     <string name="schedule_error_message">No se ha podido obtener el planificador</string>
     <string name="schedule_todo_title">Tareas pendientes</string>
+    <string name="schedule_todo_title_new">Tareas pendientes</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s punto</item>
         <item quantity="one">%s punto</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nota del planificador</string>
     <string name="a11y_quiz">Prueba</string>
     <string name="a11y_todo">Tareas pendientes</string>
+    <string name="a11y_todo_new">Tareas pendientes</string>
     <string name="a11y_page">Página</string>
     <string name="a11y_assessment_request">Solicitud de evaluación</string>
     <string name="a11y_marked_as_done">Marcado como hecho</string>
diff --git a/libs/pandautils/src/main/res/values-es/strings.xml b/libs/pandautils/src/main/res/values-es/strings.xml
index 606e1b6fb3..7a68ce7a07 100644
--- a/libs/pandautils/src/main/res/values-es/strings.xml
+++ b/libs/pandautils/src/main/res/values-es/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">A las %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s a %2$s</string>
     <string name="schedule_todo_due_text">Por hacer: %s</string>
+    <string name="schedule_todo_due_text_new">Ítem Por hacer: %s</string>
     <string name="schedule_due_text">Fecha límite: %s</string>
     <string name="show_missing_items_title">Mostrar %d ítems faltantes</string>
     <string name="hide_missing_items_title">Ocultar %d ítems faltantes</string>
     <string name="schedule_error_message">No se pudo recuperar su cronograma</string>
     <string name="schedule_todo_title">Por hacer</string>
+    <string name="schedule_todo_title_new">Ítem Por hacer</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pto.</item>
         <item quantity="one">%s pto.</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nota del planificador</string>
     <string name="a11y_quiz">Examen</string>
     <string name="a11y_todo">Por hacer</string>
+    <string name="a11y_todo_new">Ítem Por hacer</string>
     <string name="a11y_page">Página</string>
     <string name="a11y_assessment_request">Solicitud de evaluación</string>
     <string name="a11y_marked_as_done">Marcado como realizado</string>
diff --git a/libs/pandautils/src/main/res/values-fi/strings.xml b/libs/pandautils/src/main/res/values-fi/strings.xml
index 6ba248409a..0600a40c54 100644
--- a/libs/pandautils/src/main/res/values-fi/strings.xml
+++ b/libs/pandautils/src/main/res/values-fi/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Kohteessa %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s - %2$s</string>
     <string name="schedule_todo_due_text">Tehtävälista: %s</string>
+    <string name="schedule_todo_due_text_new"> Tehtävä: %s</string>
     <string name="schedule_due_text">Määräpäivä: %s</string>
     <string name="show_missing_items_title">Näytä %d puuttuvaa kohdetta</string>
     <string name="hide_missing_items_title">Piilota %d puuttuvaa kohdetta</string>
     <string name="schedule_error_message">Aikataulun nouto ei onnistu</string>
     <string name="schedule_todo_title">Tehtävälista</string>
+    <string name="schedule_todo_title_new">Tehtävälista</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s piste</item>
         <item quantity="one">%s piste</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Suunnittelumerkintä</string>
     <string name="a11y_quiz">Testi</string>
     <string name="a11y_todo">Tehtävälista</string>
+    <string name="a11y_todo_new">Tehtävälista</string>
     <string name="a11y_page">Sivu</string>
     <string name="a11y_assessment_request">Arviointipyyntö</string>
     <string name="a11y_marked_as_done">Merkitty tehdyksi</string>
diff --git a/libs/pandautils/src/main/res/values-fr/strings.xml b/libs/pandautils/src/main/res/values-fr/strings.xml
index 1d1b401ff9..39511fcb60 100644
--- a/libs/pandautils/src/main/res/values-fr/strings.xml
+++ b/libs/pandautils/src/main/res/values-fr/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">À %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s à %2$s</string>
     <string name="schedule_todo_due_text">À faire : %s</string>
+    <string name="schedule_todo_due_text_new">À Faire : %s</string>
     <string name="schedule_due_text">À rendre le : %s</string>
     <string name="show_missing_items_title">Afficher %d éléments manquants</string>
     <string name="hide_missing_items_title">Masquer %d éléments manquants</string>
     <string name="schedule_error_message">Impossible de récupérer votre emploi du temps</string>
     <string name="schedule_todo_title">À faire</string>
+    <string name="schedule_todo_title_new">À Faire</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Note du planificateur</string>
     <string name="a11y_quiz">Questionnaire</string>
     <string name="a11y_todo">À faire</string>
+    <string name="a11y_todo_new">À Faire</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Demande d\'évaluation</string>
     <string name="a11y_marked_as_done">Marqué comme terminé</string>
diff --git a/libs/pandautils/src/main/res/values-ga/strings.xml b/libs/pandautils/src/main/res/values-ga/strings.xml
index 0695beb04d..7a580e909e 100644
--- a/libs/pandautils/src/main/res/values-ga/strings.xml
+++ b/libs/pandautils/src/main/res/values-ga/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">Ag %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s go %2$s</string>
     <string name="schedule_todo_due_text">Le Déanamh: %s</string>
+    <string name="schedule_todo_due_text_new">Le déanamh: %s</string>
     <string name="schedule_due_text">Dlite: %s</string>
     <string name="show_missing_items_title">Taispeáin %d mír atá ar iarraidh</string>
     <string name="hide_missing_items_title">Folaigh %d mír atá in easnamh</string>
     <string name="schedule_error_message">Ní féidir do sceideal a fháil</string>
     <string name="schedule_todo_title">Le Déanamh</string>
+    <string name="schedule_todo_title_new">Le déanamh</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nóta pleanálaí</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Le Déanamh</string>
+    <string name="a11y_todo_new">Le déanamh</string>
     <string name="a11y_page">Leathanach</string>
     <string name="a11y_assessment_request">Iarratas taisc</string>
     <string name="a11y_marked_as_done">Marcáilte mar déanta</string>
diff --git a/libs/pandautils/src/main/res/values-hi/strings.xml b/libs/pandautils/src/main/res/values-hi/strings.xml
index 97fa937bc9..bea0a82486 100644
--- a/libs/pandautils/src/main/res/values-hi/strings.xml
+++ b/libs/pandautils/src/main/res/values-hi/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">%s पर</string>
     <string name="schedule_calendar_event_interval_text">%1$s से %2$s तक</string>
     <string name="schedule_todo_due_text">करने के लिए: %s</string>
+    <string name="schedule_todo_due_text_new">करने के लिए: %s</string>
     <string name="schedule_due_text">नियत: %s</string>
     <string name="show_missing_items_title">%d लापता आइटमें दिखाएं</string>
     <string name="hide_missing_items_title">%d लापता आइटमें छिपाएं</string>
     <string name="schedule_error_message">आपका शेड्यूल लाने में असमर्थ</string>
     <string name="schedule_todo_title">करने के लिए</string>
+    <string name="schedule_todo_title_new">करने के लिए</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s पॉइंट</item>
         <item quantity="one">%s पॉइंट</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">योजनाकर्ता नोट</string>
     <string name="a11y_quiz">प्रश्नोत्तरी</string>
     <string name="a11y_todo">करने के लिए</string>
+    <string name="a11y_todo_new">करने के लिए</string>
     <string name="a11y_page">पेज</string>
     <string name="a11y_assessment_request">आकलन का अनुरोध</string>
     <string name="a11y_marked_as_done">हो गया के रूप में चिह्नित किया गया</string>
diff --git a/libs/pandautils/src/main/res/values-ht/strings.xml b/libs/pandautils/src/main/res/values-ht/strings.xml
index 6e9a6e8fe6..f3f7ebcac5 100644
--- a/libs/pandautils/src/main/res/values-ht/strings.xml
+++ b/libs/pandautils/src/main/res/values-ht/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Nan %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s a %2$s</string>
     <string name="schedule_todo_due_text">Tach: %s</string>
+    <string name="schedule_todo_due_text_new">Pou fè: %s</string>
     <string name="schedule_due_text">Delè: %s</string>
     <string name="show_missing_items_title">Afiche %d eleman ki manke</string>
     <string name="hide_missing_items_title">Kache %d eleman ki manke</string>
     <string name="schedule_error_message">Enposib pou rekipere agenda w la</string>
     <string name="schedule_todo_title">Pou Fè</string>
+    <string name="schedule_todo_title_new">Pou fè</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pwen</item>
         <item quantity="one">%s pwen</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nòt pou planifikatè</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Pou Fè</string>
+    <string name="a11y_todo_new">Pou fè</string>
     <string name="a11y_page">Paj</string>
     <string name="a11y_assessment_request">Demann evalyasyon</string>
     <string name="a11y_marked_as_done">Make tankou li fini</string>
diff --git a/libs/pandautils/src/main/res/values-id/strings.xml b/libs/pandautils/src/main/res/values-id/strings.xml
index 17c0069ee6..ebfb29752c 100644
--- a/libs/pandautils/src/main/res/values-id/strings.xml
+++ b/libs/pandautils/src/main/res/values-id/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">Pada %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s hingga %2$s</string>
     <string name="schedule_todo_due_text">To Do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do (Harus Dilakukan): %s</string>
     <string name="schedule_due_text">Batas Waktu: %s</string>
     <string name="show_missing_items_title">Tampilkan %d item yang tidak ada</string>
     <string name="hide_missing_items_title">Sembunyikan %d item yang tidak ada</string>
     <string name="schedule_error_message">Tidak dapat mengambil jadwal Anda</string>
     <string name="schedule_todo_title">Harus Dilakukan</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s poin</item>
         <item quantity="one">%s poin</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Catatan planner</string>
     <string name="a11y_quiz">Kuis</string>
     <string name="a11y_todo">Harus Dilakukan</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Halaman</string>
     <string name="a11y_assessment_request">Permintaa penilaian</string>
     <string name="a11y_marked_as_done">Ditandai sebagai selesai</string>
diff --git a/libs/pandautils/src/main/res/values-is/strings.xml b/libs/pandautils/src/main/res/values-is/strings.xml
index 3092563204..af5268912f 100644
--- a/libs/pandautils/src/main/res/values-is/strings.xml
+++ b/libs/pandautils/src/main/res/values-is/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Á %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s til %2$s</string>
     <string name="schedule_todo_due_text">Verkefni: %s</string>
+    <string name="schedule_todo_due_text_new">Verkefnalisti: %s</string>
     <string name="schedule_due_text">Skil: %s</string>
     <string name="show_missing_items_title">Sýna %d hluti sem vantar</string>
     <string name="hide_missing_items_title">Fela %d hluti sem vantar</string>
     <string name="schedule_error_message">Get ekki náð í stundaskrá þína</string>
     <string name="schedule_todo_title">Verkefnalisti</string>
+    <string name="schedule_todo_title_new">Verkefnalisti</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s punktur</item>
         <item quantity="one">%s punktur</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Athugasemd skipuleggjara</string>
     <string name="a11y_quiz">Próf</string>
     <string name="a11y_todo">Verkefnalisti</string>
+    <string name="a11y_todo_new">Verkefnalisti</string>
     <string name="a11y_page">Síða</string>
     <string name="a11y_assessment_request">Matsbeiðni</string>
     <string name="a11y_marked_as_done">Merkt sem lokið</string>
diff --git a/libs/pandautils/src/main/res/values-it/strings.xml b/libs/pandautils/src/main/res/values-it/strings.xml
index 251e182306..13d45131c8 100644
--- a/libs/pandautils/src/main/res/values-it/strings.xml
+++ b/libs/pandautils/src/main/res/values-it/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Alle %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s a %2$s</string>
     <string name="schedule_todo_due_text">Elenco attività: %s</string>
+    <string name="schedule_todo_due_text_new">Attività da fare: %s</string>
     <string name="schedule_due_text">Scadenza: %s</string>
     <string name="show_missing_items_title">Mostra %d elementi mancanti</string>
     <string name="hide_missing_items_title">Nascondi %d elementi mancanti</string>
     <string name="schedule_error_message">Impossibile recuperare programma</string>
     <string name="schedule_todo_title">Elenco attività</string>
+    <string name="schedule_todo_title_new">Attività da fare</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nota agenda</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Elenco attività</string>
+    <string name="a11y_todo_new">Attività da fare</string>
     <string name="a11y_page">Pagina</string>
     <string name="a11y_assessment_request">Richiesta di valutazione</string>
     <string name="a11y_marked_as_done">Contrassegnato come fatto</string>
diff --git a/libs/pandautils/src/main/res/values-ja/strings.xml b/libs/pandautils/src/main/res/values-ja/strings.xml
index 899b039974..a08051acab 100644
--- a/libs/pandautils/src/main/res/values-ja/strings.xml
+++ b/libs/pandautils/src/main/res/values-ja/strings.xml
@@ -445,11 +445,13 @@
     <string name="schedule_calendar_event_due_text">%sで</string>
     <string name="schedule_calendar_event_interval_text">%1$sから%2$s</string>
     <string name="schedule_todo_due_text">タスク：%s</string>
+    <string name="schedule_todo_due_text_new">するべきこと：%s</string>
     <string name="schedule_due_text">期限：%s</string>
     <string name="show_missing_items_title">%d欠如アイテムを表示する</string>
     <string name="hide_missing_items_title">%d欠如アイテムを非表示にする</string>
     <string name="schedule_error_message">スケジュールを取得できません</string>
     <string name="schedule_todo_title">タスク</string>
+    <string name="schedule_todo_title_new">するべきこと</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s 点</item>
         <item quantity="other">%s 点</item>
@@ -472,6 +474,7 @@
     <string name="a11y_planner_note">計画者のメモ</string>
     <string name="a11y_quiz">小テスト</string>
     <string name="a11y_todo">タスク</string>
+    <string name="a11y_todo_new">するべきこと</string>
     <string name="a11y_page">ページ</string>
     <string name="a11y_assessment_request">アセスメントの要求</string>
     <string name="a11y_marked_as_done">完了としてマークする</string>
diff --git a/libs/pandautils/src/main/res/values-ko/strings.xml b/libs/pandautils/src/main/res/values-ko/strings.xml
index 25bd8fab82..de6b2cdffc 100644
--- a/libs/pandautils/src/main/res/values-ko/strings.xml
+++ b/libs/pandautils/src/main/res/values-ko/strings.xml
@@ -446,11 +446,13 @@
     <string name="schedule_calendar_event_due_text"> %s에</string>
     <string name="schedule_calendar_event_interval_text">%1$s부터 %2$s</string>
     <string name="schedule_todo_due_text">할 일: %s</string>
+    <string name="schedule_todo_due_text_new">할 일: %s</string>
     <string name="schedule_due_text">기한: %s</string>
     <string name="show_missing_items_title">%d개 누락된 항목 표시</string>
     <string name="hide_missing_items_title">%d개 누락된 항목 숨기기</string>
     <string name="schedule_error_message">일정을 검색할 수 ㅇ벗음</string>
     <string name="schedule_todo_title">할 일</string>
+    <string name="schedule_todo_title_new">할 일</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s점</item>
         <item quantity="other">%s점</item>
@@ -472,6 +474,7 @@
     <string name="a11y_planner_note">플래너 메모</string>
     <string name="a11y_quiz">퀴즈</string>
     <string name="a11y_todo">할 일</string>
+    <string name="a11y_todo_new">할 일</string>
     <string name="a11y_page">페이지</string>
     <string name="a11y_assessment_request">평가 요청</string>
     <string name="a11y_marked_as_done">완료로 표시</string>
@@ -493,4 +496,8 @@
         <item quantity="other">%d분</item>
     </plurals>
     <string name="notATeacherDescription">저희의 다른 앱이 더 적합할 수 있습니다. 아이콘을 탭하여 로그인합니다.</string>
+    <string name="gradePercentAccessibility">성적: %d%</string>
+    <string name="gradePointsAccessibility">성적: %s점</string>
+    <string name="gradePercentTextFieldAccessibility">성적: %d퍼센트, %s </string>
+    <string name="gradePointsTextFieldAccessibility">성적: %s점, %s</string>
 </resources>
diff --git a/libs/pandautils/src/main/res/values-mi/strings.xml b/libs/pandautils/src/main/res/values-mi/strings.xml
index 0c5a5849b8..274fbe0bd8 100644
--- a/libs/pandautils/src/main/res/values-mi/strings.xml
+++ b/libs/pandautils/src/main/res/values-mi/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Ī %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s ki te %2$s</string>
     <string name="schedule_todo_due_text">Hei Mahi: %s</string>
+    <string name="schedule_todo_due_text_new">Ngā mahi hei mahi: %s</string>
     <string name="schedule_due_text">E tika ana: %s</string>
     <string name="show_missing_items_title">Whakāturia %d ngā tūemi e ngaro ana</string>
     <string name="hide_missing_items_title">Huna %d ngā tuemi e ngaro ana</string>
     <string name="schedule_error_message">Kaore e taea te tiki i tō pūwhakarite</string>
     <string name="schedule_todo_title">Hei mahi</string>
+    <string name="schedule_todo_title_new">Mahi-mahi</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s koinga</item>
         <item quantity="one">%s koinga</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Mahere tuhipoka</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Hei Mahi</string>
+    <string name="a11y_todo_new">Mahi-mahi</string>
     <string name="a11y_page">Whārangi</string>
     <string name="a11y_assessment_request">Tono aromatawai</string>
     <string name="a11y_marked_as_done">Tohua kua oti</string>
diff --git a/libs/pandautils/src/main/res/values-ms/strings.xml b/libs/pandautils/src/main/res/values-ms/strings.xml
index 8f370ac479..2ed12f9d2f 100644
--- a/libs/pandautils/src/main/res/values-ms/strings.xml
+++ b/libs/pandautils/src/main/res/values-ms/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">Pada %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s kepada %2$s</string>
     <string name="schedule_todo_due_text">Untuk Dilakukan: %s</string>
+    <string name="schedule_todo_due_text_new">Untuk Dilakukan: %s</string>
     <string name="schedule_due_text">Cukup tempoh: %s</string>
     <string name="show_missing_items_title">Tunjukkan %d item yang tiada</string>
     <string name="hide_missing_items_title">Sembunyikan %d item yang tiada</string>
     <string name="schedule_error_message">Tidak dapat mengambil jadual anda</string>
     <string name="schedule_todo_title">Untuk Dilakukan</string>
+    <string name="schedule_todo_title_new">Untuk Dilakukan</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s mata</item>
         <item quantity="one">%s mata</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nota perancang</string>
     <string name="a11y_quiz">Kuiz</string>
     <string name="a11y_todo">Untuk Dilakukan</string>
+    <string name="a11y_todo_new">Untuk Dilakukan</string>
     <string name="a11y_page">Halaman</string>
     <string name="a11y_assessment_request">Permintaan pentaksiran</string>
     <string name="a11y_marked_as_done">Ditandakan sebagai siap</string>
diff --git a/libs/pandautils/src/main/res/values-nb/strings.xml b/libs/pandautils/src/main/res/values-nb/strings.xml
index 4040cc822e..5e92f57031 100644
--- a/libs/pandautils/src/main/res/values-nb/strings.xml
+++ b/libs/pandautils/src/main/res/values-nb/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">Den %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s til %2$s</string>
     <string name="schedule_todo_due_text">Gjøremål: %s</string>
+    <string name="schedule_todo_due_text_new">Gjøremål: %s</string>
     <string name="schedule_due_text">Frist: %s</string>
     <string name="show_missing_items_title">Vis %d manglende elementer</string>
     <string name="hide_missing_items_title">Skjul %d manglende elementer</string>
     <string name="schedule_error_message">Kunne ikke hente timeplanen din</string>
     <string name="schedule_todo_title">Gjøremål</string>
+    <string name="schedule_todo_title_new">Gjøremål</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s poeng</item>
         <item quantity="one">%s poeng</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planleggingsmerknad</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Gjøremål</string>
+    <string name="a11y_todo_new">Gjøremål</string>
     <string name="a11y_page">Side</string>
     <string name="a11y_assessment_request">Vurderingsforespørsel</string>
     <string name="a11y_marked_as_done">Merket som ferdig</string>
diff --git a/libs/pandautils/src/main/res/values-nl/strings.xml b/libs/pandautils/src/main/res/values-nl/strings.xml
index 6f6aa1384a..e758a62c59 100644
--- a/libs/pandautils/src/main/res/values-nl/strings.xml
+++ b/libs/pandautils/src/main/res/values-nl/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Om %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s tot %2$s</string>
     <string name="schedule_todo_due_text">Takenlijst: %s</string>
+    <string name="schedule_todo_due_text_new">Opdracht: %s</string>
     <string name="schedule_due_text">Inleverdatum: %s</string>
     <string name="show_missing_items_title">%d ontbrekende items tonen</string>
     <string name="hide_missing_items_title">%d ontbrekende items verbergen</string>
     <string name="schedule_error_message">Kan je planning niet ophalen</string>
     <string name="schedule_todo_title">Takenlijst</string>
+    <string name="schedule_todo_title_new">Opdracht</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planneraantekening</string>
     <string name="a11y_quiz">Toets</string>
     <string name="a11y_todo">Takenlijst</string>
+    <string name="a11y_todo_new">Opdracht</string>
     <string name="a11y_page">Pagina</string>
     <string name="a11y_assessment_request">Beoordelingsverzoek</string>
     <string name="a11y_marked_as_done">Gemarkeerd als klaar</string>
diff --git a/libs/pandautils/src/main/res/values-pl/strings.xml b/libs/pandautils/src/main/res/values-pl/strings.xml
index d890b0cb3e..722cd88bbb 100644
--- a/libs/pandautils/src/main/res/values-pl/strings.xml
+++ b/libs/pandautils/src/main/res/values-pl/strings.xml
@@ -459,11 +459,13 @@
     <string name="schedule_calendar_event_due_text">O %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s do %2$s</string>
     <string name="schedule_todo_due_text">Lista zadań: %s</string>
+    <string name="schedule_todo_due_text_new">Lista zadań: %s</string>
     <string name="schedule_due_text">Termin: %s</string>
     <string name="show_missing_items_title">Pokaż brakujące elementy: %d</string>
     <string name="hide_missing_items_title">Ukryj brakujące elementy: %d</string>
     <string name="schedule_error_message">Nie można pobrać harmonogramu</string>
     <string name="schedule_todo_title">Lista zadań</string>
+    <string name="schedule_todo_title_new">Lista zadań</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pkt</item>
         <item quantity="one">%s pkt</item>
@@ -492,6 +494,7 @@
     <string name="a11y_planner_note">Notatka planera</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Lista zadań</string>
+    <string name="a11y_todo_new">Lista zadań</string>
     <string name="a11y_page">Strona</string>
     <string name="a11y_assessment_request">Prośba o ocenę</string>
     <string name="a11y_marked_as_done">Oznaczono jako gotowe</string>
diff --git a/libs/pandautils/src/main/res/values-pt-rBR/strings.xml b/libs/pandautils/src/main/res/values-pt-rBR/strings.xml
index 7970c1fd1d..0f0ccf677d 100644
--- a/libs/pandautils/src/main/res/values-pt-rBR/strings.xml
+++ b/libs/pandautils/src/main/res/values-pt-rBR/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Em %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s a %2$s</string>
     <string name="schedule_todo_due_text">Para fazer: %s</string>
+    <string name="schedule_todo_due_text_new">Lista de tarefa: %s</string>
     <string name="schedule_due_text">Vencimento: %s</string>
     <string name="show_missing_items_title">Mostrar %d itens ausentes</string>
     <string name="hide_missing_items_title">Ocultar %d itens ausentes</string>
     <string name="schedule_error_message">Incapaz de buscar sua programação</string>
     <string name="schedule_todo_title">Lista de Tarefas</string>
+    <string name="schedule_todo_title_new">A fazer</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Observação do planejador</string>
     <string name="a11y_quiz">Teste</string>
     <string name="a11y_todo">Lista de Tarefas</string>
+    <string name="a11y_todo_new">A fazer</string>
     <string name="a11y_page">Página</string>
     <string name="a11y_assessment_request">Solicitação de avaliação</string>
     <string name="a11y_marked_as_done">Marcado como concluído</string>
diff --git a/libs/pandautils/src/main/res/values-pt-rPT/strings.xml b/libs/pandautils/src/main/res/values-pt-rPT/strings.xml
index 90958c43b3..aaefa50fbc 100644
--- a/libs/pandautils/src/main/res/values-pt-rPT/strings.xml
+++ b/libs/pandautils/src/main/res/values-pt-rPT/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Em %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s a %2$s</string>
     <string name="schedule_todo_due_text">Tarefa: %s</string>
+    <string name="schedule_todo_due_text_new">A fazer: %s</string>
     <string name="schedule_due_text">Data limite: %s</string>
     <string name="show_missing_items_title">Mostrar %d itens em falta</string>
     <string name="hide_missing_items_title">Ocultar %d itens em falta</string>
     <string name="schedule_error_message">Incapaz de ir buscar a sua agenda</string>
     <string name="schedule_todo_title">A Fazer</string>
+    <string name="schedule_todo_title_new">A fazer</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Nota do planeador</string>
     <string name="a11y_quiz">Teste</string>
     <string name="a11y_todo">A Fazer</string>
+    <string name="a11y_todo_new">A fazer</string>
     <string name="a11y_page">Página</string>
     <string name="a11y_assessment_request">Pedido de avaliação</string>
     <string name="a11y_marked_as_done">Marcado como terminado</string>
diff --git a/libs/pandautils/src/main/res/values-ru/strings.xml b/libs/pandautils/src/main/res/values-ru/strings.xml
index 0a8922d986..914e269de7 100644
--- a/libs/pandautils/src/main/res/values-ru/strings.xml
+++ b/libs/pandautils/src/main/res/values-ru/strings.xml
@@ -459,11 +459,13 @@
     <string name="schedule_calendar_event_due_text">В %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s до %2$s</string>
     <string name="schedule_todo_due_text">Задачи: %s</string>
+    <string name="schedule_todo_due_text_new">Задача: %s</string>
     <string name="schedule_due_text">Срок: %s</string>
     <string name="show_missing_items_title">Показать %d отсутствующие элементы</string>
     <string name="hide_missing_items_title">Скрыть %d отсутствующие элементы</string>
     <string name="schedule_error_message">Не удалось получить ваше расписание</string>
     <string name="schedule_todo_title">Задачи</string>
+    <string name="schedule_todo_title_new">Задача</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s баллов</item>
         <item quantity="one">%s баллов</item>
@@ -492,6 +494,7 @@
     <string name="a11y_planner_note">Примечание планировщика</string>
     <string name="a11y_quiz">Тест</string>
     <string name="a11y_todo">Задачи</string>
+    <string name="a11y_todo_new">Задача</string>
     <string name="a11y_page">Страница</string>
     <string name="a11y_assessment_request">Запрос задания</string>
     <string name="a11y_marked_as_done">Отмечено как выполненное</string>
diff --git a/libs/pandautils/src/main/res/values-sl/strings.xml b/libs/pandautils/src/main/res/values-sl/strings.xml
index 8dfea6df5c..17d78debb3 100644
--- a/libs/pandautils/src/main/res/values-sl/strings.xml
+++ b/libs/pandautils/src/main/res/values-sl/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">Ob %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s do %2$s</string>
     <string name="schedule_todo_due_text">Čakajoča opravila: %s</string>
+    <string name="schedule_todo_due_text_new">Opravilo: %s</string>
     <string name="schedule_due_text">Rok: %s</string>
     <string name="show_missing_items_title">Prikaži %d manjkajočih elementov</string>
     <string name="hide_missing_items_title">Skrij %d manjkajočih elementov</string>
     <string name="schedule_error_message">Vašega urnika ni mogoče pridobiti</string>
     <string name="schedule_todo_title">Čakajoča opravila</string>
+    <string name="schedule_todo_title_new">Opravilo</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s točka</item>
         <item quantity="one">%s točka</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Opomba orodja Planner</string>
     <string name="a11y_quiz">Kviz</string>
     <string name="a11y_todo">Čakajoča opravila</string>
+    <string name="a11y_todo_new">Opravilo</string>
     <string name="a11y_page">Stran</string>
     <string name="a11y_assessment_request">Zahteva za ocenjevanje</string>
     <string name="a11y_marked_as_done">Označi kot dokončano</string>
diff --git a/libs/pandautils/src/main/res/values-sv/strings.xml b/libs/pandautils/src/main/res/values-sv/strings.xml
index d7b8653770..c8921768e1 100644
--- a/libs/pandautils/src/main/res/values-sv/strings.xml
+++ b/libs/pandautils/src/main/res/values-sv/strings.xml
@@ -449,11 +449,13 @@
     <string name="schedule_calendar_event_due_text">kl. %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s till %2$s</string>
     <string name="schedule_todo_due_text">Att göra: %s</string>
+    <string name="schedule_todo_due_text_new">Att göra: %s</string>
     <string name="schedule_due_text">Förfallodatum: %s</string>
     <string name="show_missing_items_title">Visa %d saknade objekt</string>
     <string name="hide_missing_items_title">Dölj %d saknade objekt</string>
     <string name="schedule_error_message">Det gick inte att hämta ditt schema</string>
     <string name="schedule_todo_title">Att göra</string>
+    <string name="schedule_todo_title_new">Att göra</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s poäng</item>
         <item quantity="one">%s poäng</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planeringsanteckning</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">Att göra</string>
+    <string name="a11y_todo_new">Att göra</string>
     <string name="a11y_page">Sida</string>
     <string name="a11y_assessment_request">Uppgiftsbegäran</string>
     <string name="a11y_marked_as_done">Markera som färdig</string>
diff --git a/libs/pandautils/src/main/res/values-th/strings.xml b/libs/pandautils/src/main/res/values-th/strings.xml
index d0fddc62bd..11dcc1d5ab 100644
--- a/libs/pandautils/src/main/res/values-th/strings.xml
+++ b/libs/pandautils/src/main/res/values-th/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">เมื่อ %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s ถึง %2$s</string>
     <string name="schedule_todo_due_text">สิ่งที่ต้องทำ: %s</string>
+    <string name="schedule_todo_due_text_new">สิ่งที่ต้องทำ: %s</string>
     <string name="schedule_due_text">ครบกำหนด: %s</string>
     <string name="show_missing_items_title">แสดง %d รายการที่ขาดหาย</string>
     <string name="hide_missing_items_title">ซ่อน %d รายการที่ขาดหาย</string>
     <string name="schedule_error_message">ไม่สามารถสืบค้นกำหนดเวลาของคุณได้</string>
     <string name="schedule_todo_title">สิ่งที่ต้องทำ</string>
+    <string name="schedule_todo_title_new">สิ่งที่ต้องทำ</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s คะแนน</item>
         <item quantity="one">%s คะแนน</item>
@@ -479,6 +481,7 @@
     <string name="a11y_planner_note">หมายเหตุสำหรับแผนงาน</string>
     <string name="a11y_quiz">แบบทดสอบ</string>
     <string name="a11y_todo">สิ่งที่ต้องทำ</string>
+    <string name="a11y_todo_new">สิ่งที่ต้องทำ</string>
     <string name="a11y_page">หน้าเพจ</string>
     <string name="a11y_assessment_request">คำขอประเมิน</string>
     <string name="a11y_marked_as_done">กำกับว่าเสร็จสิ้นแล้ว</string>
diff --git a/libs/pandautils/src/main/res/values-vi/strings.xml b/libs/pandautils/src/main/res/values-vi/strings.xml
index df92a0c092..f9a4888f45 100644
--- a/libs/pandautils/src/main/res/values-vi/strings.xml
+++ b/libs/pandautils/src/main/res/values-vi/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">Vào %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s đến %2$s</string>
     <string name="schedule_todo_due_text">Việc Cần Làm: %s</string>
+    <string name="schedule_todo_due_text_new">Việc Cần Làm: %s</string>
     <string name="schedule_due_text">Hạn: %s</string>
     <string name="show_missing_items_title">Hiển thị %d mục bị thiếu</string>
     <string name="hide_missing_items_title">Ẩn %d mục bị thiếu</string>
     <string name="schedule_error_message">Không thể tìm nạp lịch trình của bạn</string>
     <string name="schedule_todo_title">Việc Cần Làm</string>
+    <string name="schedule_todo_title_new">Việc Cần Làm</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s điểm</item>
         <item quantity="one">%s điểm</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Ghi chú trình hoạch định</string>
     <string name="a11y_quiz">Kiểm Tra</string>
     <string name="a11y_todo">Việc Cần Làm</string>
+    <string name="a11y_todo_new">Việc Cần Làm</string>
     <string name="a11y_page">Trang</string>
     <string name="a11y_assessment_request">Yêu cầu đánh giá</string>
     <string name="a11y_marked_as_done">Được đánh dấu là đã xong</string>
diff --git a/libs/pandautils/src/main/res/values-zh/strings.xml b/libs/pandautils/src/main/res/values-zh/strings.xml
index 29f7249f7b..ec2d3bf373 100644
--- a/libs/pandautils/src/main/res/values-zh/strings.xml
+++ b/libs/pandautils/src/main/res/values-zh/strings.xml
@@ -445,11 +445,13 @@
     <string name="schedule_calendar_event_due_text">%s</string>
     <string name="schedule_calendar_event_interval_text">%1$s 至 %2$s</string>
     <string name="schedule_todo_due_text">待办事项：%s</string>
+    <string name="schedule_todo_due_text_new">待办：%s</string>
     <string name="schedule_due_text">到期：%s</string>
     <string name="show_missing_items_title">显示 %d 个缺失的项目</string>
     <string name="hide_missing_items_title">隐藏 %d 个缺失的项目</string>
     <string name="schedule_error_message">无法获取您的日程计划</string>
     <string name="schedule_todo_title">待办事项</string>
+    <string name="schedule_todo_title_new">待办</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s 分</item>
         <item quantity="other">%s 分</item>
@@ -472,6 +474,7 @@
     <string name="a11y_planner_note">计划者备注</string>
     <string name="a11y_quiz">测验</string>
     <string name="a11y_todo">待办事项</string>
+    <string name="a11y_todo_new">待办</string>
     <string name="a11y_page">页面</string>
     <string name="a11y_assessment_request">评估请求</string>
     <string name="a11y_marked_as_done">标记为完成</string>
diff --git a/libs/pandautils/src/main/res/values/strings.xml b/libs/pandautils/src/main/res/values/strings.xml
index 2e5db4f548..51772cfc49 100644
--- a/libs/pandautils/src/main/res/values/strings.xml
+++ b/libs/pandautils/src/main/res/values/strings.xml
@@ -450,11 +450,13 @@
     <string name="schedule_calendar_event_due_text">At %s</string>
     <string name="schedule_calendar_event_interval_text">%1$s to %2$s</string>
     <string name="schedule_todo_due_text">To Do: %s</string>
+    <string name="schedule_todo_due_text_new">To-do: %s</string>
     <string name="schedule_due_text">Due: %s</string>
     <string name="show_missing_items_title">Show %d missing items</string>
     <string name="hide_missing_items_title">Hide %d missing items</string>
     <string name="schedule_error_message">Unable to fetch your schedule</string>
     <string name="schedule_todo_title">To Do</string>
+    <string name="schedule_todo_title_new">To-do</string>
     <plurals name="schedule_points">
         <item quantity="zero">%s pt</item>
         <item quantity="one">%s pt</item>
@@ -478,6 +480,7 @@
     <string name="a11y_planner_note">Planner note</string>
     <string name="a11y_quiz">Quiz</string>
     <string name="a11y_todo">To Do</string>
+    <string name="a11y_todo_new">To-do</string>
     <string name="a11y_page">Page</string>
     <string name="a11y_assessment_request">Assessment request</string>
     <string name="a11y_marked_as_done">Marked as done</string>
diff --git a/libs/pandautils/src/main/res/values/themes_canvasthemes.xml b/libs/pandautils/src/main/res/values/themes_canvasthemes.xml
index f14c32f837..84033ddb27 100644
--- a/libs/pandautils/src/main/res/values/themes_canvasthemes.xml
+++ b/libs/pandautils/src/main/res/values/themes_canvasthemes.xml
@@ -57,7 +57,6 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="android:editTextStyle">@style/NoGifEditText</item>
         <item name="editTextStyle">@style/NoGifEditText</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
     <style name="CanvasMaterialTheme_Default.Translucent">
@@ -106,6 +105,5 @@
     </style>
 
     <style name="AvatarCropActivityTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 </resources>
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepositoryImplTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepositoryImplTest.kt
new file mode 100644
index 0000000000..5b1003b088
--- /dev/null
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/data/repository/accountdomain/AccountDomainRepositoryImplTest.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.pandautils.data.repository.accountdomain
+
+import com.instructure.canvasapi2.apis.AccountDomainInterface
+import com.instructure.canvasapi2.builders.RestParams
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.canvasapi2.utils.DataResult
+import com.instructure.canvasapi2.utils.LinkHeaders
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.slot
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+
+class AccountDomainRepositoryImplTest {
+
+    private val api: AccountDomainInterface = mockk(relaxed = true)
+    private lateinit var repository: AccountDomainRepositoryImpl
+
+    @Before
+    fun setUp() {
+        repository = AccountDomainRepositoryImpl(api)
+    }
+
+    @Test
+    fun `search returns account domains from API`() = runTest {
+        val domains = listOf(
+            AccountDomain(domain = "school1.instructure.com", name = "School 1"),
+            AccountDomain(domain = "school2.instructure.com", name = "School 2")
+        )
+
+        coEvery { api.campusSearch("school", any()) } returns DataResult.Success(domains)
+
+        val result = repository.search("school")
+
+        assertEquals(2, result.size)
+        assertEquals("school1.instructure.com", result[0].domain)
+        assertEquals("school2.instructure.com", result[1].domain)
+    }
+
+    @Test
+    fun `search returns empty list when API fails`() = runTest {
+        coEvery { api.campusSearch("school", any()) } returns DataResult.Fail()
+
+        val result = repository.search("school")
+
+        assertTrue(result.isEmpty())
+    }
+
+    @Test
+    fun `search returns empty list when API returns no results`() = runTest {
+        coEvery { api.campusSearch("xyz", any()) } returns DataResult.Success(emptyList())
+
+        val result = repository.search("xyz")
+
+        assertTrue(result.isEmpty())
+    }
+
+    @Test
+    fun `search passes correct RestParams`() = runTest {
+        val paramsSlot = slot<RestParams>()
+
+        coEvery { api.campusSearch(any(), capture(paramsSlot)) } returns DataResult.Success(emptyList())
+
+        repository.search("school")
+
+        assertTrue(paramsSlot.captured.usePerPageQueryParam)
+        assertTrue(paramsSlot.captured.isForceReadFromNetwork)
+    }
+
+    @Test
+    fun `search passes query to API`() = runTest {
+        coEvery { api.campusSearch(any(), any()) } returns DataResult.Success(emptyList())
+
+        repository.search("test query")
+
+        coVerify { api.campusSearch("test query", any()) }
+    }
+
+    @Test
+    fun `search depaginates results across multiple pages`() = runTest {
+        val page1 = listOf(AccountDomain(domain = "school1.instructure.com", name = "School 1"))
+        val page2 = listOf(AccountDomain(domain = "school2.instructure.com", name = "School 2"))
+        val page3 = listOf(AccountDomain(domain = "school3.instructure.com", name = "School 3"))
+
+        coEvery { api.campusSearch("school", any()) } returns DataResult.Success(
+            page1,
+            linkHeaders = LinkHeaders(nextUrl = "page2")
+        )
+        coEvery { api.next("page2", any()) } returns DataResult.Success(
+            page2,
+            linkHeaders = LinkHeaders(nextUrl = "page3")
+        )
+        coEvery { api.next("page3", any()) } returns DataResult.Success(page3)
+
+        val result = repository.search("school")
+
+        assertEquals(3, result.size)
+        assertEquals("school1.instructure.com", result[0].domain)
+        assertEquals("school2.instructure.com", result[1].domain)
+        assertEquals("school3.instructure.com", result[2].domain)
+    }
+
+    @Test
+    fun `search stops depagination when next page fails`() = runTest {
+        val page1 = listOf(AccountDomain(domain = "school1.instructure.com", name = "School 1"))
+
+        coEvery { api.campusSearch("school", any()) } returns DataResult.Success(
+            page1,
+            linkHeaders = LinkHeaders(nextUrl = "page2")
+        )
+        coEvery { api.next("page2", any()) } returns DataResult.Fail()
+
+        val result = repository.search("school")
+
+        assertEquals(1, result.size)
+        assertEquals("school1.instructure.com", result[0].domain)
+        coVerify(exactly = 0) { api.next("page3", any()) }
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/domain/usecase/accountdomain/SearchAccountDomainUseCaseTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/domain/usecase/accountdomain/SearchAccountDomainUseCaseTest.kt
new file mode 100644
index 0000000000..23ab04f77c
--- /dev/null
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/domain/usecase/accountdomain/SearchAccountDomainUseCaseTest.kt
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.pandautils.domain.usecase.accountdomain
+
+import com.instructure.canvasapi2.models.AccountDomain
+import com.instructure.pandautils.data.repository.accountdomain.AccountDomainRepository
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.mockk
+import io.mockk.unmockkAll
+import kotlinx.coroutines.test.runTest
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class SearchAccountDomainUseCaseTest {
+
+    private val repository: AccountDomainRepository = mockk(relaxed = true)
+    private val useCase = SearchAccountDomainUseCase(repository)
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `execute returns domains from repository`() = runTest {
+        val domains = listOf(
+            AccountDomain(domain = "school.instructure.com", name = "School"),
+            AccountDomain(domain = "university.instructure.com", name = "University")
+        )
+
+        coEvery { repository.search("school") } returns domains
+
+        val result = useCase(SearchAccountDomainUseCase.Params("school"))
+
+        assertEquals(2, result.size)
+        assertEquals("school.instructure.com", result[0].domain)
+        assertEquals("university.instructure.com", result[1].domain)
+    }
+
+    @Test
+    fun `execute returns empty list when query is shorter than 3 characters`() = runTest {
+        val result = useCase(SearchAccountDomainUseCase.Params("ab"))
+
+        assertTrue(result.isEmpty())
+        coVerify(exactly = 0) { repository.search(any()) }
+    }
+
+    @Test
+    fun `execute returns empty list for single character query`() = runTest {
+        val result = useCase(SearchAccountDomainUseCase.Params("a"))
+
+        assertTrue(result.isEmpty())
+        coVerify(exactly = 0) { repository.search(any()) }
+    }
+
+    @Test
+    fun `execute returns empty list for empty query`() = runTest {
+        val result = useCase(SearchAccountDomainUseCase.Params(""))
+
+        assertTrue(result.isEmpty())
+        coVerify(exactly = 0) { repository.search(any()) }
+    }
+
+    @Test
+    fun `execute calls repository when query is exactly 3 characters`() = runTest {
+        coEvery { repository.search("abc") } returns emptyList()
+
+        useCase(SearchAccountDomainUseCase.Params("abc"))
+
+        coVerify(exactly = 1) { repository.search("abc") }
+    }
+
+    @Test
+    fun `execute passes query to repository`() = runTest {
+        coEvery { repository.search(any()) } returns emptyList()
+
+        useCase(SearchAccountDomainUseCase.Params("test university"))
+
+        coVerify(exactly = 1) { repository.search("test university") }
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendar/CalendarViewModelTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendar/CalendarViewModelTest.kt
index e96c14f53f..c3a00e62d4 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendar/CalendarViewModelTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendar/CalendarViewModelTest.kt
@@ -110,7 +110,7 @@ class CalendarViewModelTest {
             "${args[0]} ${args[1]} - ${args[2]}"
         }
 
-        every { context.getString(eq(R.string.courseToDo), any()) } answers {
+        every { context.getString(eq(R.string.courseToDoNew), any()) } answers {
             val args = secondArg<Array<Any>>()
             "${args[0]} To Do"
         }
@@ -129,7 +129,7 @@ class CalendarViewModelTest {
         every { context.getString(R.string.calendarEventMissing) } returns "missing"
         every { context.getString(R.string.calendarEventGraded) } returns "graded"
         every { context.getString(R.string.calendarEventSubmitted) } returns "needs grading"
-        every { context.getString(R.string.userCalendarToDo) } returns "To Do"
+        every { context.getString(R.string.userCalendarToDoNew) } returns "To Do"
         every { context.getString(eq(R.string.calendarEventPoints), any()) } answers {
             val args = secondArg<Array<Any>>()
             "${args[0]} pts"
@@ -936,24 +936,31 @@ class CalendarViewModelTest {
                 3,
                 PlannableType.ASSIGNMENT,
                 createDate(2023, 4, 20, 12),
-                submissionState = SubmissionState(graded = true)
+                submissionState = SubmissionState(graded = true, postedAt = Date())
             ),
             createPlannerItem(
-                2,
+                1,
                 4,
                 PlannableType.ASSIGNMENT,
                 createDate(2023, 4, 20, 12),
-                submissionState = SubmissionState(needsGrading = true)
+                submissionState = SubmissionState(graded = true, postedAt = null)
             ),
             createPlannerItem(
                 2,
                 5,
                 PlannableType.ASSIGNMENT,
                 createDate(2023, 4, 20, 12),
+                submissionState = SubmissionState(needsGrading = true)
+            ),
+            createPlannerItem(
+                2,
+                6,
+                PlannableType.ASSIGNMENT,
+                createDate(2023, 4, 20, 12),
                 pointsPossible = 10.0,
                 submissionState = SubmissionState()
             ),
-            createPlannerItem(2, 6, PlannableType.ASSIGNMENT, createDate(2023, 4, 20, 12), submissionState = SubmissionState()),
+            createPlannerItem(2, 7, PlannableType.ASSIGNMENT, createDate(2023, 4, 20, 12), submissionState = SubmissionState()),
         )
         coEvery { calendarRepository.getPlannerItems(any(), any(), any(), any()) } returns events
         initViewModel()
@@ -963,8 +970,9 @@ class CalendarViewModelTest {
         assertEquals("missing", currentPageEvents[1].status)
         assertEquals("graded", currentPageEvents[2].status)
         assertEquals("needs grading", currentPageEvents[3].status)
-        assertEquals("10 pts", currentPageEvents[4].status)
-        assertNull(currentPageEvents[5].status)
+        assertEquals("needs grading", currentPageEvents[4].status)
+        assertEquals("10 pts", currentPageEvents[5].status)
+        assertNull(currentPageEvents[6].status)
     }
 
     @Test
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModelTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModelTest.kt
index e6be65efcc..2a6d7daa4d 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModelTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/createupdate/CreateUpdateToDoViewModelTest.kt
@@ -221,7 +221,7 @@ class CreateUpdateToDoViewModelTest {
 
     @Test
     fun `Save ToDo failed`() {
-        every { resources.getString(R.string.todoSaveErrorMessage) } returns "Failed to save ToDo"
+        every { resources.getString(R.string.todoSaveErrorMessageNew) } returns "Failed to save ToDo"
         coEvery { repository.createToDo(any(), any(), any(), any()) } throws Exception()
 
         createViewModel()
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModelTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModelTest.kt
index 75a957c84a..1daa04bf85 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModelTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/calendartodo/details/ToDoViewModelTest.kt
@@ -171,7 +171,7 @@ class ToDoViewModelTest {
 
     @Test
     fun `Error deleting ToDo`() = runTest {
-        every { context.getString(R.string.todoDeleteErrorMessage) } returns "Error deleting to do"
+        every { context.getString(R.string.todoDeleteErrorMessageNew) } returns "Error deleting to do"
         coEvery { toDoRepository.deletePlannerNote(any()) } throws Exception()
 
         viewModel.handleAction(ToDoAction.DeleteToDo)
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModelTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModelTest.kt
index 4955581882..e8020c3b00 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModelTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/elementary/schedule/ScheduleViewModelTest.kt
@@ -1027,7 +1027,7 @@ class ScheduleViewModelTest {
         every { resources.getString(R.string.tomorrow) } returns "Tomorrow"
         every { resources.getString(R.string.yesterday) } returns "Yesterday"
         every { resources.getString(R.string.today) } returns "Today"
-        every { resources.getString(R.string.schedule_todo_title) } returns "To Do"
+        every { resources.getString(R.string.schedule_todo_title_new) } returns "To Do"
         every { resources.getQuantityString(R.plurals.schedule_tag_replies, 2, 2) } returns "2 Replies"
         every { resources.getQuantityString(R.plurals.schedule_tag_replies, 1, 1) } returns "1 Reply"
         every { resources.getQuantityString(R.plurals.schedule_points, 20, "20") } returns "20 pts"
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/file/upload/FileUploadViewModelTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/file/upload/FileUploadViewModelTest.kt
index 0fa5fcd18d..e361ac1cc9 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/features/file/upload/FileUploadViewModelTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/file/upload/FileUploadViewModelTest.kt
@@ -27,6 +27,7 @@ import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.Course
 import com.instructure.canvasapi2.models.postmodels.FileSubmitObject
 import com.instructure.pandautils.R
+import com.instructure.pandautils.features.file.upload.scanner.DocumentScannerManager
 import com.instructure.pandautils.room.appdatabase.daos.FileUploadInputDao
 import io.mockk.every
 import io.mockk.mockk
@@ -40,6 +41,8 @@ import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
 import org.junit.After
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -59,6 +62,7 @@ class FileUploadViewModelTest {
     private val fileUploadUtilsHelper: FileUploadUtilsHelper = mockk(relaxed = true)
     private val workManager: WorkManager = mockk(relaxed = true)
     private val fileUploadInputDao: FileUploadInputDao = mockk(relaxed = true)
+    private val documentScannerManager: DocumentScannerManager = mockk(relaxed = true)
 
     @Before
     fun setUp() {
@@ -345,7 +349,46 @@ class FileUploadViewModelTest {
         return FileSubmitObject(fileName, fileSize, "file", "/$fileName")
     }
 
+    @Test
+    fun `Scanner clicked emits LaunchScanner action`() {
+        val viewModel = createViewModel()
+        viewModel.events.observe(lifecycleOwner) {}
+
+        viewModel.onScannerClicked()
+
+        assertEquals(FileUploadAction.LaunchScanner, viewModel.events.value?.getContentIfNotHandled())
+    }
+
+    @Test
+    fun `Scanner clicked shows toast when one file only and file exists`() {
+        val uri: Uri = mockk(relaxed = true)
+        val viewModel = createViewModel()
+        val course = createCourse(1L, "Course 1")
+        val assignment = createAssignment(1L, "Assignment 1", 1L, listOf("pdf"))
+        val submitObject = createSubmitObject("test.pdf")
+
+        every { fileUploadUtilsHelper.getFileSubmitObjectFromInputStream(any(), any(), any()) } returns submitObject
+
+        viewModel.setData(assignment, arrayListOf(uri), FileUploadType.QUIZ, course, -1L, -1L, -1, -1L, -1L, null)
+
+        viewModel.events.observe(lifecycleOwner) {}
+
+        viewModel.onScannerClicked()
+        assertEquals(FileUploadAction.ShowToast("This submission only accepts one file upload"), viewModel.events.value?.getContentIfNotHandled())
+    }
+
+    @Test
+    fun `Scanner available delegates to DocumentScannerManager`() {
+        every { documentScannerManager.isDeviceSupported() } returns true
+        val viewModel = createViewModel()
+        assertTrue(viewModel.scannerAvailable)
+
+        every { documentScannerManager.isDeviceSupported() } returns false
+        val viewModel2 = createViewModel()
+        assertFalse(viewModel2.scannerAvailable)
+    }
+
     private fun createViewModel(): FileUploadDialogViewModel {
-        return FileUploadDialogViewModel(fileUploadUtilsHelper, resources, workManager, fileUploadInputDao)
+        return FileUploadDialogViewModel(fileUploadUtilsHelper, resources, workManager, fileUploadInputDao, documentScannerManager)
     }
 }
\ No newline at end of file
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/file/upload/scanner/DocumentScannerManagerTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/file/upload/scanner/DocumentScannerManagerTest.kt
new file mode 100644
index 0000000000..30e47cb468
--- /dev/null
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/file/upload/scanner/DocumentScannerManagerTest.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ */
+package com.instructure.pandautils.features.file.upload.scanner
+
+import android.app.ActivityManager
+import android.content.Context
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.slot
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+
+class DocumentScannerManagerTest {
+
+    private val context: Context = mockk(relaxed = true)
+    private val activityManager: ActivityManager = mockk(relaxed = true)
+
+    private lateinit var documentScannerManager: DocumentScannerManager
+
+    @Before
+    fun setup() {
+        every { context.getSystemService(Context.ACTIVITY_SERVICE) } returns activityManager
+        documentScannerManager = DocumentScannerManager(context)
+    }
+
+    @Test
+    fun `isDeviceSupported returns true when RAM is above threshold`() {
+        val memoryInfo = ActivityManager.MemoryInfo()
+        memoryInfo.totalMem = (2L * 1024 * 1024 * 1024) // 2 GB
+        val slot = slot<ActivityManager.MemoryInfo>()
+        every { activityManager.getMemoryInfo(capture(slot)) } answers {
+            slot.captured.totalMem = memoryInfo.totalMem
+        }
+
+        assertTrue(documentScannerManager.isDeviceSupported())
+    }
+
+    @Test
+    fun `isDeviceSupported returns false when RAM is below threshold`() {
+        val memoryInfo = ActivityManager.MemoryInfo()
+        memoryInfo.totalMem = (1L * 1024 * 1024 * 1024) // 1 GB
+        val slot = slot<ActivityManager.MemoryInfo>()
+        every { activityManager.getMemoryInfo(capture(slot)) } answers {
+            slot.captured.totalMem = memoryInfo.totalMem
+        }
+
+        assertFalse(documentScannerManager.isDeviceSupported())
+    }
+
+    @Test
+    fun `isDeviceSupported returns true when RAM is just above threshold`() {
+        val slot = slot<ActivityManager.MemoryInfo>()
+        every { activityManager.getMemoryInfo(capture(slot)) } answers {
+            slot.captured.totalMem = (1.8 * 1024 * 1024 * 1024).toLong()
+        }
+
+        assertTrue(documentScannerManager.isDeviceSupported())
+    }
+
+    @Test
+    fun `generateFileName follows expected format`() {
+        val fileName = documentScannerManager.generateFileName()
+
+        assertTrue(fileName.startsWith("Scanned_Document_"))
+        assertTrue(fileName.endsWith(".pdf"))
+    }
+
+    @Test
+    fun `handleScanResultFromIntent returns empty result for null intent`() {
+        val result = documentScannerManager.handleScanResultFromIntent(null)
+
+        assertNull(result.pdfUri)
+        assertTrue(result.pageUris.isEmpty())
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModelTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModelTest.kt
index 6a9ee83c1e..dabcec9f9e 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModelTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/inbox/details/InboxDetailsViewModelTest.kt
@@ -17,6 +17,7 @@ package com.instructure.pandautils.features.inbox.details
 
 import android.content.Context
 import androidx.lifecycle.SavedStateHandle
+import com.instructure.canvasapi2.apis.InboxApi
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.models.BasicUser
 import com.instructure.canvasapi2.models.Conversation
@@ -72,6 +73,7 @@ class InboxDetailsViewModelTest {
         coEvery { inboxDetailsRepository.getConversation(any(), any(), any()) } returns DataResult.Success(conversation)
         coEvery { savedStateHandle.get<Long>(InboxDetailsFragment.CONVERSATION_ID) } returns conversation.id
         coEvery { savedStateHandle.get<Boolean>(InboxDetailsFragment.UNREAD) } returns false
+        coEvery { savedStateHandle.get<String>(InboxDetailsFragment.SCOPE) } returns null
         coEvery { context.getString(
             com.instructure.pandautils.R.string.inboxForwardSubjectFwPrefix,
             conversation.subject
@@ -444,6 +446,42 @@ class InboxDetailsViewModelTest {
         coVerify(exactly = 1) { inboxDetailsRepository.updateState(conversation.id, newState) }
     }
 
+    @Test
+    fun `Test archiving conversation shows archived snackbar`() = runTest {
+        val viewModel = getViewModel()
+        val newState = Conversation.WorkflowState.ARCHIVED
+        val newConversation = conversation.copy(workflowState = newState)
+
+        coEvery { inboxDetailsRepository.updateState(conversation.id, newState) } returns DataResult.Success(newConversation)
+
+        val events = mutableListOf<InboxDetailsFragmentAction>()
+        backgroundScope.launch(testDispatcher) {
+            viewModel.events.toList(events)
+        }
+
+        viewModel.handleAction(InboxDetailsAction.UpdateState(conversation.id, newState))
+
+        assertEquals(InboxDetailsFragmentAction.ShowScreenResult(context.getString(R.string.conversationArchived)), events[0])
+    }
+
+    @Test
+    fun `Test unarchiving conversation shows unarchived snackbar`() = runTest {
+        val viewModel = getViewModel()
+        val newState = Conversation.WorkflowState.READ
+        val newConversation = conversation.copy(workflowState = newState)
+
+        coEvery { inboxDetailsRepository.updateState(conversation.id, newState) } returns DataResult.Success(newConversation)
+
+        val events = mutableListOf<InboxDetailsFragmentAction>()
+        backgroundScope.launch(testDispatcher) {
+            viewModel.events.toList(events)
+        }
+
+        viewModel.handleAction(InboxDetailsAction.UpdateState(conversation.id, newState))
+
+        assertEquals(InboxDetailsFragmentAction.ShowScreenResult(context.getString(R.string.conversationUnarchived)), events[0])
+    }
+
     @Test
     fun `Test Conversation workflow state update failed`() = runTest {
         val viewModel = getViewModel()
@@ -678,6 +716,24 @@ class InboxDetailsViewModelTest {
         }
     }
 
+    @Test
+    fun `Test Sent scope hides archive option`() {
+        coEvery { savedStateHandle.get<String>(InboxDetailsFragment.SCOPE) } returns InboxApi.Scope.SENT.name
+        val viewModel = getViewModel()
+
+        assertEquals(false, viewModel.uiState.value.showArchiveOption)
+    }
+
+    @Test
+    fun `Test non-Sent scope shows archive option`() {
+        InboxApi.Scope.entries.filter { it != InboxApi.Scope.SENT }.forEach { scope ->
+            coEvery { savedStateHandle.get<String>(InboxDetailsFragment.SCOPE) } returns scope.name
+            val viewModel = getViewModel()
+
+            assertEquals(true, viewModel.uiState.value.showArchiveOption)
+        }
+    }
+
     // endregion
 
     private fun getViewModel(): InboxDetailsViewModel {
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/offline/sync/StudioOfflineVideoHelperTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/offline/sync/StudioOfflineVideoHelperTest.kt
new file mode 100644
index 0000000000..3378684dad
--- /dev/null
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/offline/sync/StudioOfflineVideoHelperTest.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2026 - present Instructure, Inc.
+ *
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *
+ */
+
+package com.instructure.pandautils.features.offline.sync
+
+import android.content.Context
+import com.instructure.canvasapi2.models.User
+import com.instructure.canvasapi2.utils.ApiPrefs
+import io.mockk.every
+import io.mockk.mockk
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertNull
+import junit.framework.TestCase.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+import java.io.File
+
+class StudioOfflineVideoHelperTest {
+
+    @get:Rule
+    val tempFolder = TemporaryFolder()
+
+    private val context: Context = mockk()
+    private val apiPrefs: ApiPrefs = mockk()
+
+    private lateinit var helper: StudioOfflineVideoHelper
+
+    @Before
+    fun setup() {
+        every { context.filesDir } returns tempFolder.root
+        every { apiPrefs.user } returns User(id = 42)
+        helper = StudioOfflineVideoHelper(context, apiPrefs)
+    }
+
+    // region getStudioMediaId
+
+    @Test
+    fun `getStudioMediaId returns media id from standard LTI launch URL`() {
+        val url = "https://example.instructuremedia.com/lti/launch?custom_arc_launch_type=embed&custom_arc_media_id=abc-123&custom_arc_start_at=0"
+        assertEquals("abc-123", helper.getStudioMediaId(url))
+    }
+
+    @Test
+    fun `getStudioMediaId returns media id when it is the first parameter`() {
+        val url = "https://example.com/lti/launch?custom_arc_media_id=first-param"
+        assertEquals("first-param", helper.getStudioMediaId(url))
+    }
+
+    @Test
+    fun `getStudioMediaId returns media id when it is the last parameter`() {
+        val url = "https://example.com/lti/launch?custom_arc_launch_type=embed&custom_arc_media_id=last-param"
+        assertEquals("last-param", helper.getStudioMediaId(url))
+    }
+
+    @Test
+    fun `getStudioMediaId returns null for URL without media id`() {
+        val url = "https://example.com/lti/launch?custom_arc_launch_type=embed&custom_arc_start_at=0"
+        assertNull(helper.getStudioMediaId(url))
+    }
+
+    @Test
+    fun `getStudioMediaId returns null for null input`() {
+        assertNull(helper.getStudioMediaId(null))
+    }
+
+    @Test
+    fun `getStudioMediaId returns null for empty string`() {
+        assertNull(helper.getStudioMediaId(""))
+    }
+
+    @Test
+    fun `getStudioMediaId returns null for non-Studio external URL`() {
+        val url = "https://example.com/some-external-tool?param=value"
+        assertNull(helper.getStudioMediaId(url))
+    }
+
+    @Test
+    fun `getStudioMediaId handles UUID-style media ids`() {
+        val url = "https://example.com/lti/launch?custom_arc_media_id=e4be8b75-1234-5678-9abc-def012345678&custom_arc_start_at=0"
+        assertEquals("e4be8b75-1234-5678-9abc-def012345678", helper.getStudioMediaId(url))
+    }
+
+    // endregion
+
+    // region isStudioVideoAvailableOffline
+
+    @Test
+    fun `isStudioVideoAvailableOffline returns true when video file exists`() {
+        val mediaId = "test-media-id"
+        createVideoFile(mediaId)
+        assertTrue(helper.isStudioVideoAvailableOffline(mediaId))
+    }
+
+    @Test
+    fun `isStudioVideoAvailableOffline returns false when video file does not exist`() {
+        assertFalse(helper.isStudioVideoAvailableOffline("nonexistent-id"))
+    }
+
+    @Test
+    fun `isStudioVideoAvailableOffline returns false when directory exists but file does not`() {
+        val mediaId = "dir-only"
+        File(tempFolder.root, "42/studio/$mediaId").mkdirs()
+        assertFalse(helper.isStudioVideoAvailableOffline(mediaId))
+    }
+
+    // endregion
+
+    // region getStudioVideoUri
+
+    @Test
+    fun `getStudioVideoUri returns correct file URI`() {
+        val mediaId = "video-id"
+        createVideoFile(mediaId)
+        val expected = "file://${tempFolder.root.absolutePath}/42/studio/$mediaId/$mediaId.mp4"
+        assertEquals(expected, helper.getStudioVideoUri(mediaId))
+    }
+
+    // endregion
+
+    // region getStudioPosterUri
+
+    @Test
+    fun `getStudioPosterUri returns file URI when poster exists`() {
+        val mediaId = "poster-id"
+        createPosterFile(mediaId)
+        val expected = "file://${tempFolder.root.absolutePath}/42/studio/$mediaId/poster.jpg"
+        assertEquals(expected, helper.getStudioPosterUri(mediaId))
+    }
+
+    @Test
+    fun `getStudioPosterUri returns null when poster does not exist`() {
+        val mediaId = "no-poster-id"
+        createVideoFile(mediaId)
+        assertNull(helper.getStudioPosterUri(mediaId))
+    }
+
+    @Test
+    fun `getStudioPosterUri returns null when directory does not exist`() {
+        assertNull(helper.getStudioPosterUri("nonexistent"))
+    }
+
+    // endregion
+
+    // region user id handling
+
+    @Test
+    fun `uses correct user directory from ApiPrefs`() {
+        every { apiPrefs.user } returns User(id = 99)
+        val newHelper = StudioOfflineVideoHelper(context, apiPrefs)
+        val mediaId = "user-test"
+
+        val dir = File(tempFolder.root, "99/studio/$mediaId")
+        dir.mkdirs()
+        File(dir, "$mediaId.mp4").createNewFile()
+
+        assertTrue(newHelper.isStudioVideoAvailableOffline(mediaId))
+    }
+
+    // endregion
+
+    private fun createVideoFile(mediaId: String) {
+        val dir = File(tempFolder.root, "42/studio/$mediaId")
+        dir.mkdirs()
+        File(dir, "$mediaId.mp4").createNewFile()
+    }
+
+    private fun createPosterFile(mediaId: String) {
+        val dir = File(tempFolder.root, "42/studio/$mediaId")
+        dir.mkdirs()
+        File(dir, "poster.jpg").createNewFile()
+    }
+}
\ No newline at end of file
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/features/offline/sync/progress/AggregateProgressObserverTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/features/offline/sync/progress/AggregateProgressObserverTest.kt
index f021eb8699..e3d15687cb 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/features/offline/sync/progress/AggregateProgressObserverTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/features/offline/sync/progress/AggregateProgressObserverTest.kt
@@ -20,7 +20,6 @@ package com.instructure.pandautils.features.offline.sync.progress
 
 import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.MutableLiveData
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.instructure.canvasapi2.utils.NumberHelper
 import com.instructure.pandautils.features.offline.sync.AggregateProgressObserver
@@ -41,6 +40,7 @@ import io.mockk.unmockkAll
 import junit.framework.TestCase.assertEquals
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
@@ -73,6 +73,10 @@ class AggregateProgressObserverTest {
             "${captor.captured} bytes"
         }
 
+        every { courseSyncProgressDao.findAllFlow() } returns MutableStateFlow(emptyList())
+        every { fileSyncProgressDao.findAllFlow() } returns MutableStateFlow(emptyList())
+        every { studioMediaProgressDao.findAllFlow() } returns MutableStateFlow(emptyList())
+
         Dispatchers.setMain(testDispatcher)
     }
 
@@ -91,9 +95,9 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.IN_PROGRESS
         )
 
-        val courseProgressLiveData = MutableLiveData(listOf(courseProgress))
+        val courseProgressFlow = MutableStateFlow(listOf(courseProgress))
 
-        every { courseSyncProgressDao.findAllLiveData() } returns courseProgressLiveData
+        every { courseSyncProgressDao.findAllFlow() } returns courseProgressFlow
 
         aggregateProgressObserver = createObserver()
 
@@ -109,7 +113,7 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.COMPLETED
         )
 
-        courseProgressLiveData.postValue(listOf(courseProgress))
+        courseProgressFlow.value = listOf(courseProgress)
 
         assertEquals(100, aggregateProgressObserver.progressData.value?.progress)
         assertEquals(ProgressState.COMPLETED, aggregateProgressObserver.progressData.value?.progressState)
@@ -143,11 +147,11 @@ class AggregateProgressObserverTest {
             fileSize = 2000, progressState = ProgressState.IN_PROGRESS, fileId = 2L
         )
 
-        val courseLiveData = MutableLiveData(listOf(course1, course2))
-        val fileLiveData = MutableLiveData(listOf(file1, file2))
+        val courseFlow = MutableStateFlow(listOf(course1, course2))
+        val fileFlow = MutableStateFlow(listOf(file1, file2))
 
-        every { courseSyncProgressDao.findAllLiveData() } returns courseLiveData
-        every { fileSyncProgressDao.findAllLiveData() } returns fileLiveData
+        every { courseSyncProgressDao.findAllFlow() } returns courseFlow
+        every { fileSyncProgressDao.findAllFlow() } returns fileFlow
 
         aggregateProgressObserver = createObserver()
 
@@ -167,8 +171,8 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.COMPLETED
         )
 
-        courseLiveData.postValue(listOf(course1, course2))
-        fileLiveData.postValue(listOf(file1, file2))
+        courseFlow.value = listOf(course1, course2)
+        fileFlow.value = listOf(file1, file2)
 
         assertEquals(49, aggregateProgressObserver.progressData.value?.progress)
 
@@ -182,8 +186,8 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.COMPLETED
         )
 
-        courseLiveData.postValue(listOf(course1, course2))
-        fileLiveData.postValue(listOf(file1, file2))
+        courseFlow.value = listOf(course1, course2)
+        fileFlow.value = listOf(file1, file2)
 
         assertEquals(100, aggregateProgressObserver.progressData.value?.progress)
         assertEquals(ProgressState.COMPLETED, aggregateProgressObserver.progressData.value?.progressState)
@@ -199,7 +203,7 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.IN_PROGRESS
         )
 
-        val courseLiveData = MutableLiveData(listOf(course1Progress))
+        val courseFlow = MutableStateFlow(listOf(course1Progress))
 
         var file1Progress =
             FileSyncProgressEntity(
@@ -229,10 +233,10 @@ class AggregateProgressObserverTest {
             fileId = 3L
         )
 
-        val fileLiveData = MutableLiveData(listOf(file1Progress, file2Progress, file3Progress))
+        val fileFlow = MutableStateFlow(listOf(file1Progress, file2Progress, file3Progress))
 
-        every { courseSyncProgressDao.findAllLiveData() } returns courseLiveData
-        every { fileSyncProgressDao.findAllLiveData() } returns fileLiveData
+        every { courseSyncProgressDao.findAllFlow() } returns courseFlow
+        every { fileSyncProgressDao.findAllFlow() } returns fileFlow
 
         aggregateProgressObserver = createObserver()
 
@@ -250,8 +254,8 @@ class AggregateProgressObserverTest {
             tabs = CourseSyncSettingsEntity.TABS.associateWith { TabSyncData(it, ProgressState.COMPLETED) },
         )
 
-        courseLiveData.postValue(listOf(course1Progress))
-        fileLiveData.postValue(listOf(file1Progress, file2Progress, file3Progress))
+        courseFlow.value = listOf(course1Progress)
+        fileFlow.value = listOf(file1Progress, file2Progress, file3Progress)
 
         // Course tabs and files are completed, but additional files are still in progress
         assertEquals(99, aggregateProgressObserver.progressData.value?.progress)
@@ -268,7 +272,7 @@ class AggregateProgressObserverTest {
             fileId = 3L
         )
 
-        fileLiveData.postValue(listOf(file1Progress, file2Progress, file3Progress))
+        fileFlow.value = listOf(file1Progress, file2Progress, file3Progress)
 
         // Total size is updated with the external file
         assertEquals("${1000000 + 1000 + 2000 + 3000} bytes", aggregateProgressObserver.progressData.value?.totalSize)
@@ -286,10 +290,8 @@ class AggregateProgressObserverTest {
         course1Progress = course1Progress.copy(
             progressState = ProgressState.COMPLETED
         )
-        courseLiveData.postValue(listOf(course1Progress))
-        fileLiveData.postValue(
-            listOf(file1Progress, file2Progress, file3Progress)
-        )
+        courseFlow.value = listOf(course1Progress)
+        fileFlow.value = listOf(file1Progress, file2Progress, file3Progress)
 
         // External files are downloaded, progress should be 100%
         assertEquals(
@@ -308,7 +310,7 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.IN_PROGRESS
         )
 
-        val courseLiveData = MutableLiveData(listOf(course1Progress))
+        val courseFlow = MutableStateFlow(listOf(course1Progress))
 
         var file1Progress =
             FileSyncProgressEntity(
@@ -322,12 +324,12 @@ class AggregateProgressObserverTest {
 
         var studioMediaProgress = StudioMediaProgressEntity("1234", 0, 2000, ProgressState.IN_PROGRESS, 1L)
 
-        val fileLiveData = MutableLiveData(listOf(file1Progress))
-        val studioLiveData = MutableLiveData(listOf(studioMediaProgress))
+        val fileFlow = MutableStateFlow(listOf(file1Progress))
+        val studioFlow = MutableStateFlow(listOf(studioMediaProgress))
 
-        every { courseSyncProgressDao.findAllLiveData() } returns courseLiveData
-        every { fileSyncProgressDao.findAllLiveData() } returns fileLiveData
-        every { studioMediaProgressDao.findAllLiveData() } returns studioLiveData
+        every { courseSyncProgressDao.findAllFlow() } returns courseFlow
+        every { fileSyncProgressDao.findAllFlow() } returns fileFlow
+        every { studioMediaProgressDao.findAllFlow() } returns studioFlow
 
         aggregateProgressObserver = createObserver()
 
@@ -346,14 +348,14 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.COMPLETED
         )
 
-        courseLiveData.postValue(listOf(course1Progress))
-        fileLiveData.postValue(listOf(file1Progress))
+        courseFlow.value = listOf(course1Progress)
+        fileFlow.value = listOf(file1Progress)
 
         // Course tabs and files are completed, but studio media is still in progress
         assertEquals(99, aggregateProgressObserver.progressData.value?.progress)
 
         studioMediaProgress = studioMediaProgress.copy(progress = 100, progressState = ProgressState.COMPLETED)
-        studioLiveData.postValue(listOf(studioMediaProgress))
+        studioFlow.value = listOf(studioMediaProgress)
 
         // External files are downloaded, progress should be 100%
         assertEquals(
@@ -371,9 +373,9 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.IN_PROGRESS
         )
 
-        val courseLiveData = MutableLiveData(listOf(course1))
+        val courseFlow = MutableStateFlow(listOf(course1))
 
-        every { courseSyncProgressDao.findAllLiveData() } returns courseLiveData
+        every { courseSyncProgressDao.findAllFlow() } returns courseFlow
 
         aggregateProgressObserver = createObserver()
 
@@ -382,7 +384,7 @@ class AggregateProgressObserverTest {
             progressState = ProgressState.ERROR
         )
 
-        courseLiveData.postValue(listOf(course1))
+        courseFlow.value = listOf(course1)
 
         assertEquals(ProgressState.ERROR, aggregateProgressObserver.progressData.value?.progressState)
     }
diff --git a/libs/pandautils/src/test/java/com/instructure/pandautils/utils/PlannerItemExtensionsTest.kt b/libs/pandautils/src/test/java/com/instructure/pandautils/utils/PlannerItemExtensionsTest.kt
index c46eaa65da..c463d12288 100644
--- a/libs/pandautils/src/test/java/com/instructure/pandautils/utils/PlannerItemExtensionsTest.kt
+++ b/libs/pandautils/src/test/java/com/instructure/pandautils/utils/PlannerItemExtensionsTest.kt
@@ -283,7 +283,7 @@ class PlannerItemExtensionsTest {
             contextName = null
         )
 
-        every { context.getString(R.string.userCalendarToDo) } returns "User To-Do"
+        every { context.getString(R.string.userCalendarToDoNew) } returns "User To-Do"
 
         val result = plannerItem.getContextNameForPlannerItem(context, emptyList())
 
@@ -299,7 +299,7 @@ class PlannerItemExtensionsTest {
             contextName = "Computer Science"
         )
 
-        every { context.getString(R.string.courseToDo, "CS101") } returns "CS101 To-Do"
+        every { context.getString(R.string.courseToDoNew, "CS101") } returns "CS101 To-Do"
 
         val result = plannerItem.getContextNameForPlannerItem(context, listOf(course))
 
diff --git a/translations/import.rb b/translations/import.rb
index ba665b3a45..f4e95dea4b 100755
--- a/translations/import.rb
+++ b/translations/import.rb
@@ -4,8 +4,6 @@
 
 projects_json = File.join('translations', 'projects.json')
 
-hub_config = File.join(Dir.home, '.config', 'hub')
-
 s3_source = 's3://instructure-translations/translations/android-canvas/'
 
 # Projects json file is required
@@ -13,12 +11,6 @@
   raise 'Missing projects.json; please run again from repository root'
 end
 
-# Hub CLI and valid config are required for creating Pull Requests
-raise 'Missing Hub CLI' if find_executable('hub').nil?
-unless File.exist?(hub_config) || !ENV['GITHUB_TOKEN'].nil?
-  raise 'Must specify GITHUB_TOKEN or place Hub config at ~/.config/hub'
-end
-
 # AWS CLI and credentials are required for accessing the S3 bucket
 raise 'Missing AWS CLI' if find_executable('aws').nil?
 raise 'Missing AWS access key ID' if ENV['AWS_ACCESS_KEY_ID'].nil?
@@ -60,7 +52,7 @@
   next unless File.directory? src_dir
   Dir.glob("#{src_dir}/*.{xml,arb}") do |file|
     language = File.basename(src_dir).gsub('_', '-')
-    
+
     # Fix Chinese directories
     if file.end_with?('.xml')
       language = language.gsub('zh-', 'b+zh+')
@@ -127,9 +119,4 @@
 success = system('git push origin HEAD')
 raise 'Failed to push new git branch' unless success
 
-# Create pull request
-success = system('hub pull-request -b master -m "Update translations"')
-raise 'Failed to create pull request' unless success
-
 puts 'Translations successfully imported!'
-puts 'PLEASE REVIEW THE PULL REQUEST'