diff --git a/pages/components/Metrics.jsx b/pages/components/Metrics.jsx
index 765a665..fcd6359 100644
--- a/pages/components/Metrics.jsx
+++ b/pages/components/Metrics.jsx
@@ -13,7 +13,7 @@ const Metrics = ({ styles, data, systemUsed }) => {
     <div className={styles.statsBox}>
       <MetricCard
         title={"Humidity"}
-        iconSrc={"/icons/025-humidity.png"}
+        iconSrc={"/icons/humidity.png"}
         metric={data.main.humidity}
         unit={"%"}
         styles={styles}
@@ -21,7 +21,7 @@ const Metrics = ({ styles, data, systemUsed }) => {
 
       <MetricCard
         title={"Wind speed"}
-        iconSrc={"/icons/017-wind.png"}
+        iconSrc={"/icons/wind.png"}
         metric={getWindSpeed(systemUsed, data.wind.speed)}
         unit={systemUsed == "metric" ? "m/s" : "m/h"}
         styles={styles}
@@ -29,7 +29,7 @@ const Metrics = ({ styles, data, systemUsed }) => {
 
       <MetricCard
         title={"Wind direction"}
-        iconSrc={"/icons/014-compass.png"}
+        iconSrc={"/icons/compass.png"}
         metric={degToCompass(data.wind.deg)}
         styles={styles}
       />
@@ -44,7 +44,7 @@ const Metrics = ({ styles, data, systemUsed }) => {
 
       <MetricCard
         title={"Sunrise"}
-        iconSrc={"/icons/040-sunrise.png"}
+        iconSrc={"/icons/sunrise.png"}
         metric={getTime(systemUsed, data.sys.sunrise, data.timezone)}
         unit={getAMPM(systemUsed, data.sys.sunrise, data.timezone)}
         styles={styles}
@@ -52,7 +52,7 @@ const Metrics = ({ styles, data, systemUsed }) => {
 
       <MetricCard
         title={"Sunset"}
-        iconSrc={"/icons/041-sunset.png"}
+        iconSrc={"/icons/sunset.png"}
         metric={getTime(systemUsed, data.sys.sunset, data.timezone)}
         unit={getAMPM(systemUsed, data.sys.sunset, data.timezone)}
         styles={styles}
diff --git a/pages/index.js b/pages/index.js
index 9a43282..4a1cc29 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,11 +1,13 @@
 import { useState, useEffect } from "react";
-import styles from "../styles/Home.module.css";
 import Image from "next/image";
+
 import Metrics from "./components/Metrics";
 import { convertTime, ctoF, timeToAMPM } from "./services/converters";
 import { isPM } from "./services/utils";
 
-export default function Home() {
+import styles from "../styles/Home.module.css";
+
+const App = () => {
   const [input, setInput] = useState("Riga");
   const [systemUsed, setSystemUsed] = useState("metric");
   const [weatherData, setWeatherData] = useState();
@@ -159,4 +161,6 @@ export default function Home() {
       <h1>Loading data...</h1>
     </div>
   );
-}
+};
+
+export default App;
diff --git a/public/icons/017-wind.png b/public/icons/017-wind.png
deleted file mode 100644
index 732e456..0000000
Binary files a/public/icons/017-wind.png and /dev/null differ
diff --git a/public/icons/014-compass.png b/public/icons/compass.png
similarity index 100%
rename from public/icons/014-compass.png
rename to public/icons/compass.png
diff --git a/public/icons/025-humidity.png b/public/icons/humidity.png
similarity index 100%
rename from public/icons/025-humidity.png
rename to public/icons/humidity.png
diff --git a/public/icons/040-sunrise.png b/public/icons/sunrise.png
similarity index 100%
rename from public/icons/040-sunrise.png
rename to public/icons/sunrise.png
diff --git a/public/icons/041-sunset.png b/public/icons/sunset.png
similarity index 100%
rename from public/icons/041-sunset.png
rename to public/icons/sunset.png
diff --git a/public/icons/wind.png b/public/icons/wind.png
index 5484e42..732e456 100644
Binary files a/public/icons/wind.png and b/public/icons/wind.png differ