diff --git a/Makefile b/Makefile
index 2c5e8df4ba..f9b45730cb 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,15 @@ install:
 	    $(DESTDIR)/usr/share/icons/Pop
 	./icons-recolor.sh $(DESTDIR)/usr/share/icons/Pop/
 
+	mkdir -p $(DESTDIR)/usr/share/icons/Pop-Extra
+	./icons-split.sh $(DESTDIR)/usr/share/icons/Pop/ $(DESTDIR)/usr/share/icons/Pop-Extra/
+
 post-install:
 	-gtk-update-icon-cache -q $(DESTDIR)/usr/share/icons/Pop
+	-gtk-update-icon-cache -q $(DESTDIR)/usr/share/icons/Pop-Extra
 
 uninstall:
-	-rm -rf $(DESTDIR)/usr/share/icons/Pop
+	-rm -rf $(DESTDIR)/usr/share/icons/Pop $(DESTDIR)/usr/share/icons/Pop-Extra
 
 _get_version:
 	$(eval VERSION := $(shell git show -s --format=%cd --date=format:%Y%m%d HEAD))
diff --git a/debian/changelog b/debian/changelog
index bba09c14d0..18e94ed4a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pop-icon-theme (1.3.0) bionic; urgency=medium
+
+  * Split out application icons to separate icon theme
+
+ -- Jeremy Soller <jeremy@system76.com>  Mon, 21 May 2018 11:16:32 -0600
+
 pop-icon-theme (1.2.2) artful; urgency=medium
 
   * GOA Nextcloud Icon workaround.
diff --git a/debian/control b/debian/control
index 56626d9cbb..63c9464442 100644
--- a/debian/control
+++ b/debian/control
@@ -10,5 +10,11 @@ Homepage: https://github.com/system76/pop-icon-theme
 Package: pop-icon-theme
 Architecture: all
 Depends: ${misc:Depends}
+Suggests: pop-icon-theme-extra
 Conflicts: system76-pop-icon-theme
 Description: Pop Icons
+
+Package: pop-icon-theme-extra
+Architecture: all
+Depends: ${misc:Depends} pop-icon-theme (>= ${binary:Version})
+Description: Pop Icon theme additional
diff --git a/debian/pop-icon-theme-extra.install b/debian/pop-icon-theme-extra.install
new file mode 100644
index 0000000000..c921331e5b
--- /dev/null
+++ b/debian/pop-icon-theme-extra.install
@@ -0,0 +1 @@
+/usr/share/icons/Pop-Extra
diff --git a/debian/pop-icon-theme.install b/debian/pop-icon-theme.install
new file mode 100644
index 0000000000..3fc4bbb566
--- /dev/null
+++ b/debian/pop-icon-theme.install
@@ -0,0 +1 @@
+/usr/share/icons/Pop
diff --git a/icons-split.sh b/icons-split.sh
new file mode 100755
index 0000000000..0dd761b93e
--- /dev/null
+++ b/icons-split.sh
@@ -0,0 +1,30 @@
+#!/bin/bash -e
+
+APPS=(
+    builder
+    org.gnome.builder
+    org.gnome.Builder
+)
+
+if [ ! -d "$1" -o ! -d "$2" ]
+then
+    echo "$0 [original] [new]"
+    exit 1
+fi
+
+ORIGINAL="$(realpath "$1")"
+NEW="$(realpath "$2")"
+
+cd "$ORIGINAL"
+for app in "${APPS[@]}"
+do
+    for folder in */apps
+    do
+        file="$folder/$app.svg"
+        if [ -f "$file" ]
+        then
+            mkdir -pv "$NEW/$folder"
+            mv -v "$file" "$NEW/$file"
+        fi
+    done
+done