diff --git a/src/components/appointmentInfo.tsx b/src/components/appointmentInfo.tsx
index 9b5b47a..3fdd3c3 100644
--- a/src/components/appointmentInfo.tsx
+++ b/src/components/appointmentInfo.tsx
@@ -1,8 +1,8 @@
 import React, { useContext } from "react";
 import styled from "styled-components";
-import Horse from "../images/horseRider.svg";
-import Dude from "../images/person.svg";
-import Bookmark from "../images/bookmark.svg";
+import Horse from "../images/horseRiderIcon.svg";
+import Dude from "../images/personIcon.svg";
+import Bookmark from "../images/bookmarkIcon.svg";
 import { LazyUser } from "../models";
 import UserContext from "../userContext";
 import "@fontsource/roboto";
diff --git a/src/components/authentication/createAccount.tsx b/src/components/authentication/createAccount.tsx
index 6c9e2d0..effe2aa 100644
--- a/src/components/authentication/createAccount.tsx
+++ b/src/components/authentication/createAccount.tsx
@@ -4,8 +4,8 @@ import { Auth } from "aws-amplify";
 import { DataStore } from "@aws-amplify/datastore";
 import styled from "styled-components";
 import { User } from "../../models";
-import eyeSlash from "../../images/eyeSlash.svg";
-import eye from "../../images/eye.svg";
+import eyeSlash from "../../images/eyeSlashIcon.svg";
+import eye from "../../images/eyeIcon.svg";
 import backArrow from "../../images/backArrowIcon.png";
 import {
   Box,
diff --git a/src/components/authentication/enterCode.tsx b/src/components/authentication/enterCode.tsx
index 9bb4456..f6f7956 100644
--- a/src/components/authentication/enterCode.tsx
+++ b/src/components/authentication/enterCode.tsx
@@ -2,7 +2,7 @@ import styled from "styled-components";
 import { ChangeEvent, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Auth } from "aws-amplify";
-import lock from "../../images/lock.svg";
+import lock from "../../images/lockIcon.svg";
 import arrow from "../../images/backArrowIcon.png";
 import {
   Wrapper,
diff --git a/src/components/authentication/login.tsx b/src/components/authentication/login.tsx
index 48bea8e..dfb556b 100644
--- a/src/components/authentication/login.tsx
+++ b/src/components/authentication/login.tsx
@@ -3,8 +3,8 @@ import styled from "styled-components";
 import { useNavigate } from "react-router-dom";
 import { Auth, DataStore } from "aws-amplify";
 import logoPic from "../../images/petLogo1.jpg";
-import eyeSlash from "../../images/eyeSlash.svg";
-import eye from "../../images/eye.svg";
+import eyeSlash from "../../images/eyeSlashIcon.svg";
+import eye from "../../images/eyeIcon.svg";
 import UserContext from "../../userContext";
 
 import {
diff --git a/src/components/authentication/success.tsx b/src/components/authentication/success.tsx
index 7e5902c..764999a 100644
--- a/src/components/authentication/success.tsx
+++ b/src/components/authentication/success.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import styled from "styled-components";
-import logo from "../../images/horseRider.svg";
+import logo from "../../images/horseRiderIcon.svg";
 import {
   Wrapper,
   Box,
diff --git a/src/components/mobile/mobileLogout.tsx b/src/components/mobile/mobileLogout.tsx
index dc5b2e2..6987b7f 100644
--- a/src/components/mobile/mobileLogout.tsx
+++ b/src/components/mobile/mobileLogout.tsx
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import styled from "styled-components";
 import { Auth } from "aws-amplify";
 import { User } from "../../models";
-import warning from "../../images/warning.svg";
+import warning from "../../images/warningIcon.svg";
 import {
   Wrapper,
   BackArrow,
diff --git a/src/components/mobile/mobileTimeslotConfirmation.tsx b/src/components/mobile/mobileTimeslotConfirmation.tsx
index 2c1c639..d0d3259 100644
--- a/src/components/mobile/mobileTimeslotConfirmation.tsx
+++ b/src/components/mobile/mobileTimeslotConfirmation.tsx
@@ -4,7 +4,7 @@ import styled from "styled-components";
 import { DataStore } from "aws-amplify";
 import UserContext from "../../userContext";
 import { User, Booking, Timeslot } from "../../models";
-import warning from "../../images/warning.svg";
+import warning from "../../images/warningIcon.svg";
 import {
   CancelBtn,
   SaveBtn,
diff --git a/src/components/popup/logoutPopup.tsx b/src/components/popup/logoutPopup.tsx
index 63347e1..bf36d9e 100644
--- a/src/components/popup/logoutPopup.tsx
+++ b/src/components/popup/logoutPopup.tsx
@@ -3,7 +3,7 @@ import { useNavigate } from "react-router-dom";
 import styled from "styled-components";
 import { Auth } from "aws-amplify";
 import { User } from "../../models";
-import warning from "../../images/warning.svg";
+import warning from "../../images/warningIcon.svg";
 import {
   // Wrapper,
   Box,
diff --git a/src/components/popup/timeslot.tsx b/src/components/popup/timeslot.tsx
index a4d98d2..242e989 100644
--- a/src/components/popup/timeslot.tsx
+++ b/src/components/popup/timeslot.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useContext, useEffect } from "react";
 import styled from "styled-components";
-import Checked from "../../images/checked.png";
-import Unchecked from "../../images/unchecked.png";
+import Checked from "../../images/checkedIcon.png";
+import Unchecked from "../../images/uncheckedIcon.png";
 import On from "../../images/onSliderIcon.png";
 import Off from "../../images/offSliderIcon.png";
 import UserContext from "../../userContext";
diff --git a/src/components/popup/timeslotConfirmation.tsx b/src/components/popup/timeslotConfirmation.tsx
index 23a4a29..94107fe 100644
--- a/src/components/popup/timeslotConfirmation.tsx
+++ b/src/components/popup/timeslotConfirmation.tsx
@@ -4,7 +4,7 @@ import styled from "styled-components";
 import { DataStore } from "aws-amplify";
 import UserContext from "../../userContext";
 import { Timeslot, User, Booking } from "../../models";
-import warning from "../../images/warning.svg";
+import warning from "../../images/warningIcon.svg";
 import { CancelBtn, SaveBtn, Description, Header } from "../styledComponents";
 
 export type TimeslotConfirmProps = {
diff --git a/src/components/popup/timeslotSuccess.tsx b/src/components/popup/timeslotSuccess.tsx
index fe7510e..d37a85a 100644
--- a/src/components/popup/timeslotSuccess.tsx
+++ b/src/components/popup/timeslotSuccess.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import styled from "styled-components";
-import logo from "../../images/horseRider.svg";
+import logo from "../../images/horseRiderIcon.svg";
 import {
   Button,
   CenteredDescription,
diff --git a/src/components/resetPassword.tsx b/src/components/resetPassword.tsx
index 3041bf5..37c37f1 100644
--- a/src/components/resetPassword.tsx
+++ b/src/components/resetPassword.tsx
@@ -2,8 +2,8 @@
 import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Auth } from "aws-amplify";
-import eyeSlash from "../images/eyeSlash.svg";
-import eye from "../images/eye.svg";
+import eyeSlash from "../images/eyeSlashIcon.svg";
+import eye from "../images/eyeIcon.svg";
 import backArrow from "../images/backArrowIcon.png";
 import {
   Wrapper,
diff --git a/src/images/bookmark.svg b/src/images/bookmarkIcon.svg
similarity index 100%
rename from src/images/bookmark.svg
rename to src/images/bookmarkIcon.svg
diff --git a/src/images/Checked.png b/src/images/checkedIcon.png
similarity index 100%
rename from src/images/Checked.png
rename to src/images/checkedIcon.png
diff --git a/src/images/exitx.png b/src/images/exitxIcon.png
similarity index 100%
rename from src/images/exitx.png
rename to src/images/exitxIcon.png
diff --git a/src/images/eye.svg b/src/images/eyeIcon.svg
similarity index 100%
rename from src/images/eye.svg
rename to src/images/eyeIcon.svg
diff --git a/src/images/eyeSlash.svg b/src/images/eyeSlashIcon.svg
similarity index 100%
rename from src/images/eyeSlash.svg
rename to src/images/eyeSlashIcon.svg
diff --git a/src/images/horseRider.svg b/src/images/horseRiderIcon.svg
similarity index 100%
rename from src/images/horseRider.svg
rename to src/images/horseRiderIcon.svg
diff --git a/src/images/lock.svg b/src/images/lockIcon.svg
similarity index 100%
rename from src/images/lock.svg
rename to src/images/lockIcon.svg
diff --git a/src/images/person.svg b/src/images/personIcon.svg
similarity index 100%
rename from src/images/person.svg
rename to src/images/personIcon.svg
diff --git a/src/images/Unchecked.png b/src/images/uncheckedIcon.png
similarity index 100%
rename from src/images/Unchecked.png
rename to src/images/uncheckedIcon.png
diff --git a/src/images/warning.svg b/src/images/warningIcon.svg
similarity index 100%
rename from src/images/warning.svg
rename to src/images/warningIcon.svg