diff --git a/src/components/Omr/OmrModal.vue b/src/components/Omr/OmrModal.vue
index 8ae449f..46ae674 100644
--- a/src/components/Omr/OmrModal.vue
+++ b/src/components/Omr/OmrModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col bg-white w-full h-full overflow-auto justify-between">
     <Header class="fixed top-0" v-if="isQuizAssessment" :hasQuizEnded="hasQuizEnded"
-      :hasTimeLimit="quizTimeLimit != null" :title="title" :userId="userId" :isOmrMode="isOmrMode"
+      :hasTimeLimit="quizTimeLimit != null" :title="title" :userId="userId" :isOmrMode=true
       :isSessionAnswerRequestProcessing="isSessionAnswerRequestProcessing" v-model:isPaletteVisible="isPaletteVisible"
       :timeRemaining="timeRemaining" :warningTimeLimit="timeLimitWarningThreshold"
       @time-limit-warning="displayTimeLimitWarning" @end-test="endTest" @end-test-by-time="endTestByTime"
@@ -12,7 +12,7 @@
           <div class="flex grow flex-col w-full h-full overflow-y-auto">
             <QuestionPalette v-if="isPaletteVisible" :hasQuizEnded="hasQuizEnded" :questionSetStates="questionSetStates"
               :currentQuestionIndex="currentQuestionIndex" :title="title" :subject="subject" :testFormat="testFormat"
-              :maxMarks="maxMarks" :numQuestions="numQuestions" :quizTimeLimit="quizTimeLimit" :isOmrMode="isOmrMode"
+              :maxMarks="maxMarks" :numQuestions="numQuestions" :quizTimeLimit="quizTimeLimit" :isOmrMode=true
               class="absolute w-full h-full sm:w-2/3 lg:w-1/2 xl:w-1/3 z-10 bg-white overflow-y-scroll pb-[56px]"
               data-test="questionPalette">
             </QuestionPalette>
@@ -31,12 +31,18 @@
                 :questionType="$props.questions[questionState.index].type"
                 :isGradedQuestion="$props.questions[questionState.index].graded"
                 :maxCharLimit="$props.questions[questionState.index].max_char_limit"
-                :matrixSize="$props.questions[questionState.index].matrix_size" :isPortrait="isPortrait"
-                :quizType="quizType" :hasQuizEnded="hasQuizEnded" :submittedAnswer="draftResponses[questionState.index]"
+                :matrixSize="$props.questions[questionState.index].matrix_size"
+                :isPortrait="isPortrait"
+                :quizType="quizType"
+                :hasQuizEnded="hasQuizEnded"
+                :submittedAnswer="draftResponses[questionState.index]"
                 :isQuestionDisabled="questionDisabledArray[questionState.index]"
-                :currentQuestionIndex="questionState.index" @option-selected="questionOptionSelected"
-                @subjective-answer-entered="subjectiveAnswerUpdated" @numerical-answer-entered="numericalAnswerUpdated"
-                :key="questionState.index" :data-test="`OmrItem-${questionState.index}`"
+                :currentQuestionIndex="questionState.index"
+                @option-selected="questionOptionSelected"
+                @subjective-answer-entered="subjectiveAnswerUpdated"
+                @numerical-answer-entered="numericalAnswerUpdated"
+                :key="questionState.index"
+                :data-test="`OmrItem-${questionState.index}`"
                 :ref="`omritem-${questionState.index}`"></OmrItem>
             </div>
           </div>
