diff --git a/src/Makefile b/src/Makefile
index 3724a2b..2e88c25 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,7 +16,7 @@ GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources
 
 BUILT_SRC = resources.c
 
-_OBJ = main.o ui.o h_prop.o util.o read_config.o $(BUILT_SRC:.c=.o)
+_OBJ = main.o ui.o h_prop.o util.o read_config.o about_ui.o $(BUILT_SRC:.c=.o)
 OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
 
 # Determine this makefile's path.
@@ -41,22 +41,30 @@ wihotspot-gui: $(OBJ)
 	$(CC) -o $(ODIR)/$@ $^ $(CFLAGS) $(LIBS)
 
 install: $(ODIR)/wihotspot-gui
-	install -Dm644 desktop/hotspot.png $(DESTDIR)$(PREFIX)/share/pixmaps/wihotspot.png
+	install -Dm644 desktop/icons/hotspot@64.png $(DESTDIR)$(PREFIX)/share/pixmaps/wihotspot.png
+	install -Dm644 desktop/icons/hotspot@48.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/wihotspot.png
+	install -Dm644 desktop/icons/hotspot@64.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/wihotspot.png
+	install -Dm644 desktop/icons/hotspot@256.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/wihotspot.png
+	install -Dm644 desktop/icons/hotspot@512.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/512x512/apps/wihotspot.png
+	install -Dm644 desktop/icons/hotspot.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/wihotspot.svg
 	install -Dm644 desktop/wifihotspot.desktop $(DESTDIR)$(PREFIX)/share/applications/$(APP_NAME).desktop
 	install -Dm755 $(ODIR)/wihotspot-gui $(DESTDIR)$(BINDIR)/$(APP_GUI_BINARY)
 	cd scripts && $(MAKE) install
 
 uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/wihotspot.xpm
 	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/wihotspot.png
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/wihotspot.png
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/wihotspot.png
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/wihotspot.png
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/512x512/apps/wihotspot.png
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/wihotspot.svg
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/$(APP_NAME).desktop
 	rm -f $(DESTDIR)$(BINDIR)/$(APP_GUI_BINARY)
 	cd scripts && $(MAKE) uninstall
 
 clean-old:
