diff --git a/src/components/appointmentInfo.tsx b/src/components/appointmentInfo.tsx
index 3fdd3c3..9b5b47a 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/horseRiderIcon.svg";
-import Dude from "../images/personIcon.svg";
-import Bookmark from "../images/bookmarkIcon.svg";
+import Horse from "../images/horseRider.svg";
+import Dude from "../images/person.svg";
+import Bookmark from "../images/bookmark.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 effe2aa..3862a84 100644
--- a/src/components/authentication/createAccount.tsx
+++ b/src/components/authentication/createAccount.tsx
@@ -4,9 +4,9 @@ import { Auth } from "aws-amplify";
 import { DataStore } from "@aws-amplify/datastore";
 import styled from "styled-components";
 import { User } from "../../models";
-import eyeSlash from "../../images/eyeSlashIcon.svg";
-import eye from "../../images/eyeIcon.svg";
-import backArrow from "../../images/backArrowIcon.png";
+import eyeSlash from "../../images/eyeSlash.svg";
+import eye from "../../images/eye.svg";
+import backArrow from "../../images/backArrow.png";
 import {
   Box,
   BackArrow,
diff --git a/src/components/authentication/enterCode.tsx b/src/components/authentication/enterCode.tsx
index f6f7956..0c34e34 100644
--- a/src/components/authentication/enterCode.tsx
+++ b/src/components/authentication/enterCode.tsx
@@ -2,8 +2,8 @@ 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/lockIcon.svg";
-import arrow from "../../images/backArrowIcon.png";
+import lock from "../../images/lock.svg";
+import arrow from "../../images/backArrow.png";
 import {
   Wrapper,
   Box,
diff --git a/src/components/authentication/forgotPassword.tsx b/src/components/authentication/forgotPassword.tsx
index 659ecc5..f73a176 100644
--- a/src/components/authentication/forgotPassword.tsx
+++ b/src/components/authentication/forgotPassword.tsx
@@ -2,7 +2,7 @@
 import React, { ChangeEvent, useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import { Auth } from "aws-amplify";
-import arrow from "../../images/backArrowIcon.png";
+import arrow from "../../images/backArrow.png";
 import {
   Wrapper,
   Box,
diff --git a/src/components/authentication/login.tsx b/src/components/authentication/login.tsx
index dfb556b..772cc6c 100644
--- a/src/components/authentication/login.tsx
+++ b/src/components/authentication/login.tsx
@@ -2,9 +2,9 @@ import React, { ChangeEvent, useContext, useState } from "react";
 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/eyeSlashIcon.svg";
-import eye from "../../images/eyeIcon.svg";
+import logoPic from "../../images/petLogo.jpg";
+import eyeSlash from "../../images/eyeSlash.svg";
+import eye from "../../images/eye.svg";
 import UserContext from "../../userContext";
 
 import {
diff --git a/src/components/authentication/success.tsx b/src/components/authentication/success.tsx
index 764999a..7e5902c 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/horseRiderIcon.svg";
+import logo from "../../images/horseRider.svg";
 import {
   Wrapper,
   Box,
diff --git a/src/components/calendar.tsx b/src/components/calendar.tsx
index 5c8d1f2..ef348ad 100644
--- a/src/components/calendar.tsx
+++ b/src/components/calendar.tsx
@@ -12,11 +12,11 @@ import interactionPlugin from "@fullcalendar/interaction";
 import UserContext from "../userContext";
 import { LazyTimeslot } from "../models";
 // import Monthly from "./monthlyView";
-import logo from "../images/petLogo.svg";
+import logo from "../images/petLogo2.svg";
 import Toggle from "./calendarToggle";
 import Popup from "./popup/timeslotPopup";
 // import FullCalendar from "@fullcalendar/react";
-import signout from "../images/signOutFull.png";
+import signout from "../images/signOut.png";
 import LogoutPopup from "./popup/logoutPopup";
 import { Booking } from "../models";
 
diff --git a/src/components/mobile/mobileCalendar.tsx b/src/components/mobile/mobileCalendar.tsx
index 38207f8..c08b1d9 100644
--- a/src/components/mobile/mobileCalendar.tsx
+++ b/src/components/mobile/mobileCalendar.tsx
@@ -7,7 +7,7 @@ import MobileTimeslots from "./mobileTimeslots";
 import MobileWeeklyView from "./mobileWeeklyView";
 import { LazyTimeslot } from "../../models";
 import { Dropdown, Option } from "./dropdown";
-import signoutarrow from "../../images/signOutIcon.png";
+import signoutarrow from "../../images/signOutArrow.png";
 import { Wrapper } from "../styledComponents";
 
 const CurrentDate = styled.p`
diff --git a/src/components/mobile/mobileLogout.tsx b/src/components/mobile/mobileLogout.tsx
index 6987b7f..e39c46e 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/warningIcon.svg";
+import warning from "../../images/warning.svg";
 import {
   Wrapper,
   BackArrow,
@@ -12,7 +12,7 @@ import {
   Button,
   Row,
 } from "../styledComponents";
-import backArrow from "../../images/backArrowIcon.png";
+import backArrow from "../../images/backArrow.png";
 import UserContext from "../../userContext";
 
 const Warning = styled.img`
diff --git a/src/components/mobile/mobileTimeslot.tsx b/src/components/mobile/mobileTimeslot.tsx
index 022718e..d0706c1 100644
--- a/src/components/mobile/mobileTimeslot.tsx
+++ b/src/components/mobile/mobileTimeslot.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { DataStore } from "@aws-amplify/datastore";
 import styled from "styled-components";
-import caretDown from "../../images/caretDownIcon.svg";
+import caretDown from "../../images/caretDown.svg";
 import MobileTimeslotContent from "./mobileTimeslotContent";
 import {
   Timeslot,
diff --git a/src/components/mobile/mobileTimeslotConfirmation.tsx b/src/components/mobile/mobileTimeslotConfirmation.tsx
index d0d3259..2c1c639 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/warningIcon.svg";
+import warning from "../../images/warning.svg";
 import {
   CancelBtn,
   SaveBtn,
diff --git a/src/components/mobile/mobileTimeslotContent.tsx b/src/components/mobile/mobileTimeslotContent.tsx
index 5eb169f..67c70b7 100644
--- a/src/components/mobile/mobileTimeslotContent.tsx
+++ b/src/components/mobile/mobileTimeslotContent.tsx
@@ -2,8 +2,8 @@
 import styled from "styled-components";
 import "@fontsource/roboto";
 import { useState, useContext } from "react";
-import OnSlide from "../../images/onSliderIcon.png";
-import OffSlide from "../../images/offSliderIcon.png";
+import OnSlide from "../../images/onSlider.png";
+import OffSlide from "../../images/offSlider.png";
 import UserContext from "../../userContext";
 import MobileTimeSlotConfirmation from "./mobileTimeslotConfirmation";
 import TimeslotSuccess from "../popup/timeslotSuccess";
diff --git a/src/components/mobile/mobileWeeklyView.tsx b/src/components/mobile/mobileWeeklyView.tsx
index c6266f4..098bd8a 100644
--- a/src/components/mobile/mobileWeeklyView.tsx
+++ b/src/components/mobile/mobileWeeklyView.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable jsx-a11y/control-has-associated-label */
 import React, { useState } from "react";
 import styled from "styled-components";
-import chevronLeft from "../../images/chevronLeftIcon.svg";
+import chevronLeft from "../../images/chevronLeft.svg";
 
 const Wrapper = styled.div`
   font-family: "Rubik", sans-serif;
diff --git a/src/components/popup/logoutPopup.tsx b/src/components/popup/logoutPopup.tsx
index bf36d9e..63347e1 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/warningIcon.svg";
+import warning from "../../images/warning.svg";
 import {
   // Wrapper,
   Box,
diff --git a/src/components/popup/timeslot.tsx b/src/components/popup/timeslot.tsx
index 242e989..b48b33a 100644
--- a/src/components/popup/timeslot.tsx
+++ b/src/components/popup/timeslot.tsx
@@ -1,9 +1,9 @@
 import React, { useState, useContext, useEffect } from "react";
 import styled from "styled-components";
-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 Checked from "../../images/checked.png";
+import Unchecked from "../../images/unchecked.png";
+import On from "../../images/onSlider.png";
+import Off from "../../images/offSlider.png";
 import UserContext from "../../userContext";
 
 const ButtonToggle = styled.button`
diff --git a/src/components/popup/timeslotConfirmation.tsx b/src/components/popup/timeslotConfirmation.tsx
index 94107fe..23a4a29 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/warningIcon.svg";
+import warning from "../../images/warning.svg";
 import { CancelBtn, SaveBtn, Description, Header } from "../styledComponents";
 
 export type TimeslotConfirmProps = {
diff --git a/src/components/popup/timeslotPopup.tsx b/src/components/popup/timeslotPopup.tsx
index eadeab9..0605955 100644
--- a/src/components/popup/timeslotPopup.tsx
+++ b/src/components/popup/timeslotPopup.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useContext, useMemo } from "react";
 import styled from "styled-components";
 import { DataStore } from "@aws-amplify/datastore";
-import x from "../../images/xIcon.svg";
+import x from "../../images/x.svg";
 import { PopupDiv, PopupBox, X, CancelBtn, SaveBtn } from "../styledComponents";
 import Monthly from "../monthlyView";
 import AppointmentInfo from "../appointmentInfo";
diff --git a/src/components/popup/timeslotSuccess.tsx b/src/components/popup/timeslotSuccess.tsx
index d37a85a..fe7510e 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/horseRiderIcon.svg";
+import logo from "../../images/horseRider.svg";
 import {
   Button,
   CenteredDescription,
diff --git a/src/components/resetPassword.tsx b/src/components/resetPassword.tsx
index 37c37f1..8ea454e 100644
--- a/src/components/resetPassword.tsx
+++ b/src/components/resetPassword.tsx
@@ -2,9 +2,9 @@
 import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Auth } from "aws-amplify";
-import eyeSlash from "../images/eyeSlashIcon.svg";
-import eye from "../images/eyeIcon.svg";
-import backArrow from "../images/backArrowIcon.png";
+import eyeSlash from "../images/eyeSlash.svg";
+import eye from "../images/eye.svg";
+import backArrow from "../images/backArrow.png";
 import {
   Wrapper,
   Box,
diff --git a/src/images/backArrowIcon.png b/src/images/backArrow.png
similarity index 100%
rename from src/images/backArrowIcon.png
rename to src/images/backArrow.png
diff --git a/src/images/bookmarkIcon.svg b/src/images/bookmark.svg
similarity index 100%
rename from src/images/bookmarkIcon.svg
rename to src/images/bookmark.svg
diff --git a/src/images/caretDownIcon.svg b/src/images/caretDown.svg
similarity index 100%
rename from src/images/caretDownIcon.svg
rename to src/images/caretDown.svg
diff --git a/src/images/checkedIcon.png b/src/images/checked.png
similarity index 100%
rename from src/images/checkedIcon.png
rename to src/images/checked.png
diff --git a/src/images/chevronLeftIcon.svg b/src/images/chevronLeft.svg
similarity index 100%
rename from src/images/chevronLeftIcon.svg
rename to src/images/chevronLeft.svg
diff --git a/src/images/exitxIcon.png b/src/images/exitx.png
similarity index 100%
rename from src/images/exitxIcon.png
rename to src/images/exitx.png
diff --git a/src/images/eyeIcon.svg b/src/images/eye.svg
similarity index 100%
rename from src/images/eyeIcon.svg
rename to src/images/eye.svg
diff --git a/src/images/eyeSlashIcon.svg b/src/images/eyeSlash.svg
similarity index 100%
rename from src/images/eyeSlashIcon.svg
rename to src/images/eyeSlash.svg
diff --git a/src/images/horseRiderIcon.svg b/src/images/horseRider.svg
similarity index 100%
rename from src/images/horseRiderIcon.svg
rename to src/images/horseRider.svg
diff --git a/src/images/lockIcon.svg b/src/images/lock.svg
similarity index 100%
rename from src/images/lockIcon.svg
rename to src/images/lock.svg
diff --git a/src/images/offSliderIcon.png b/src/images/offSlider.png
similarity index 100%
rename from src/images/offSliderIcon.png
rename to src/images/offSlider.png
diff --git a/src/images/onSliderIcon.png b/src/images/onSlider.png
similarity index 100%
rename from src/images/onSliderIcon.png
rename to src/images/onSlider.png
diff --git a/src/images/personIcon.svg b/src/images/person.svg
similarity index 100%
rename from src/images/personIcon.svg
rename to src/images/person.svg
diff --git a/src/images/petLogo1.jpg b/src/images/petLogo.jpg
similarity index 100%
rename from src/images/petLogo1.jpg
rename to src/images/petLogo.jpg
diff --git a/src/images/petLogo.svg b/src/images/petLogo2.svg
similarity index 100%
rename from src/images/petLogo.svg
rename to src/images/petLogo2.svg
diff --git a/src/images/signOutFull.png b/src/images/signOut.png
similarity index 100%
rename from src/images/signOutFull.png
rename to src/images/signOut.png
diff --git a/src/images/signOutIcon.png b/src/images/signOutArrow.png
similarity index 100%
rename from src/images/signOutIcon.png
rename to src/images/signOutArrow.png
diff --git a/src/images/uncheckedIcon.png b/src/images/unchecked.png
similarity index 100%
rename from src/images/uncheckedIcon.png
rename to src/images/unchecked.png
diff --git a/src/images/warningIcon.svg b/src/images/warning.svg
similarity index 100%
rename from src/images/warningIcon.svg
rename to src/images/warning.svg
diff --git a/src/images/xIcon.svg b/src/images/x.svg
similarity index 100%
rename from src/images/xIcon.svg
rename to src/images/x.svg