diff --git a/config/base.toml b/config/base.toml
index 351426861..858988729 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -174,22 +174,6 @@ path = "/share"
 data = "usr/share"
 symlink = true
 
-## legacy orbital directories
-[[files]]
-path = "/ui"
-data = "usr/share/ui"
-symlink = true
-
-[[files]]
-path = "/usr/share/ui/fonts"
-data = "/usr/share/fonts"
-symlink = true
-
-[[files]]
-path = "/usr/share/ui/icons"
-data = "/usr/share/icons"
-symlink = true
-
 ## /var
 [[files]]
 path = "/var"
diff --git a/config/desktop-contain.toml b/config/desktop-contain.toml
index d21c3c2fc..097544365 100644
--- a/config/desktop-contain.toml
+++ b/config/desktop-contain.toml
@@ -29,5 +29,5 @@ sandbox_schemes = ["file"]
 files = ["file:/dev/null"]
 rofiles = ["file:/etc/passwd", "file:/etc/hostname", "file:/etc/localtime"]
 dirs = ["file:/tmp"]
-rodirs = ["file:/bin", "file:/ui"]
+rodirs = ["file:/bin"]
 """
diff --git a/recipes/cosmic/cosmic-edit/manifest b/recipes/cosmic/cosmic-edit/manifest
index 0682999c3..251f2f5d1 100644
--- a/recipes/cosmic/cosmic-edit/manifest
+++ b/recipes/cosmic/cosmic-edit/manifest
@@ -1,6 +1,6 @@
 name=COSMIC Text Editor
 binary=/bin/cosmic-edit
-icon=/usr/share/ui/icons/apps/accessories-text-editor.png
+icon=/usr/share/icons/apps/accessories-text-editor.png
 accept=*.asm
 accept=*.c
 accept=*.conf
diff --git a/recipes/cosmic/cosmic-files/manifest b/recipes/cosmic/cosmic-files/manifest
index 62b4a9668..7a54cd545 100644
--- a/recipes/cosmic/cosmic-files/manifest
+++ b/recipes/cosmic/cosmic-files/manifest
@@ -1,5 +1,5 @@
 name=COSMIC File Manager
 binary=/bin/cosmic-files
-icon=/usr/share/ui/icons/apps/system-file-manager.png
+icon=/usr/share/icons/apps/system-file-manager.png
 author=Jeremy Soller
 description=COSMIC File Manager
diff --git a/recipes/cosmic/cosmic-reader/manifest b/recipes/cosmic/cosmic-reader/manifest
index c99e835d2..0aec5bf0c 100644
--- a/recipes/cosmic/cosmic-reader/manifest
+++ b/recipes/cosmic/cosmic-reader/manifest
@@ -1,6 +1,6 @@
 name=COSMIC Reader
 binary=/bin/cosmic-reader
-icon=/usr/share/ui/icons/apps/accessories-text-editor.png
+icon=/usr/share/icons/apps/accessories-text-editor.png
 accept=*.pdf
 accept=*.epub
 accept=*.cbz
diff --git a/recipes/cosmic/cosmic-term/manifest b/recipes/cosmic/cosmic-term/manifest
index 9342f3c4f..c4b2e1cd4 100644
--- a/recipes/cosmic/cosmic-term/manifest
+++ b/recipes/cosmic/cosmic-term/manifest
@@ -1,5 +1,5 @@
 name=COSMIC Terminal
 binary=/bin/cosmic-term
-icon=/usr/share/ui/icons/apps/utilities-terminal.png
+icon=/usr/share/icons/apps/utilities-terminal.png
 author=Jeremy Soller
 description=COSMIC Terminal
diff --git a/recipes/emulators/dosbox/manifest b/recipes/emulators/dosbox/manifest
index 0381a22fc..408f399a5 100644
--- a/recipes/emulators/dosbox/manifest
+++ b/recipes/emulators/dosbox/manifest
@@ -1,4 +1,4 @@
 name=DOSBox
 category=Games
 binary=/bin/dosbox
-icon=/usr/share/ui/icons/apps/dosbox.png
+icon=/usr/share/icons/apps/dosbox.png
diff --git a/recipes/games/classicube/manifest b/recipes/games/classicube/manifest
index 58ebf05a3..062877102 100644
--- a/recipes/games/classicube/manifest
+++ b/recipes/games/classicube/manifest
@@ -1,4 +1,4 @@
 name=ClassiCube
 category=Games
 binary=/usr/games/classicube/ClassiCube
-icon=/usr/share/ui/icons/apps/classicube.png
+icon=/usr/share/icons/apps/classicube.png
diff --git a/recipes/games/eduke32/manifest b/recipes/games/eduke32/manifest
index c9fd63f26..ff3c34740 100644
--- a/recipes/games/eduke32/manifest
+++ b/recipes/games/eduke32/manifest
@@ -1,4 +1,4 @@
 name=EDuke32
 category=Games
 binary=/usr/games/eduke32
-icon=/usr/share/ui/icons/apps/eduke32.png
+icon=/usr/share/icons/apps/eduke32.png
diff --git a/recipes/games/freedoom/recipe.toml b/recipes/games/freedoom/recipe.toml
index 45d2ceebb..f4547f9af 100644
--- a/recipes/games/freedoom/recipe.toml
+++ b/recipes/games/freedoom/recipe.toml
@@ -20,7 +20,7 @@ do
     echo "name=$game" | sed 's/freedoom/FreeDOOM: Phase /' | sed 's/doom1/DOOM (Shareware)/' > "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
     echo "category=Games" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
     echo "binary=/usr/games/$game" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
-    echo "icon=/usr/share/ui/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
+    echo "icon=/usr/share/icons/apps/$game.png" >> "${COOKBOOK_STAGE}/usr/share/ui/apps/$game"
 
     cp -v "${COOKBOOK_SOURCE}/$game.png" "${COOKBOOK_STAGE}/usr/share/icons/apps/$game.png"
 done
diff --git a/recipes/games/gigalomania/manifest b/recipes/games/gigalomania/manifest
index 8f45b54a2..3792c13a0 100644
--- a/recipes/games/gigalomania/manifest
+++ b/recipes/games/gigalomania/manifest
@@ -1,4 +1,4 @@
 name=Gigalomania
 category=Games
 binary=/usr/games/gigalomania/gigalomania
-icon=/usr/share/ui/icons/apps/gigalomania.png
+icon=/usr/share/icons/apps/gigalomania.png
diff --git a/recipes/games/neverball/manifest-neverball b/recipes/games/neverball/manifest-neverball
index 89510ee08..39dfb9e71 100644
--- a/recipes/games/neverball/manifest-neverball
+++ b/recipes/games/neverball/manifest-neverball
@@ -1,4 +1,4 @@
 name=Neverball
 category=Games
 binary=/usr/games/neverball/neverball
-icon=/usr/share/ui/icons/apps/neverball.png
+icon=/usr/share/icons/apps/neverball.png
diff --git a/recipes/games/neverball/manifest-neverputt b/recipes/games/neverball/manifest-neverputt
index 7eb4a2e3f..3fb7bfe92 100644
--- a/recipes/games/neverball/manifest-neverputt
+++ b/recipes/games/neverball/manifest-neverputt
@@ -1,4 +1,4 @@
 name=Neverputt
 category=Games
 binary=/usr/games/neverball/neverputt
-icon=/usr/share/ui/icons/apps/neverputt.png
+icon=/usr/share/icons/apps/neverputt.png
diff --git a/recipes/games/quakespasm/manifest b/recipes/games/quakespasm/manifest
index 3813ede74..fbc74827e 100644
--- a/recipes/games/quakespasm/manifest
+++ b/recipes/games/quakespasm/manifest
@@ -1,4 +1,4 @@
 name=QuakeSpasm
 category=Games
 binary=/usr/games/quakespasm
-icon=/usr/share/ui/icons/apps/quakespasm.png
+icon=/usr/share/icons/apps/quakespasm.png
diff --git a/recipes/games/sm64ex/manifest b/recipes/games/sm64ex/manifest
index 321fbfc4a..0d01b7235 100644
--- a/recipes/games/sm64ex/manifest
+++ b/recipes/games/sm64ex/manifest
@@ -1,4 +1,4 @@
 name=Super Mario 64 EX
 category=Games
 binary=/bin/sm64
-icon=/usr/share/ui/icons/apps/sm64ex.png
+icon=/usr/share/icons/apps/sm64ex.png
diff --git a/recipes/web/netsurf/manifest b/recipes/web/netsurf/manifest
index a9ae25704..49c80bb5e 100644
--- a/recipes/web/netsurf/manifest
+++ b/recipes/web/netsurf/manifest
@@ -1,6 +1,6 @@
 name=Netsurf
 binary=/usr/bin/netsurf-fb
-icon=/usr/share/ui/icons/apps/internet-web-browser.png
+icon=/usr/share/icons/apps/internet-web-browser.png
 accept=*.html
 author=The Netsurf Developers
 description=Browser for Redox
diff --git a/recipes/wip/cosmic/cosmic-player/manifest b/recipes/wip/cosmic/cosmic-player/manifest
index f87b03905..ad87b493f 100644
--- a/recipes/wip/cosmic/cosmic-player/manifest
+++ b/recipes/wip/cosmic/cosmic-player/manifest
@@ -1,6 +1,6 @@
 name=COSMIC Media Player
 binary=/usr/bin/cosmic-player
-icon=/usr/share/ui/icons/apps/multimedia-photo-viewer.png
+icon=/usr/share/icons/apps/multimedia-photo-viewer.png
 author=Jeremy Soller
 description=COSMIC Media Player
 accept=*.avi
diff --git a/recipes/wip/games/data/openjazz-shareware-data/manifest b/recipes/wip/games/data/openjazz-shareware-data/manifest
index 8d1f2f327..ec8af011a 100644
--- a/recipes/wip/games/data/openjazz-shareware-data/manifest
+++ b/recipes/wip/games/data/openjazz-shareware-data/manifest
@@ -1,4 +1,4 @@
 name=Jazz Jackrabbit (shareware)
 category=Games
 binary=/usr/games/OpenJazz
-icon=/usr/share/ui/icons/apps/OpenJazz.png
+icon=/usr/share/icons/apps/OpenJazz.png
diff --git a/recipes/wip/web/webkitgtk3/webkit.desktop b/recipes/wip/web/webkitgtk3/webkit.desktop
index 43aab7b08..1ff81bafd 100644
--- a/recipes/wip/web/webkitgtk3/webkit.desktop
+++ b/recipes/wip/web/webkitgtk3/webkit.desktop
@@ -2,7 +2,7 @@
 Name=WebKit
 Comment=WebKit GTK Browser
 Exec=webkit
-Icon=/usr/share/ui/icons/apps/internet-web-browser.png
+Icon=/usr/share/icons/apps/internet-web-browser.png
 Terminal=false
 Type=Application
 StartupNotify=true