diff --git a/debian/postinst b/debian/postinst
index 0f27ce2..7e49f5e 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -24,40 +24,40 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov
             /usr/share/desktop-base/os-logos 50 \
             --slave /usr/share/icons/vendor/64x64/emblems/emblem-vendor.png \
                 emblem-vendor-64 \
-                /usr/share/icons/desktop-base/64x64/emblems/emblem-system.png \
+                /usr/share/icons/desktop-base/64x64/emblems/emblem-vesperos.png \
             --slave /usr/share/icons/vendor/128x128/emblems/emblem-vendor.png \
                 emblem-vendor-128 \
-                /usr/share/icons/desktop-base/128x128/emblems/emblem-system.png \
+                /usr/share/icons/desktop-base/128x128/emblems/emblem-vesperos.png \
             --slave /usr/share/icons/vendor/256x256/emblems/emblem-vendor.png \
                 emblem-vendor-256 \
-                /usr/share/icons/desktop-base/256x256/emblems/emblem-system.png \
+                /usr/share/icons/desktop-base/256x256/emblems/emblem-vesperos.png \
             --slave /usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg \
                 emblem-vendor-scalable \
-                /usr/share/icons/desktop-base/scalable/emblems/emblem-system.svg \
+                /usr/share/icons/desktop-base/scalable/emblems/emblem-vesperos.svg \
             --slave /usr/share/icons/vendor/64x64/emblems/emblem-vendor-symbolic.png \
                 emblem-vendor-symbolic-64 \
-                /usr/share/icons/desktop-base/64x64/emblems/emblem-system-symbolic.png \
+                /usr/share/icons/desktop-base/64x64/emblems/emblem-debian-symbolic.png \
             --slave /usr/share/icons/vendor/128x128/emblems/emblem-vendor-symbolic.png \
                 emblem-vendor-symbolic-128 \
-                /usr/share/icons/desktop-base/128x128/emblems/emblem-system-symbolic.png \
+                /usr/share/icons/desktop-base/128x128/emblems/emblem-debian-symbolic.png \
             --slave /usr/share/icons/vendor/256x256/emblems/emblem-vendor-symbolic.png \
                 emblem-vendor-symbolic-256 \
-                /usr/share/icons/desktop-base/256x256/emblems/emblem-system-symbolic.png \
+                /usr/share/icons/desktop-base/256x256/emblems/emblem-debian-symbolic.png \
             --slave /usr/share/icons/vendor/scalable/emblems/emblem-vendor-symbolic.svg \
                 emblem-vendor-symbolic-scalable \
-                /usr/share/icons/desktop-base/scalable/emblems/emblem-system-symbolic.svg \
+                /usr/share/icons/desktop-base/scalable/emblems/emblem-debian-symbolic.svg \
             --slave /usr/share/icons/vendor/64x64/emblems/emblem-vendor-white.png \
                 emblem-vendor-white-64 \
-                /usr/share/icons/desktop-base/64x64/emblems/emblem-system-white.png \
+                /usr/share/icons/desktop-base/64x64/emblems/emblem-debian-white.png \
             --slave /usr/share/icons/vendor/128x128/emblems/emblem-vendor-white.png \
                 emblem-vendor-white-128 \
-                /usr/share/icons/desktop-base/128x128/emblems/emblem-system-white.png \
+                /usr/share/icons/desktop-base/128x128/emblems/emblem-debian-white.png \
             --slave /usr/share/icons/vendor/256x256/emblems/emblem-vendor-white.png \
                 emblem-vendor-white-256 \
-                /usr/share/icons/desktop-base/256x256/emblems/emblem-system-white.png \
+                /usr/share/icons/desktop-base/256x256/emblems/emblem-debian-white.png \
             --slave /usr/share/icons/vendor/scalable/emblems/emblem-vendor-white.svg \
                 emblem-vendor-white-scalable \
-                /usr/share/icons/desktop-base/scalable/emblems/emblem-system-white.svg
+                /usr/share/icons/desktop-base/scalable/emblems/emblem-debian-white.svg
 
     # Theme package alternatives
     while read theme priority; do
diff --git a/emblems-vesperos/Makefile b/emblems-vesperos/Makefile
index 53fc4b1..d8b509f 100644
--- a/emblems-vesperos/Makefile
+++ b/emblems-vesperos/Makefile
@@ -33,15 +33,20 @@ clean:
 	rm -f *.png
 
 install:
-	# Generic vendor folders, created empty and will be populated with
-	# update-alternatives
+	# Generic vendor folders, symlinked to desktop-base emblems
 	for RES in $(RESOLUTIONS) ; do \
 		RES_DIR=$(DESTDIR)/$(TARGET_VENDOR)/$${RES}x$${RES}/emblems ; \
 		install -d $${RES_DIR} ; \
+		for EMBLEM in $(EMBLEMS) ; do \
+			ln -sf /usr/share/icons/desktop-base/$${RES}x$${RES}/emblems/$${EMBLEM}.png \
+				$${RES_DIR}/$${EMBLEM}.png ; \
+		done ; \
 	done
 	install -d $(DESTDIR)/$(TARGET_VENDOR)/scalable/emblems
-	ln -sf /usr/share/icons/desktop-base/scalable/emblems/emblem-vesperos.svg \
-		$(DESTDIR)/$(TARGET_VENDOR)/scalable/emblems/emblem-vendor.svg
+	for EMBLEM in $(EMBLEMS) ; do \
+		ln -sf /usr/share/icons/desktop-base/scalable/emblems/$${EMBLEM}.svg \
+			$(DESTDIR)/$(TARGET_VENDOR)/scalable/emblems/$${EMBLEM}.svg ; \
+	done
 	# Install PNG icons for each resolution
 	for RES in $(RESOLUTIONS) ; do \
 		EMBLEMS_DIR=$(DESTDIR)/$(TARGET_DIR)/$${RES}x$${RES}/emblems ; \