-	rm -rf $(DESTDIR)/usr/share/wihotspot_gui
-	rm -rf $(DESTDIR)/usr/share/wihotspot
-	rm -f $(DESTDIR)/usr/bin/wihotspot_gui
-	rm -f $(DESTDIR)/usr/bin/wihotspot
+	rm -f $(DESTDIR)$(PREFIX)/share/pixmaps/wihotspot.png
 
 clean:
 	rm -f $(ODIR)/*.o
diff --git a/src/desktop/icons/hotspot.svg b/src/desktop/icons/hotspot.svg
new file mode 100644
index 0000000..336f1ee
--- /dev/null
+++ b/src/desktop/icons/hotspot.svg
@@ -0,0 +1 @@
+<svg id="Capa_1" enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><g><g><g><g><path d="m460.802 145.065c18.851 0 34.133 15.282 34.133 34.132l.002 252.621h-477.872l.001-252.621c0-18.851 15.282-34.132 34.133-34.132z" fill="#9facba"/><path d="m460.803 431.819v-235.552c0-9.426-7.641-17.067-17.067-17.067h-375.472c-9.426 0-17.067 7.641-17.067 17.067v235.552z" fill="#6aabf0"/><path d="m494.934 179.198c0-18.851-15.282-34.133-34.133-34.133h-23.694c18.851 0 34.133 15.282 34.133 34.133l.002 252.621h23.694z" fill="#8e9dad"/><path d="m443.737 179.2h-23.696c9.426 0 17.067 7.641 17.067 17.067v235.552h23.696v-235.552c-.001-9.426-7.642-17.067-17.067-17.067z" fill="#4596ec"/></g><path d="m505.6 426.668h-499.2c-3.535 0-6.4 2.865-6.4 6.4v27.734c0 18.851 15.282 34.133 34.132 34.133h9.34l7.725-4.225 7.728 4.225h18.68l7.725-4.225 7.728 4.225h18.681l7.725-4.225 7.728 4.225h350.675c18.851 0 34.133-15.282 34.133-34.133v-27.734c0-3.535-2.865-6.4-6.4-6.4z" fill="#c5d3dd"/><g fill="#abc1d1"><path d="m505.6 426.668h-23.694c3.535 0 6.4 2.865 6.4 6.4v27.734c0 18.851-15.282 34.132-34.132 34.132h23.694c18.851 0 34.133-15.282 34.133-34.132v-27.734c-.001-3.535-2.866-6.4-6.401-6.4z"/><path d="m443.734 453.075h-68.268c-13.671 0-24.793 11.122-24.793 24.793v17.067h15.453v-17.067c0-5.15 4.19-9.34 9.34-9.34h68.268c5.15 0 9.34 4.19 9.34 9.34v17.067h15.453v-17.067c0-13.671-11.122-24.793-24.793-24.793z"/><path d="m299.236 426.668-4.832 19.333c-1.041 4.165-4.768 7.075-9.061 7.075h-58.683c-4.294 0-8.02-2.909-9.061-7.075l-4.833-19.333h-15.956l5.796 23.081c2.765 11.057 12.656 18.78 24.053 18.78h58.683c11.397 0 21.289-7.723 24.053-18.78l5.773-23.081z"/></g><path d="m51.199 470.142c-4.268 0-7.726 3.459-7.726 7.726v17.067h15.453v-17.067c-.001-4.267-3.459-7.726-7.727-7.726z" fill="#35495e"/><path d="m85.332 470.142c-4.268 0-7.726 3.459-7.726 7.726v17.067h15.453v-17.067c-.001-4.267-3.459-7.726-7.727-7.726z" fill="#35495e"/><path d="m119.466 470.142c-4.268 0-7.726 3.459-7.726 7.726v17.067h15.453v-17.067c-.001-4.267-3.46-7.726-7.727-7.726z" fill="#35495e"/></g></g><g><ellipse cx="256" cy="187.733" fill="#6ed5a1" rx="170.668" ry="170.668" transform="matrix(.707 -.707 .707 .707 -57.767 236.005)"/><g><g fill="#f5f5f5"><ellipse cx="256" cy="256" rx="17.067" ry="17.067" transform="matrix(.083 -.997 .997 .083 -20.305 489.938)"/><path d="m154.153 177.584c3.539 3.317 9.084 2.984 12.295-.651 21.889-24.774 53.893-40.401 89.552-40.401 35.658 0 67.663 15.626 89.552 40.401 3.212 3.635 8.757 3.968 12.295.651l12.449-11.672c3.376-3.165 3.618-8.447.544-11.906-28.135-31.658-69.156-51.608-114.841-51.608s-86.706 19.95-114.841 51.608c-3.074 3.459-2.832 8.741.544 11.906z"/><path d="m204.01 224.326c3.626 3.399 9.324 2.949 12.487-.885 9.388-11.383 23.595-18.641 39.503-18.641 15.907 0 30.114 7.258 39.503 18.641 3.163 3.834 8.861 4.285 12.487.885l12.464-11.685c3.335-3.127 3.593-8.309.636-11.797-15.65-18.456-38.996-30.178-65.09-30.178s-49.44 11.722-65.09 30.178c-2.957 3.487-2.699 8.67.636 11.797z"/></g></g><g fill="#e0e0e0"><path d="m370.841 154.007c-28.135-31.658-69.156-51.608-114.841-51.608-3.987 0-7.936.161-11.847.46 40.897 3.121 77.314 22.253 102.994 51.148 3.074 3.459 2.832 8.741-.544 11.906l-6.07 5.691c1.724 1.727 3.402 3.5 5.019 5.33 3.212 3.635 8.757 3.968 12.295.651l12.45-11.672c3.375-3.165 3.617-8.447.544-11.906z"/><path d="m321.09 200.844c-15.65-18.456-38.996-30.178-65.09-30.178-4.021 0-7.975.28-11.847.819 21.258 2.955 40.004 13.747 53.243 29.359 2.957 3.487 2.699 8.67-.637 11.797l-6.095 5.714c1.722 1.587 3.347 3.278 4.838 5.086 3.163 3.834 8.861 4.285 12.487.885l12.464-11.685c3.336-3.127 3.594-8.31.637-11.797z"/><path d="m256 238.933c-4.605 0-8.777 1.833-11.847 4.798 3.213 3.104 5.22 7.449 5.22 12.269s-2.006 9.165-5.22 12.269c3.07 2.965 7.242 4.798 11.847 4.798 9.426 0 17.067-7.641 17.067-17.067s-7.641-17.067-17.067-17.067z"/></g><path d="m256 17.065c-3.983 0-7.932.148-11.847.416 88.729 6.085 158.821 79.977 158.821 170.251s-70.092 164.166-158.821 170.251c3.915.269 7.864.416 11.847.416 94.257 0 170.668-76.411 170.668-170.668 0-94.255-76.411-170.666-170.668-170.666z" fill="#46cc8d"/></g></g></svg>
\ No newline at end of file
diff --git a/src/desktop/icons/hotspot@256.png b/src/desktop/icons/hotspot@256.png
new file mode 100644
index 0000000..5eed709
Binary files /dev/null and b/src/desktop/icons/hotspot@256.png differ
diff --git a/src/desktop/icons/hotspot@48.png b/src/desktop/icons/hotspot@48.png
new file mode 100644
index 0000000..5539683
Binary files /dev/null and b/src/desktop/icons/hotspot@48.png differ
diff --git a/src/desktop/hotspot.png b/src/desktop/icons/hotspot@512.png
similarity index 100%
rename from src/desktop/hotspot.png
rename to src/desktop/icons/hotspot@512.png
diff --git a/src/desktop/icons/hotspot@64.png b/src/desktop/icons/hotspot@64.png
new file mode 100644
index 0000000..4ce6968
Binary files /dev/null and b/src/desktop/icons/hotspot@64.png differ