diff --git a/icons-dark/actions/16/installed.svg b/icons-dark/actions/16/installed.svg
deleted file mode 120000
--- a/icons-dark/actions/16/installed.svg
+++ /dev/null
@@ -1 +0,0 @@
-package-reinstall.svg
\ No newline at end of file
diff --git a/icons-dark/actions/16/package-available-locked.svg b/icons-dark/actions/16/package-available-locked.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-available-locked.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-available.svg b/icons-dark/actions/16/package-available.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-available.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-broken.svg b/icons-dark/actions/16/package-broken.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-broken.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-downgrade.svg b/icons-dark/actions/16/package-downgrade.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-downgrade.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-install.svg b/icons-dark/actions/16/package-install.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-install.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-installed-locked.svg b/icons-dark/actions/16/package-installed-locked.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-installed-locked.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-installed-outdated.svg b/icons-dark/actions/16/package-installed-outdated.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-installed-outdated.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-installed-updated.svg b/icons-dark/actions/16/package-installed-updated.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-installed-updated.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-new.svg b/icons-dark/actions/16/package-new.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-new.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-purge.svg b/icons-dark/actions/16/package-purge.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-purge.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-reinstall.svg b/icons-dark/actions/16/package-reinstall.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-reinstall.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-remove.svg b/icons-dark/actions/16/package-remove.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-remove.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-supported.svg b/icons-dark/actions/16/package-supported.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-supported.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
diff --git a/icons-dark/actions/16/package-upgrade.svg b/icons-dark/actions/16/package-upgrade.svg
deleted file mode 100644
--- a/icons-dark/actions/16/package-upgrade.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons-dark/emblems/16/installed.svg b/icons-dark/emblems/16/installed.svg
new file mode 120000
--- /dev/null
+++ b/icons-dark/emblems/16/installed.svg
@@ -0,0 +1 @@
+emblem-checked.svg
\ No newline at end of file
diff --git a/icons-dark/actions/16/newer.svg b/icons-dark/emblems/16/newer.svg
rename from icons-dark/actions/16/newer.svg
rename to icons-dark/emblems/16/newer.svg
diff --git a/icons-dark/actions/16/noninstalled.svg b/icons-dark/emblems/16/noninstalled.svg
rename from icons-dark/actions/16/noninstalled.svg
rename to icons-dark/emblems/16/noninstalled.svg
diff --git a/icons-dark/actions/16/outdated.svg b/icons-dark/emblems/16/outdated.svg
rename from icons-dark/actions/16/outdated.svg
rename to icons-dark/emblems/16/outdated.svg
diff --git a/icons-dark/emblems/16/package-available-locked.svg b/icons-dark/emblems/16/package-available-locked.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-available-locked.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons-dark/emblems/16/package-available.svg b/icons-dark/emblems/16/package-available.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-available.svg
@@ -0,0 +1,10 @@
+
diff --git a/icons-dark/emblems/16/package-broken.svg b/icons-dark/emblems/16/package-broken.svg
new file mode 120000
--- /dev/null
+++ b/icons-dark/emblems/16/package-broken.svg
@@ -0,0 +1 @@
+emblem-error.svg
\ No newline at end of file
diff --git a/icons-dark/emblems/16/package-downgrade.svg b/icons-dark/emblems/16/package-downgrade.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-downgrade.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons-dark/emblems/16/package-install-auto.svg b/icons-dark/emblems/16/package-install-auto.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-install-auto.svg
@@ -0,0 +1,20 @@
+
diff --git a/icons-dark/emblems/16/package-install.svg b/icons-dark/emblems/16/package-install.svg
new file mode 120000
--- /dev/null
+++ b/icons-dark/emblems/16/package-install.svg
@@ -0,0 +1 @@
+emblem-added.svg
\ No newline at end of file
diff --git a/icons-dark/emblems/16/package-installed-locked.svg b/icons-dark/emblems/16/package-installed-locked.svg
new file mode 120000
--- /dev/null
+++ b/icons-dark/emblems/16/package-installed-locked.svg
@@ -0,0 +1 @@
+emblem-locked.svg
\ No newline at end of file
diff --git a/icons-dark/emblems/16/package-installed-outdated.svg b/icons-dark/emblems/16/package-installed-outdated.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-installed-outdated.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons-dark/emblems/16/package-installed-updated.svg b/icons-dark/emblems/16/package-installed-updated.svg
new file mode 120000
--- /dev/null
+++ b/icons-dark/emblems/16/package-installed-updated.svg
@@ -0,0 +1 @@
+emblem-checked.svg
\ No newline at end of file
diff --git a/icons-dark/emblems/16/package-new.svg b/icons-dark/emblems/16/package-new.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-new.svg
@@ -0,0 +1,11 @@
+
diff --git a/icons-dark/emblems/16/package-purge.svg b/icons-dark/emblems/16/package-purge.svg
new file mode 120000
--- /dev/null
+++ b/icons-dark/emblems/16/package-purge.svg
@@ -0,0 +1 @@
+package-remove.svg
\ No newline at end of file
diff --git a/icons-dark/emblems/16/package-reinstall.svg b/icons-dark/emblems/16/package-reinstall.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-reinstall.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons-dark/emblems/16/package-remove-auto.svg b/icons-dark/emblems/16/package-remove-auto.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-remove-auto.svg
@@ -0,0 +1,20 @@
+
diff --git a/icons-dark/emblems/16/package-remove.svg b/icons-dark/emblems/16/package-remove.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-remove.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons-dark/emblems/16/package-upgrade-auto.svg b/icons-dark/emblems/16/package-upgrade-auto.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-upgrade-auto.svg
@@ -0,0 +1,21 @@
+
diff --git a/icons-dark/emblems/16/package-upgrade.svg b/icons-dark/emblems/16/package-upgrade.svg
new file mode 100644
--- /dev/null
+++ b/icons-dark/emblems/16/package-upgrade.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons/actions/16/unrequired.svg b/icons-dark/emblems/16/unrequired.svg
rename from icons/actions/16/unrequired.svg
rename to icons-dark/emblems/16/unrequired.svg
diff --git a/icons/actions/16/installed.svg b/icons/actions/16/installed.svg
deleted file mode 120000
--- a/icons/actions/16/installed.svg
+++ /dev/null
@@ -1 +0,0 @@
-package-reinstall.svg
\ No newline at end of file
diff --git a/icons/actions/16/package-available-locked.svg b/icons/actions/16/package-available-locked.svg
deleted file mode 100644
--- a/icons/actions/16/package-available-locked.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons/actions/16/package-available.svg b/icons/actions/16/package-available.svg
deleted file mode 100644
--- a/icons/actions/16/package-available.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/icons/actions/16/package-broken.svg b/icons/actions/16/package-broken.svg
deleted file mode 100644
--- a/icons/actions/16/package-broken.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons/actions/16/package-downgrade.svg b/icons/actions/16/package-downgrade.svg
deleted file mode 100644
--- a/icons/actions/16/package-downgrade.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons/actions/16/package-install.svg b/icons/actions/16/package-install.svg
deleted file mode 100644
--- a/icons/actions/16/package-install.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons/actions/16/package-installed-locked.svg b/icons/actions/16/package-installed-locked.svg
deleted file mode 100644
--- a/icons/actions/16/package-installed-locked.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-
diff --git a/icons/actions/16/package-installed-outdated.svg b/icons/actions/16/package-installed-outdated.svg
deleted file mode 100644
--- a/icons/actions/16/package-installed-outdated.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons/actions/16/package-installed-updated.svg b/icons/actions/16/package-installed-updated.svg
deleted file mode 100644
--- a/icons/actions/16/package-installed-updated.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
diff --git a/icons/actions/16/package-new.svg b/icons/actions/16/package-new.svg
deleted file mode 100644
--- a/icons/actions/16/package-new.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/icons/actions/16/package-purge.svg b/icons/actions/16/package-purge.svg
deleted file mode 100644
--- a/icons/actions/16/package-purge.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons/actions/16/package-reinstall.svg b/icons/actions/16/package-reinstall.svg
deleted file mode 100644
--- a/icons/actions/16/package-reinstall.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/icons/actions/16/package-remove.svg b/icons/actions/16/package-remove.svg
deleted file mode 100644
--- a/icons/actions/16/package-remove.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/icons/actions/16/package-supported.svg b/icons/actions/16/package-supported.svg
deleted file mode 100644
--- a/icons/actions/16/package-supported.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
diff --git a/icons/actions/16/package-upgrade.svg b/icons/actions/16/package-upgrade.svg
deleted file mode 100644
--- a/icons/actions/16/package-upgrade.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
diff --git a/icons/emblems/16/installed.svg b/icons/emblems/16/installed.svg
new file mode 120000
--- /dev/null
+++ b/icons/emblems/16/installed.svg
@@ -0,0 +1 @@
+emblem-checked.svg
\ No newline at end of file
diff --git a/icons/actions/16/newer.svg b/icons/emblems/16/newer.svg
rename from icons/actions/16/newer.svg
rename to icons/emblems/16/newer.svg
diff --git a/icons/actions/16/noninstalled.svg b/icons/emblems/16/noninstalled.svg
rename from icons/actions/16/noninstalled.svg
rename to icons/emblems/16/noninstalled.svg
diff --git a/icons/actions/16/outdated.svg b/icons/emblems/16/outdated.svg
rename from icons/actions/16/outdated.svg
rename to icons/emblems/16/outdated.svg
diff --git a/icons/emblems/16/package-available-locked.svg b/icons/emblems/16/package-available-locked.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-available-locked.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons/emblems/16/package-available.svg b/icons/emblems/16/package-available.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-available.svg
@@ -0,0 +1,10 @@
+
diff --git a/icons/emblems/16/package-broken.svg b/icons/emblems/16/package-broken.svg
new file mode 120000
--- /dev/null
+++ b/icons/emblems/16/package-broken.svg
@@ -0,0 +1 @@
+emblem-error.svg
\ No newline at end of file
diff --git a/icons/emblems/16/package-downgrade.svg b/icons/emblems/16/package-downgrade.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-downgrade.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons/emblems/16/package-install-auto.svg b/icons/emblems/16/package-install-auto.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-install-auto.svg
@@ -0,0 +1,20 @@
+
diff --git a/icons/emblems/16/package-install.svg b/icons/emblems/16/package-install.svg
new file mode 120000
--- /dev/null
+++ b/icons/emblems/16/package-install.svg
@@ -0,0 +1 @@
+emblem-added.svg
\ No newline at end of file
diff --git a/icons/emblems/16/package-installed-locked.svg b/icons/emblems/16/package-installed-locked.svg
new file mode 120000
--- /dev/null
+++ b/icons/emblems/16/package-installed-locked.svg
@@ -0,0 +1 @@
+emblem-locked.svg
\ No newline at end of file
diff --git a/icons/emblems/16/package-installed-outdated.svg b/icons/emblems/16/package-installed-outdated.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-installed-outdated.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons/emblems/16/package-installed-updated.svg b/icons/emblems/16/package-installed-updated.svg
new file mode 120000
--- /dev/null
+++ b/icons/emblems/16/package-installed-updated.svg
@@ -0,0 +1 @@
+emblem-checked.svg
\ No newline at end of file
diff --git a/icons/emblems/16/package-new.svg b/icons/emblems/16/package-new.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-new.svg
@@ -0,0 +1,11 @@
+
diff --git a/icons/emblems/16/package-purge.svg b/icons/emblems/16/package-purge.svg
new file mode 120000
--- /dev/null
+++ b/icons/emblems/16/package-purge.svg
@@ -0,0 +1 @@
+package-remove.svg
\ No newline at end of file
diff --git a/icons/emblems/16/package-reinstall.svg b/icons/emblems/16/package-reinstall.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-reinstall.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons/emblems/16/package-remove-auto.svg b/icons/emblems/16/package-remove-auto.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-remove-auto.svg
@@ -0,0 +1,20 @@
+
diff --git a/icons/emblems/16/package-remove.svg b/icons/emblems/16/package-remove.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-remove.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons/emblems/16/package-upgrade-auto.svg b/icons/emblems/16/package-upgrade-auto.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-upgrade-auto.svg
@@ -0,0 +1,21 @@
+
diff --git a/icons/emblems/16/package-upgrade.svg b/icons/emblems/16/package-upgrade.svg
new file mode 100644
--- /dev/null
+++ b/icons/emblems/16/package-upgrade.svg
@@ -0,0 +1,15 @@
+
diff --git a/icons/actions/16/unrequired.svg b/icons/emblems/16/unrequired.svg
rename from icons/actions/16/unrequired.svg
rename to icons/emblems/16/unrequired.svg