@@ -147,10 +153,6 @@ export default defineComponent({
       type: Number,
       default: 0
     },
-    isOmrMode: {
-      type: Boolean,
-      default: false,
-    },
     userId: {
       type: String,
       default: ""
diff --git a/src/components/Questions/Footer.vue b/src/components/Questions/Footer.vue
index c302d24..ced08f9 100644
--- a/src/components/Questions/Footer.vue
+++ b/src/components/Questions/Footer.vue
@@ -159,7 +159,7 @@ export default defineComponent({
     const isQuizAssessment = computed(() => props.quizType == "assessment" || props.quizType == "omr-assessment");
     const isSmallScreen = ref(false);
     const updateScreenSize = () => {
-      isSmallScreen.value = window.matchMedia("(max-width: 500px)").matches;
+      isSmallScreen.value = window.matchMedia("(max-width: 560px)").matches;
     };
     const state = reactive({
       assessmentNavigationButtonIconClass: [
diff --git a/src/components/Questions/Header.vue b/src/components/Questions/Header.vue
index 69bac88..77daa88 100644
--- a/src/components/Questions/Header.vue
+++ b/src/components/Questions/Header.vue
@@ -11,6 +11,16 @@
           data-test="togglePaletteButton"
         ></icon-button>
         <div class="flex space-x-3">
+          <!-- toggle omr button -->
+          <icon-button
+            v-if="shouldShowOmrToggle"
+            :titleConfig="toggleButtonTextConfig"
+            :iconConfig="toggleButtonIconConfig"
+            :buttonClass="toggleButtonIconClass"
+            class="rounded-2xl shadow-lg"
+            data-test="toggleOmrMode"
+            @click="toggleOmrMode"
+          ></icon-button>
           <!-- countdown timer / can't click -->
           <icon-button
             v-if="!hasQuizEnded && hasTimeLimit"
@@ -47,8 +57,8 @@
 
 <script lang="ts">
 import IconButton from "../UI/Buttons/IconButton.vue";
-import { defineComponent, reactive, toRefs, computed, watch, onMounted, PropType } from "vue";
-import { quizTitleType } from "@/types";
+import { ref, defineComponent, reactive, toRefs, computed, watch, onMounted, onBeforeUnmount, PropType } from "vue";
+import { quizTitleType, quizType } from "@/types";
 
 export default defineComponent({
   name: "Header",
@@ -92,7 +102,11 @@ export default defineComponent({
     isOmrMode: {
       type: Boolean,
       default: false,
-    }
+    },
+    quizType: {
+      type: String as PropType<quizType>,
+      default: "homework"
+    },
   },
   setup(props, context) {
     const state = reactive({
@@ -105,6 +119,10 @@ export default defineComponent({
         "bg-red-600 ring-red-500 p-2 px-4 bp-500:p-4 bp-500:px-6 rounded-lg sm:rounded-2xl shadow-xl hover:cursor-default",
       timeRemaining: props.timeRemaining
     });
+    const isSmallScreen = ref(false);
+    const updateScreenSize = () => {
+      isSmallScreen.value = window.matchMedia("(max-width: 560px)").matches;
+    };
 
     onMounted(() => {
       window.setInterval(() => {
@@ -121,6 +139,56 @@ export default defineComponent({
       state.localIsPaletteVisible = !state.localIsPaletteVisible;
     }
 
+    // repetitive code - make a component later
+    function toggleOmrMode() {
+      const url = new URL(window.location.href);
+
+      if (url.searchParams.has("omrMode")) {
+        url.searchParams.delete("omrMode");
+      } else {
+        url.searchParams.set("omrMode", "true");
+      }
+
+      window.location.href = url.toString();
+    }
+
+    // const shouldShowOmrToggle = computed(() => props.quizType == "assessment")
+    const shouldShowOmrToggle = computed(() => false)
+
+    const toggleButtonTextConfig = computed(() => {
+      const config = {
+        value: "",
+        class: ["text-orange-500 underline underline-offset-8", "text-base md:text-lg lg:text-xl font-semibold"],
+      };
+
+      if (props.isOmrMode) {
+        config.value = isSmallScreen.value ? "A" : "Switch to Assessment Mode";
+      } else {
+        config.value = isSmallScreen.value ? "O" : "Switch to OMR Mode";
+      }
+
+      return config;
+    });
+
+    const toggleButtonIconClass = computed(() => {
+      const iconClass = [
+        "border border-orange-300",
+        "bg-transparent hover:bg-gray-100",
+        "rounded-lg shadow-sm px-6 py-3",
+        "flex items-center justify-center",
+        "transition-all duration-200 ease-in-out"
+      ]
+
+      return iconClass;
+    });
+
+    const toggleButtonIconConfig = computed(() => {
+      return {
+        iconName: props.isOmrMode ? "check-circle-solid" : "sync-alt-solid",
+        iconClass: "h-4 w-4 text-white",
+      };
+    });
+
     const endTestButtonTitleConfig = computed(() => ({
       value: props.hasQuizEnded ? "See Results" : "End Test",
       class:
@@ -216,6 +284,16 @@ export default defineComponent({
       }
     );
 
+    // Setup listeners for screen size changes
+    onMounted(() => {
+      updateScreenSize();
+      window.addEventListener("resize", updateScreenSize);
+    });
+
+    onBeforeUnmount(() => {
+      window.removeEventListener("resize", updateScreenSize);
+    });
+
     return {
       ...toRefs(state),
       endTest,
@@ -225,7 +303,12 @@ export default defineComponent({
       togglePaletteButtonIconConfig,
       togglePaletteButtonClass,
       countdownTimerClass,
-      countdownTimerTitleConfig
+      countdownTimerTitleConfig,
+      shouldShowOmrToggle,
+      toggleButtonIconClass,
+      toggleButtonIconConfig,
+      toggleButtonTextConfig,
+      toggleOmrMode
     };
   },
   components: {
diff --git a/src/components/Questions/Palette/QuestionPalette.vue b/src/components/Questions/Palette/QuestionPalette.vue
index 23a3b32..b5a7ab5 100644
--- a/src/components/Questions/Palette/QuestionPalette.vue
+++ b/src/components/Questions/Palette/QuestionPalette.vue
@@ -209,17 +209,6 @@ export default defineComponent({
       `w-1/2 font-bold text-white p-2 px-4 bp-500:p-4 bp-500:px-6 rounded-lg sm:rounded-2xl shadow-xl border shadow-lg ring-primary`,
     ]);
 
-    // const state = reactive({
-    //   instructionTextClass:
-    //     "text-lg md:text-xl lg:text-2xl mx-4 mt-2 leading-none text-slate-500",
-    //   titleTextClass:
-    //     "text-lg md:text-xl lg:text-2xl mx-4 mt-10 font-bold leading-tight whitespace-pre-wrap",
-    //   instructionsButtonClass:
-    //     "bg-gray-300 w-full font-bold ring-gray-500 p-2 px-4 bp-500:p-4 bp-500:px-6 rounded-lg sm:rounded-2xl shadow-xl",
-    //   showInstructions: false,
-    //   showPalette: true,
-    // });
-
     return {
       ...state,
       navigateToQuestion,
diff --git a/src/components/Questions/QuestionModal.vue b/src/components/Questions/QuestionModal.vue
index 7f9b570..f74d078 100644
--- a/src/components/Questions/QuestionModal.vue
+++ b/src/components/Questions/QuestionModal.vue
@@ -10,6 +10,7 @@
       :warningTimeLimit="timeLimitWarningThreshold"
       :title="title"
       :userId="userId"
+      :quizType="quizType"
       @time-limit-warning="displayTimeLimitWarning"
       @end-test="endTest"
       @end-test-by-time="endTestByTime"
diff --git a/src/router/index.ts b/src/router/index.ts
index e300cbd..6bdb0a3 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,6 +10,7 @@ const routes = [
       ...route.params,
       userId: route.query.userId,
       apiKey: route.query.apiKey,
+      omrMode: route.query.omrMode
     }),
     // lazy-loading: https://router.vuejs.org/guide/advanced/lazy-loading.html
     component: () =>
diff --git a/src/services/API/Quiz.ts b/src/services/API/Quiz.ts
index 18c1173..87dd5f7 100644
--- a/src/services/API/Quiz.ts
+++ b/src/services/API/Quiz.ts
@@ -6,10 +6,13 @@ export default {
   /**
    * returns the details for a quiz
    * @param {string} quizId - uuid of the quiz to be fetched
+   * @param {boolean} omrMode - whether quiz should be displayed in omr mode
    * @returns {Promise<QuizAPIResponse>} data corresponding to the quiz
    */
-  async getQuiz(quizId: string): Promise<QuizAPIResponse> {
-    const response = await apiClient().get(quizEndpoint + quizId);
+  async getQuiz({ quizId, omrMode = false }: { quizId: string, omrMode: boolean }): Promise<QuizAPIResponse> {
+    const response = await apiClient().get(quizEndpoint + quizId, {
+      params: { omr_mode: omrMode }
+    });
     return response.data;
   },
 };
diff --git a/src/services/API/Session.ts b/src/services/API/Session.ts
index d7a5597..8e72b2a 100644
--- a/src/services/API/Session.ts
+++ b/src/services/API/Session.ts
@@ -11,22 +11,24 @@ import {
   QuestionSetMetricPayload,
   SessionMetricsPayload
 } from "@/types";
-import axios, { AxiosError } from "axios";
 
 export default {
   /**
    * returns the details for a quiz
    * @param {string} quizId - id of the quiz for which the session is to be created
    * @param {string} userId - id of the user for which the session is to be created
+   * @param {boolean} omrMode - whether the session is being accessed in omrMode
    * @returns {Promise<SessionAPIResponse>} data corresponding to the session
    */
   async createSession(
     quizId: string,
-    userId: string
+    userId: string,
+    omrMode: boolean = false
   ): Promise<SessionAPIResponse> {
     const response = await apiClient().post(sessionsEndpoint, {
       user_id: userId,
       quiz_id: quizId,
+      omr_mode: omrMode
     });
     return response.data;
   },
diff --git a/src/types.ts b/src/types.ts
index c3d0e53..4c51d91 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -207,6 +207,7 @@ export interface SessionAPIResponse {
   user_id: string;
   quiz_id: string;
   is_first: boolean;
+  omr_mode: boolean;
   session_answers: SubmittedResponse[];
   has_quiz_ended: boolean;
   time_remaining?: number;
diff --git a/src/views/Player.vue b/src/views/Player.vue
index 116569c..b157984 100644
--- a/src/views/Player.vue
+++ b/src/views/Player.vue
@@ -9,6 +9,16 @@
     </div>
 
     <div v-else class="h-full flex flex-col">
+      <icon-button
+        v-if="shouldShowOmrToggle"
+        :titleConfig="toggleButtonTextConfig"
+        :iconConfig="toggleButtonIconConfig"
+        :buttonClass="toggleButtonIconClass"
+        class="rounded-2xl shadow-lg mt-5 place-self-center"
+        data-test="toggleOmrMode"
+        @click="toggleOmrMode"
+      ></icon-button>
+
       <Splash
         v-if="isSplashShown"
         :title="title"
@@ -19,7 +29,7 @@
         :reviewAnswers="reviewAnswers"
         :sessionEndTimeText="sessionEndTimeText"
         :numQuestions="maxQuestionsAllowedToAttempt"
-        :quizType="metadata.quiz_type"
+        :quizType="computedQuizType"
         :quizTimeLimit="quizTimeLimit"
         :maxMarks="maxMarks"
         :maxQuestionsAllowedToAttempt="numGradedQuestions"
@@ -39,7 +49,6 @@
         }"
         :quizType="metadata.quiz_type"
         :hasQuizEnded="hasQuizEnded"
-        :isOmrMode="isOmrMode"
         :numQuestions="maxQuestionsAllowedToAttempt"
         :maxQuestionsAllowedToAttempt="currentMaxQuestionsAllowedToAttempt"
         :questionSetStates="questionSetStates"
@@ -128,7 +137,7 @@ import QuizAPIService from "../services/API/Quiz";
 import SessionAPIService from "../services/API/Session";
 import QuestionAPIService from "../services/API/Question"
 import { defineComponent, reactive, toRefs, computed, watch, onMounted } from "vue";
-import { useRouter, useRoute } from "vue-router";
+import { useRouter } from "vue-router";
 import { useStore } from "vuex";
 import {
   QuizAPIResponse,
@@ -153,11 +162,13 @@ import {
 } from "../types";
 import { useToast, POSITION } from "vue-toastification"
 import BaseIcon from "../components/UI/Icons/BaseIcon.vue";
+import IconButton from "../components/UI/Buttons/IconButton.vue";
 import OrganizationAPIService from "../services/API/Organization";
 
 export default defineComponent({
   name: "Player",
   components: {
+    IconButton,
     Splash,
     QuestionModal,
     Scorecard,
@@ -177,10 +188,13 @@ export default defineComponent({
       default: null,
       type: String,
     },
+    omrMode: {
+      default: false,
+      type: Boolean
+    }
   },
   setup(props) {
     const router = useRouter();
-    const route = useRoute();
     const store = useStore();
     const state = reactive({
       currentQuestionIndex: -1 as number,
@@ -232,7 +246,48 @@ export default defineComponent({
 
     const isQuizAssessment = computed(() => (state.metadata.quiz_type == "assessment" || state.metadata.quiz_type == "omr-assessment"));
 
-    const isOmrMode = computed(() => state.metadata.quiz_type == "omr-assessment");
+    const isOmrMode = computed(() => props.omrMode || state.metadata.quiz_type == "omr-assessment");
+
+    const computedQuizType = computed(() => {
+      return isOmrMode.value ? "omr-assessment" : "assessment";
+    });
+
+    // const shouldShowOmrToggle = computed(() => state.metadata.quiz_type == "assessment")
+    const shouldShowOmrToggle = computed(() => false)
+
+    const toggleButtonTextConfig = computed(() => {
+      const config = {
+        value: "",
+        class: ["text-orange-500 underline underline-offset-8", "text-base md:text-lg lg:text-xl font-semibold"],
+      };
+
+      if (isOmrMode.value) {
+        config.value = "Switch to Assessment Mode";
+      } else {
+        config.value = "Switch to OMR Mode";
+      }
+
+      return config;
+    });
+
+    const toggleButtonIconClass = computed(() => {
+      const iconClass = [
+        "border border-orange-300",
+        "bg-transparent hover:bg-gray-100",
+        "rounded-lg shadow-sm px-6 py-3",
+        "flex items-center justify-center",
+        "transition-all duration-200 ease-in-out"
+      ]
+
+      return iconClass;
+    });
+
+    const toggleButtonIconConfig = computed(() => {
+      return {
+        iconName: isOmrMode.value ? "check-circle-solid" : "sync-alt-solid",
+        iconClass: "h-4 w-4 text-white",
+      };
+    });
 
     const isSplashShown = computed(() => state.currentQuestionIndex == -1);
     const numQuestions = computed(() => state.questions.length);
@@ -247,6 +302,18 @@ export default defineComponent({
       value: scorecardResultValue.value,
     }));
 
+    function toggleOmrMode() {
+      const url = new URL(window.location.href);
+
+      if (url.searchParams.has("omrMode")) {
+        url.searchParams.delete("omrMode");
+      } else {
+        url.searchParams.set("omrMode", "true");
+      }
+
+      window.location.href = url.toString();
+    }
+
     function starttimeSpentOnQuestionCalc() {
       if (state.timerInterval) {
         clearInterval(state.timerInterval);
@@ -416,7 +483,10 @@ export default defineComponent({
     }
 
     async function getQuiz() {
-      const quizDetails : QuizAPIResponse = await QuizAPIService.getQuiz(props.quizId);
+      const quizDetails : QuizAPIResponse = await QuizAPIService.getQuiz({
+        quizId: props.quizId,
+        omrMode: isOmrMode.value ?? false
+      });
       // since we know that there is going to be only one
       // question set for now
       state.questionSets = quizDetails.question_sets;
@@ -454,7 +524,8 @@ export default defineComponent({
     async function createSession() {
       const sessionDetails = await SessionAPIService.createSession(
         props.quizId,
-        route.query.userId as string
+        props.userId as string,
+        isOmrMode.value
       );
       state.sessionId = sessionDetails._id;
       state.responses = sessionDetails.session_answers;
@@ -554,6 +625,7 @@ export default defineComponent({
         newQuestionIndex,
         {
           answer: itemResponse.answer,
+          marked_for_review: false // false by default for omr
           // not sending time spent on question for omr -- cannot compute!
         }
       );
@@ -974,6 +1046,12 @@ export default defineComponent({
       fetchQuestionBucket,
       timerUpdates,
       isOmrMode,
+      computedQuizType,
+      shouldShowOmrToggle,
+      toggleButtonTextConfig,
+      toggleButtonIconClass,
+      toggleButtonIconConfig,
+      toggleOmrMode,
       starttimeSpentOnQuestionCalc,
       stoptimeSpentOnQuestionCalc
     };
diff --git a/tests/e2e/fixtures/new_homework_session.json b/tests/e2e/fixtures/new_homework_session.json
index 77261df..cfe9b02 100644
--- a/tests/e2e/fixtures/new_homework_session.json
+++ b/tests/e2e/fixtures/new_homework_session.json
@@ -2,6 +2,7 @@
     "_id": "62625e0f773b5fb92fde890b",
     "user_id": "1",
     "quiz_id": "abcd",
+    "omr_mode": false,
     "has_quiz_ended": false,
     "is_first": true,
     "session_answers": [
diff --git a/tests/e2e/fixtures/new_partial_mark_session.json b/tests/e2e/fixtures/new_partial_mark_session.json
index c220948..710cf3b 100644
--- a/tests/e2e/fixtures/new_partial_mark_session.json
+++ b/tests/e2e/fixtures/new_partial_mark_session.json
@@ -2,6 +2,7 @@
     "_id": "62625e0f773b5fb92fde890b",
     "user_id": "1",
     "quiz_id": "abcd",
+    "omr_mode": false,
     "has_quiz_ended": false,
     "is_first": true,
     "session_answers": [
diff --git a/tests/e2e/fixtures/new_session.json b/tests/e2e/fixtures/new_session.json
index 96c3db9..aa07277 100644
--- a/tests/e2e/fixtures/new_session.json
+++ b/tests/e2e/fixtures/new_session.json
@@ -2,6 +2,7 @@
   "_id": "62625e0f773b5fb92fde890b",
   "user_id": "1",
   "quiz_id": "abcd",
+  "omr_mode": false,
   "has_quiz_ended": false,
   "is_first": true,
   "session_answers": [
diff --git a/tests/e2e/fixtures/new_session_for_multiset_quiz.json b/tests/e2e/fixtures/new_session_for_multiset_quiz.json
index 0c77b60..b474944 100644
--- a/tests/e2e/fixtures/new_session_for_multiset_quiz.json
+++ b/tests/e2e/fixtures/new_session_for_multiset_quiz.json
@@ -2,6 +2,7 @@
     "_id": "62625e0f773b5fb92fde890b",
     "user_id": "1",
     "quiz_id": "abcd",
+    "omr_mode": false,
     "has_quiz_ended": false,
     "is_first": true,
     "session_answers": [
diff --git a/tests/e2e/fixtures/resume_session.json b/tests/e2e/fixtures/resume_session.json
index bbb05bc..ef45892 100644
--- a/tests/e2e/fixtures/resume_session.json
+++ b/tests/e2e/fixtures/resume_session.json
@@ -2,6 +2,7 @@
   "_id": "62625e0f773b5fb92fde890b",
   "user_id": "1",
   "quiz_id": "abcd",
+  "omr_mode": false,
   "is_first": false,
   "has_quiz_ended": false,
   "session_answers": [
diff --git a/tests/e2e/fixtures/resume_session_for_multiset_quiz.json b/tests/e2e/fixtures/resume_session_for_multiset_quiz.json
index e423213..3b84efd 100644
--- a/tests/e2e/fixtures/resume_session_for_multiset_quiz.json
+++ b/tests/e2e/fixtures/resume_session_for_multiset_quiz.json
@@ -2,6 +2,7 @@
     "_id": "62625e0f773b5fb92fde890b",
     "user_id": "1",
     "quiz_id": "abcd",
+    "omr_mode": false,
     "is_first": false,
     "has_quiz_ended": false,
     "session_answers": [
diff --git a/tests/e2e/specs/renders-omr-assessment.js b/tests/e2e/specs/renders-omr-assessment.js
index cd80a06..747426b 100644
--- a/tests/e2e/specs/renders-omr-assessment.js
+++ b/tests/e2e/specs/renders-omr-assessment.js
@@ -99,6 +99,7 @@ describe("Player for OMR quizzes", () => {
             .its("request.body")
             .should("deep.equal", {
               answer: [0],
+              marked_for_review: false,
             });
         });