diff --git a/src/assets/images/icons/close-btn-white.svg b/src/assets/images/icons/close-btn.svg
similarity index 93%
rename from src/assets/images/icons/close-btn-white.svg
rename to src/assets/images/icons/close-btn.svg
index ff633ba..04b9f73 100644
--- a/src/assets/images/icons/close-btn-white.svg
+++ b/src/assets/images/icons/close-btn.svg
@@ -1,7 +1,7 @@
 <svg width="28" height="30" viewBox="0 0 28 30" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M14 29C21.732 29 28 22.732 28 15C28 7.26801 21.732 1 14 1C6.26801 1 0 7.26801 0 15C0 22.732 6.26801 29 14 29Z" fill="#C7C7CC"/>
 <g filter="url(#filter0_b_70_350)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.85518 9.85518C8.38161 10.3287 8.38161 11.0965 8.85518 11.5701L12.2851 15L8.85518 18.4299C8.38161 18.9035 8.38161 19.6713 8.85518 20.1448C9.32874 20.6184 10.0965 20.6184 10.5701 20.1448L14 16.7149L17.4299 20.1448C17.9035 20.6184 18.6713 20.6184 19.1448 20.1448C19.6184 19.6713 19.6184 18.9035 19.1448 18.4299L15.7149 15L19.1448 11.5701C19.6184 11.0965 19.6184 10.3287 19.1448 9.85518C18.6713 9.38161 17.9035 9.38161 17.4299 9.85518L14 13.2851L10.5701 9.85518C10.0965 9.38161 9.32874 9.38161 8.85518 9.85518Z" fill="white" fill-opacity="0.92"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.85518 9.85518C8.38161 10.3287 8.38161 11.0965 8.85518 11.5701L12.2851 15L8.85518 18.4299C8.38161 18.9035 8.38161 19.6713 8.85518 20.1448C9.32874 20.6184 10.0965 20.6184 10.5701 20.1448L14 16.7149L17.4299 20.1448C17.9035 20.6184 18.6713 20.6184 19.1448 20.1448C19.6184 19.6713 19.6184 18.9035 19.1448 18.4299L15.7149 15L19.1448 11.5701C19.6184 11.0965 19.6184 10.3287 19.1448 9.85518C18.6713 9.38161 17.9035 9.38161 17.4299 9.85518L14 13.2851L10.5701 9.85518C10.0965 9.38161 9.32874 9.38161 8.85518 9.85518Z" fill="currentColor" fill-opacity="0.92"/>
 </g>
 <defs>
 <filter id="filter0_b_70_350" x="-18.6828" y="-17.6828" width="65.3656" height="65.3656" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index ab4b42b..1f9418d 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -8,16 +8,13 @@ import SurveyScreen from 'screens/Survey';
 
 import ProtectedRoute from './ProtectedRoute';
 
+export const questionPath = 'questions';
+
 export const paths = {
   root: '/',
   signIn: '/sign-in',
   survey: '/surveys/:id',
-  question: '/surveys/:id/questions',
-};
-
-export const questionPath = (): string => {
-  const questionPaths = paths.question.split('/');
-  return questionPaths[questionPaths.length - 1];
+  question: `/surveys/:id/${questionPath}`,
 };
 
 const routes: RouteObject[] = [
diff --git a/src/screens/Question/index.tsx b/src/screens/Question/index.tsx
index 489e13f..cd5d7bb 100644
--- a/src/screens/Question/index.tsx
+++ b/src/screens/Question/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { ReactComponent as ArrowRight } from 'assets/images/icons/arrow-right.svg';
-import { ReactComponent as CloseButton } from 'assets/images/icons/close-btn-white.svg';
+import { ReactComponent as CloseButton } from 'assets/images/icons/close-btn.svg';
 import AppSlider from 'components/AppSlider';
 import MainView from 'components/MainView';
 
@@ -16,7 +16,7 @@ const QuestionScreen = (): JSX.Element => {
   return (
     <MainView backgroundUrl="https://dhdbhh0jsld0o.cloudfront.net/m/1ea51560991bcb7d00d0_">
       <div className="flex flex-col h-full">
-        <button className="mt-8 mr-8 p-1 self-end" data-test-id={questionScreenTestIds.closeButton}>
+        <button className="mt-8 mr-8 p-1 self-end text-white" data-test-id={questionScreenTestIds.closeButton}>
           <CloseButton />
         </button>
         <div className="w-1/2 self-center flex-1 flex flex-col justify-center">
diff --git a/src/screens/Survey/index.tsx b/src/screens/Survey/index.tsx
index 4396992..b85d463 100644
--- a/src/screens/Survey/index.tsx
+++ b/src/screens/Survey/index.tsx
@@ -72,7 +72,7 @@ const SurveyScreen = (): JSX.Element => {
               {survey?.description}
             </p>
             <div className="pt-8">
-              <Link to={questionPath()}>
+              <Link to={questionPath}>
                 <ElevatedButton isFullWidth type="submit" data-test-id={surveyScreenTestIds.startSurveyButton}>
                   Start Survey
                 </ElevatedButton>