diff --git a/Bustle/Application/Monad.hs b/Bustle/Application/Monad.hs
--- a/Bustle/Application/Monad.hs
+++ b/Bustle/Application/Monad.hs
@@ -31,7 +31,6 @@
   )
 where
 
-import Control.Applicative
 import Control.Monad.Reader
 import Control.Monad.State
 
diff --git a/Bustle/Loader/Pcap.hs b/Bustle/Loader/Pcap.hs
--- a/Bustle/Loader/Pcap.hs
+++ b/Bustle/Loader/Pcap.hs
@@ -1,7 +1,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-
-Bustle.Loader.Pcap: loads logs out of pcap files using dbus-core
+Bustle.Loader.Pcap: loads logs out of pcap files
 Copyright © 2011–2012 Collabora Ltd.
+Copyright © 2017      Will Thompson
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -31,6 +32,7 @@
 import Data.Map (Map)
 import Control.Exception (try)
 import Control.Monad.State
+import System.IO.Error (mkIOError, userErrorType)
 
 import Network.Pcap
 
@@ -253,8 +255,11 @@
          -> IO (Either IOError ([String], [B.DetailedEvent]))
 readPcap path = try $ do
     p <- openOffline path
-
-    -- TODO: check link type header is DLT_DBUS or DLT_NULL (for
-    -- backwards-compatibility)
+    dlt <- datalink p
+    -- DLT_NULL for extremely old logs.
+    -- DLT_DBUS is missing: https://github.com/bos/pcap/pull/8
+    when (not $ elem dlt [DLT_NULL, DLT_UNKNOWN 231]) $ do
+        let message = "Incorrect link type " ++ show dlt
+        ioError $ mkIOError userErrorType message Nothing (Just path)
 
     liftM partitionEithers $ evalStateT (mapBodies p convert) Map.empty
diff --git a/Bustle/Marquee.hs b/Bustle/Marquee.hs
--- a/Bustle/Marquee.hs
+++ b/Bustle/Marquee.hs
@@ -34,7 +34,6 @@
   )
 where
 
-import Data.Monoid
 import Data.Text (Text)
 import qualified Data.Text as T
 
diff --git a/Bustle/StatisticsPane.hs b/Bustle/StatisticsPane.hs
--- a/Bustle/StatisticsPane.hs
+++ b/Bustle/StatisticsPane.hs
@@ -32,7 +32,6 @@
 import Bustle.Types (Log)
 import qualified Bustle.Marquee as Marquee
 import Bustle.Marquee (Marquee)
-import Data.Monoid
 
 data StatsPane =
     StatsPane { spCountStore :: ListStore FrequencyInfo
diff --git a/Bustle/Types.hs b/Bustle/Types.hs
--- a/Bustle/Types.hs
+++ b/Bustle/Types.hs
@@ -44,7 +44,6 @@
   , fakeUniqueName
 
   , Microseconds(..)
-  , µsFromPair
   , µsToMs
 
   , Member(..)
@@ -112,11 +111,6 @@
 
 newtype Microseconds = Microseconds Integer
   deriving (Show, Ord, Eq, Num, Real, Enum, Integral)
-
-µsFromPair :: Integer
-           -> Integer
-           -> Microseconds
-µsFromPair s µs = Microseconds $ (s * 1000000) + µs
 
 µsToMs :: Microseconds
        -> Integer
diff --git a/Bustle/UI/AboutDialog.hs b/Bustle/UI/AboutDialog.hs
--- a/Bustle/UI/AboutDialog.hs
+++ b/Bustle/UI/AboutDialog.hs
@@ -22,7 +22,7 @@
   )
 where
 
-import Prelude hiding (catch)
+import Prelude
 
 import Data.Version (showVersion)
 import Control.Exception
diff --git a/Bustle/UI/Recorder.hs b/Bustle/UI/Recorder.hs
--- a/Bustle/UI/Recorder.hs
+++ b/Bustle/UI/Recorder.hs
@@ -26,7 +26,6 @@
 import Control.Monad (when, liftM)
 import Control.Concurrent.MVar
 import qualified Data.Map as Map
-import Data.Monoid
 import Data.Maybe (maybeToList)
 import Control.Monad.State (runStateT)
 import Text.Printf
diff --git a/GetText.hs b/GetText.hs
--- a/GetText.hs
+++ b/GetText.hs
@@ -192,8 +192,7 @@
     in dataEx ++ "/locale"
 
 getPackageName :: LocalBuildInfo -> String
-getPackageName = fromPackageName . packageName . localPkgDescr
-    where fromPackageName (PackageName s) = s
+getPackageName = unPackageName . packageName . localPkgDescr
 
 getCustomFields :: LocalBuildInfo -> [(String, String)]
 getCustomFields = customFieldsPD . localPkgDescr
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,9 @@
 APPDATA_FILE = org.freedesktop.Bustle.appdata.xml
 ICON_SIZES = 16x16 22x22 32x32 48x48 256x256
 ICONS = \
-	data/icons/scalable/org.freedesktop.Bustle.svg \
-	data/icons/scalable/org.freedesktop.Bustle-symbolic.svg \
-	$(foreach size,$(ICON_SIZES),data/icons/$(size)/org.freedesktop.Bustle.png) \
+	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg \
+	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg \
+	$(foreach size,$(ICON_SIZES),data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png) \
 	$(NULL)
 
 all: $(BINARIES) $(MANPAGE) $(DESKTOP_FILE) $(APPDATA_FILE) $(ICONS)
@@ -69,9 +69,9 @@
 	mkdir -p $(DATADIR)/appdata
 	cp $(APPDATA_FILE) $(DATADIR)/appdata
 	$(foreach size,$(ICON_SIZES),mkdir -p $(DATADIR)/icons/hicolor/$(size)/apps; )
-	$(foreach size,$(ICON_SIZES),cp data/icons/$(size)/org.freedesktop.Bustle.png $(DATADIR)/icons/hicolor/$(size)/apps; )
+	$(foreach size,$(ICON_SIZES),cp data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png $(DATADIR)/icons/hicolor/$(size)/apps; )
 	mkdir -p $(DATADIR)/icons/hicolor/scalable/apps
-	cp data/icons/scalable/org.freedesktop.Bustle-symbolic.svg $(DATADIR)/icons/hicolor/scalable/apps
+	cp data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg $(DATADIR)/icons/hicolor/scalable/apps
 	$(MAKE) update-icon-cache
 
 uninstall:
diff --git a/NEWS.md b/NEWS.md
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,12 @@
+Bustle 0.6.2 (2017-10-26)
+-------------------------
+
+* Check link type header in pcap files
+* Bump minimum GLib version to 2.44, and remove code for older versions
+* Compile C code with -g
+* Fix building with Cabal >= 2
+* Fix a few compiler warnings
+
 Bustle 0.6.1 (2017-07-27)
 -------------------------
 
diff --git a/bustle.cabal b/bustle.cabal
--- a/bustle.cabal
+++ b/bustle.cabal
@@ -1,6 +1,6 @@
 Name:           bustle
 Category:       Network, Desktop
-Version:        0.6.1
+Version:        0.6.2
 Cabal-Version:  >= 1.24
 Tested-With:    GHC == 7.8.*, GHC == 7.10.*
 Synopsis:       Draw sequence diagrams of D-Bus traffic
@@ -44,13 +44,13 @@
                   , data/org.freedesktop.Bustle.desktop.in
 
                   -- icons
-                  , data/icons/16x16/org.freedesktop.Bustle.png
-                  , data/icons/22x22/org.freedesktop.Bustle.png
-                  , data/icons/32x32/org.freedesktop.Bustle.png
-                  , data/icons/48x48/org.freedesktop.Bustle.png
-                  , data/icons/256x256/org.freedesktop.Bustle.png
-                  , data/icons/scalable/org.freedesktop.Bustle.svg
-                  , data/icons/scalable/org.freedesktop.Bustle-symbolic.svg
+                  , data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png
+                  , data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png
+                  , data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png
+                  , data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png
+                  , data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png
+                  , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
+                  , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
 
 x-gettext-po-files:     po/*.po
 x-gettext-domain-name:  bustle
@@ -110,8 +110,8 @@
   if flag(threaded)
     ghc-options: -threaded
   C-sources: c-sources/pcap-monitor.c
-  cc-options: -fPIC
-  pkgconfig-depends: glib-2.0 >= 2.26
+  cc-options: -fPIC -g
+  pkgconfig-depends: glib-2.0 >= 2.44
   Build-Depends: base >= 4 && < 5
                , bytestring
                , cairo
diff --git a/c-sources/bustle-pcap.c b/c-sources/bustle-pcap.c
--- a/c-sources/bustle-pcap.c
+++ b/c-sources/bustle-pcap.c
@@ -32,46 +32,6 @@
 static gboolean quiet = FALSE;
 static gboolean version = FALSE;
 
-#if GLIB_CHECK_VERSION (2, 30, 0)
-static void
-let_me_quit (GMainLoop *loop)
-{
-  g_unix_signal_add (SIGINT, (GSourceFunc) g_main_loop_quit, loop);
-
-  if (!quiet)
-    g_printf ("Hit Control-C to stop logging.\n");
-}
-#else
-static gboolean
-stdin_func (
-    GPollableInputStream *g_stdin,
-    GMainLoop *loop)
-{
-  char buf[2];
-
-  if (g_pollable_input_stream_read_nonblocking (g_stdin, buf, 1, NULL, NULL)
-      != -1)
-    {
-      g_main_loop_quit (loop);
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
-static void
-let_me_quit (GMainLoop *loop)
-{
-  GInputStream *g_stdin = g_unix_input_stream_new (0, FALSE);
-  GSource *source = g_pollable_input_stream_create_source (
-      G_POLLABLE_INPUT_STREAM (g_stdin), NULL);
-
-  g_source_set_callback (source, (GSourceFunc) stdin_func, loop, NULL);
-  g_source_attach (source, NULL);
-  g_printf ("Hit Enter to stop logging. (Do not hit Control-C.)\n");
-}
-#endif
-
 static gboolean session_specified = FALSE;
 static gboolean system_specified = FALSE;
 static gchar **filenames = NULL;
@@ -207,7 +167,6 @@
   GError *error = NULL;
   BustlePcapMonitor *pcap;
 
-  g_type_init ();
   parse_arguments (&argc, &argv, &bus_type, &filename);
 
   pcap = bustle_pcap_monitor_new (bus_type, filename, &error);
@@ -227,7 +186,11 @@
   if (!quiet)
     g_printf ("Logging D-Bus traffic to '%s'...\n", filename);
 
-  let_me_quit (loop);
+  g_unix_signal_add (SIGINT, (GSourceFunc) g_main_loop_quit, loop);
+
+  if (!quiet)
+    g_printf ("Hit Control-C to stop logging.\n");
+
   g_main_loop_run (loop);
   g_main_loop_unref (loop);
 
diff --git a/c-sources/config.h b/c-sources/config.h
--- a/c-sources/config.h
+++ b/c-sources/config.h
@@ -19,7 +19,7 @@
 #ifndef BUSTLE_CONFIG_H
 #define BUSTLE_CONFIG_H
 
-#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_26
-#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_30
+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_44
+#define GLIB_VERSION_MAX_ALLOWED  GLIB_VERSION_2_44
 
 #endif /* BUSTLE_CONFIG_H */
diff --git a/c-sources/pcap-monitor.c b/c-sources/pcap-monitor.c
--- a/c-sources/pcap-monitor.c
+++ b/c-sources/pcap-monitor.c
@@ -449,7 +449,7 @@
       return FALSE;
     }
 
-  priv->thread = g_thread_create (log_thread, &priv->td, TRUE, error);
+  priv->thread = g_thread_try_new (NULL, log_thread, &priv->td, error);
   if (priv->thread == NULL)
     {
       g_prefix_error (error, "Couldn't spawn logging thread: ");
diff --git a/data/icons/16x16/org.freedesktop.Bustle.png b/data/icons/16x16/org.freedesktop.Bustle.png
deleted file mode 100644
Binary files a/data/icons/16x16/org.freedesktop.Bustle.png and /dev/null differ
diff --git a/data/icons/22x22/org.freedesktop.Bustle.png b/data/icons/22x22/org.freedesktop.Bustle.png
deleted file mode 100644
Binary files a/data/icons/22x22/org.freedesktop.Bustle.png and /dev/null differ
diff --git a/data/icons/256x256/org.freedesktop.Bustle.png b/data/icons/256x256/org.freedesktop.Bustle.png
deleted file mode 100644
Binary files a/data/icons/256x256/org.freedesktop.Bustle.png and /dev/null differ
diff --git a/data/icons/32x32/org.freedesktop.Bustle.png b/data/icons/32x32/org.freedesktop.Bustle.png
deleted file mode 100644
Binary files a/data/icons/32x32/org.freedesktop.Bustle.png and /dev/null differ
diff --git a/data/icons/48x48/org.freedesktop.Bustle.png b/data/icons/48x48/org.freedesktop.Bustle.png
deleted file mode 100644
Binary files a/data/icons/48x48/org.freedesktop.Bustle.png and /dev/null differ
diff --git a/data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png
new file mode 100644
Binary files /dev/null and b/data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png differ
diff --git a/data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png
new file mode 100644
Binary files /dev/null and b/data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png differ
diff --git a/data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png
new file mode 100644
Binary files /dev/null and b/data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png differ
diff --git a/data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png
new file mode 100644
Binary files /dev/null and b/data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png differ
diff --git a/data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png
new file mode 100644
Binary files /dev/null and b/data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png differ
diff --git a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
new file mode 100644
--- /dev/null
+++ b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="600"
+   height="600"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="bustle-symbolic.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.18"
+     inkscape:cx="296.02826"
+     inkscape:cy="407.83651"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1440"
+     inkscape:window-height="824"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3834"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-56.941089px"
+       originy="-465.18127px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-56.941089,12.819102)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:57.94400024;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:115.88800049, 57.94400024;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 349.58008,-12.728516 c -19.78034,0.499891 -39.51808,2.890348 -58.82031,7.2539096 4.10872,18.8723954 8.21745,37.7447914 12.32617,56.6171874 33.74925,-7.665785 69.12626,-7.971229 103.02539,-1.0293 3.71633,-18.821141 8.65912,-38.435398 11.61328,-56.7636714 -22.39128,-4.5980686 -45.29405,-6.6135646 -68.14453,-6.0781256 z m 105.80078,78.716797 c 31.47813,14.008295 59.87299,34.867319 82.70703,60.664059 14.44727,-12.81901 28.89453,-25.63802 43.3418,-38.457028 C 553.05494,56.141376 517.74279,30.253699 478.60547,12.900391 470.86393,30.596354 463.1224,48.292318 455.38086,65.988281 Z M 227.18164,16.626953 C 189.51961,34.723972 155.71119,60.77538 128.625,92.591797 c 14.7487,12.470703 29.49739,24.941413 44.24609,37.412113 22.37137,-26.20404 50.37565,-47.593699 81.60157,-62.169926 -8.17123,-17.501302 -16.34245,-35.002604 -24.51368,-52.503906 -0.92578,0.432292 -1.85156,0.864583 -2.77734,1.296875 z M 568.0293,168.66016 c 16.99699,30.09909 27.33124,63.91871 30.12695,98.36914 19.23893,-1.70833 38.47787,-3.41667 57.7168,-5.125 -3.5014,-42.55686 -16.29754,-84.32012 -37.26568,-121.51953 -16.85936,9.42513 -33.71871,18.85026 -50.57807,28.27539 z M 89.939453,150.27539 c -18.701268,36.38678 -29.811885,76.6502 -32.357428,117.48438 19.276042,1.22135 38.552083,2.44271 57.828125,3.66406 2.15345,-34.4883 11.88032,-68.47463 28.29492,-98.88281 -17.08268,-9.01302 -34.16536,-18.02605 -51.248045,-27.03907 -0.839191,1.59115 -1.678381,3.18229 -2.517572,4.77344 z"
+       id="path4626"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="fill:none;stroke:#bebebe;stroke-width:75.08624021;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2985-7"
+       cx="381.42856"
+       cy="433.79074"
+       transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"
+       ry="118.57143"
+       rx="130" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 430,220 30,55 -85,0 0,50 85,0 -30,55 170,-80 z"
+       transform="translate(56.941089,-12.819102)"
+       id="path3757-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 170,220 -170,80 170,80 -30,-55 85,0 0,-50 -85,0 z"
+       transform="translate(56.941089,-12.819102)"
+       id="path3761-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:34.40008163;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:94.40000153;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 356.94141,187.18164 c -55.02475,0 -100.00001,44.97526 -100,100 -1e-5,55.02475 44.97525,100 100,100 55.02475,0 100,-44.97525 100,-100 0,-55.02475 -44.97525,-100 -100,-100 z m 0,34.39844 c 36.43357,0 65.59961,29.168 65.59961,65.60156 0,36.43356 -29.16604,65.59961 -65.59961,65.59961 -36.43357,0 -65.59961,-29.16605 -65.59961,-65.59961 0,-36.43356 29.16604,-65.60156 65.59961,-65.60156 z"
+       id="path4619"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
new file mode 100644
--- /dev/null
+++ b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="605.06"
+   height="605.06"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="bustle.svg">
+  <defs
+     id="defs4">
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect4126"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect4123"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect4120"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect4117"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3770"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3763"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3759"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3770-1"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3770-3"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3759-7"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3763-2"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3770-6"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3770-3-1"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3770-6-2"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3763-2-7"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3770-3-1-2"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3759-7-2"
+       is_visible="true" />
+    <filter
+       id="filter4104"
+       inkscape:label="Chalk and sponge"
+       inkscape:menu="Distort"
+       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"
+       width="1.6"
+       height="2"
+       y="-0.5"
+       x="-0.30000001"
+       color-interpolation-filters="sRGB">
+      <feTurbulence
+         id="feTurbulence4106"
+         baseFrequency="0.4"
+         type="fractalNoise"
+         seed="0"
+         numOctaves="5"
+         result="result1" />
+      <feOffset
+         id="feOffset4108"
+         dx="-5"
+         dy="-5"
+         result="result2" />
+      <feDisplacementMap
+         id="feDisplacementMap4110"
+         in2="result1"
+         xChannelSelector="R"
+         yChannelSelector="G"
+         scale="30"
+         in="SourceGraphic" />
+    </filter>
+    <filter
+       id="filter4183"
+       inkscape:label="Chalk and sponge"
+       inkscape:menu="Distort"
+       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"
+       width="1.6"
+       height="2"
+       y="-0.5"
+       x="-0.30000001"
+       color-interpolation-filters="sRGB">
+      <feTurbulence
+         id="feTurbulence4185"
+         baseFrequency="0.4"
+         type="fractalNoise"
+         seed="0"
+         numOctaves="5"
+         result="result1" />
+      <feOffset
+         id="feOffset4187"
+         dx="-5"
+         dy="-5"
+         result="result2" />
+      <feDisplacementMap
+         id="feDisplacementMap4189"
+         in2="result1"
+         xChannelSelector="R"
+         yChannelSelector="G"
+         scale="30"
+         in="SourceGraphic" />
+    </filter>
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect4117-2"
+       effect="spiro" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.59"
+     inkscape:cx="351.05408"
+     inkscape:cy="216.30891"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1388"
+     inkscape:window-height="833"
+     inkscape:window-x="50"
+     inkscape:window-y="223"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3834"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-56.941089px"
+       originy="-465.18127px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-56.941089,17.879098)">
+    <path
+       style="fill:none;stroke:#74b674;stroke-width:27.59247017;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:82.77741051, 27.59247017;stroke-dashoffset:27.59247017"
+       d="m 70.761814,288.36996 c -0.01207,-1.2669 -0.02449,-2.53589 -0.02449,-3.80671 0,-159.41492 129.271656,-288.6461129 288.736206,-288.6461129 159.46457,0 288.73621,129.2311929 288.73621,288.6461129 l 0,0 0,0 c 0,1.27082 -0.009,2.53969 -0.0245,3.80671"
+       id="path3802-8"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:34.42315674;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path2985-7"
+       sodipodi:cx="381.42856"
+       sodipodi:cy="433.79074"
+       sodipodi:rx="130"
+       sodipodi:ry="118.57143"
+       d="m 511.42856,433.79074 a 130,118.57143 0 1 1 -260,0 130,118.57143 0 1 1 260,0 z"
+       transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"
+       />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:18.45480156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 417.41556,287.80173 211.44171,0"
+       id="path3757-7"
+       inkscape:path-effect="#path-effect3759-7"
+       inkscape:original-d="m 417.41556,287.80173 211.44171,0"
+       inkscape:connector-curvature="0"
+       />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:18.17925262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 294.08479,287.66116 -211.718251,0.2812"
+       id="path3761-7"
+       inkscape:path-effect="#path-effect3763-2"
+       inkscape:original-d="m 294.08479,287.66116 -211.718251,0.2812"
+       inkscape:connector-curvature="0"
+       />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"
+       id="path3768-2"
+       inkscape:path-effect="#path-effect3770-6"
+       inkscape:original-d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc"
+       />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"
+       id="path3768-9-7"
+       inkscape:path-effect="#path-effect3770-3-1"
+       inkscape:original-d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc"
+       />
+  </g>
+</svg>
diff --git a/data/icons/scalable/org.freedesktop.Bustle-symbolic.svg b/data/icons/scalable/org.freedesktop.Bustle-symbolic.svg
deleted file mode 100644
--- a/data/icons/scalable/org.freedesktop.Bustle-symbolic.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="600"
-   height="600"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="bustle-symbolic.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.18"
-     inkscape:cx="296.02826"
-     inkscape:cy="407.83651"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="824"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3834"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-56.941089px"
-       originy="-465.18127px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-56.941089,12.819102)">
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:57.94400024;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:115.88800049, 57.94400024;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 349.58008,-12.728516 c -19.78034,0.499891 -39.51808,2.890348 -58.82031,7.2539096 4.10872,18.8723954 8.21745,37.7447914 12.32617,56.6171874 33.74925,-7.665785 69.12626,-7.971229 103.02539,-1.0293 3.71633,-18.821141 8.65912,-38.435398 11.61328,-56.7636714 -22.39128,-4.5980686 -45.29405,-6.6135646 -68.14453,-6.0781256 z m 105.80078,78.716797 c 31.47813,14.008295 59.87299,34.867319 82.70703,60.664059 14.44727,-12.81901 28.89453,-25.63802 43.3418,-38.457028 C 553.05494,56.141376 517.74279,30.253699 478.60547,12.900391 470.86393,30.596354 463.1224,48.292318 455.38086,65.988281 Z M 227.18164,16.626953 C 189.51961,34.723972 155.71119,60.77538 128.625,92.591797 c 14.7487,12.470703 29.49739,24.941413 44.24609,37.412113 22.37137,-26.20404 50.37565,-47.593699 81.60157,-62.169926 -8.17123,-17.501302 -16.34245,-35.002604 -24.51368,-52.503906 -0.92578,0.432292 -1.85156,0.864583 -2.77734,1.296875 z M 568.0293,168.66016 c 16.99699,30.09909 27.33124,63.91871 30.12695,98.36914 19.23893,-1.70833 38.47787,-3.41667 57.7168,-5.125 -3.5014,-42.55686 -16.29754,-84.32012 -37.26568,-121.51953 -16.85936,9.42513 -33.71871,18.85026 -50.57807,28.27539 z M 89.939453,150.27539 c -18.701268,36.38678 -29.811885,76.6502 -32.357428,117.48438 19.276042,1.22135 38.552083,2.44271 57.828125,3.66406 2.15345,-34.4883 11.88032,-68.47463 28.29492,-98.88281 -17.08268,-9.01302 -34.16536,-18.02605 -51.248045,-27.03907 -0.839191,1.59115 -1.678381,3.18229 -2.517572,4.77344 z"
-       id="path4626"
-       inkscape:connector-curvature="0" />
-    <circle
-       style="fill:none;stroke:#bebebe;stroke-width:75.08624021;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2985-7"
-       cx="381.42856"
-       cy="433.79074"
-       transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"
-       ry="118.57143"
-       rx="130" />
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 430,220 30,55 -85,0 0,50 85,0 -30,55 170,-80 z"
-       transform="translate(56.941089,-12.819102)"
-       id="path3757-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 170,220 -170,80 170,80 -30,-55 85,0 0,-50 -85,0 z"
-       transform="translate(56.941089,-12.819102)"
-       id="path3761-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:34.40008163;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:94.40000153;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 356.94141,187.18164 c -55.02475,0 -100.00001,44.97526 -100,100 -1e-5,55.02475 44.97525,100 100,100 55.02475,0 100,-44.97525 100,-100 0,-55.02475 -44.97525,-100 -100,-100 z m 0,34.39844 c 36.43357,0 65.59961,29.168 65.59961,65.60156 0,36.43356 -29.16604,65.59961 -65.59961,65.59961 -36.43357,0 -65.59961,-29.16605 -65.59961,-65.59961 0,-36.43356 29.16604,-65.60156 65.59961,-65.60156 z"
-       id="path4619"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/data/icons/scalable/org.freedesktop.Bustle.svg b/data/icons/scalable/org.freedesktop.Bustle.svg
deleted file mode 100644
--- a/data/icons/scalable/org.freedesktop.Bustle.svg
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="605.06"
-   height="605.06"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="bustle.svg">
-  <defs
-     id="defs4">
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4126"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4123"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4120"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4117"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3763"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3759"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3759-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3763-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-3-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-6-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3763-2-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-3-1-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3759-7-2"
-       is_visible="true" />
-    <filter
-       id="filter4104"
-       inkscape:label="Chalk and sponge"
-       inkscape:menu="Distort"
-       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"
-       width="1.6"
-       height="2"
-       y="-0.5"
-       x="-0.30000001"
-       color-interpolation-filters="sRGB">
-      <feTurbulence
-         id="feTurbulence4106"
-         baseFrequency="0.4"
-         type="fractalNoise"
-         seed="0"
-         numOctaves="5"
-         result="result1" />
-      <feOffset
-         id="feOffset4108"
-         dx="-5"
-         dy="-5"
-         result="result2" />
-      <feDisplacementMap
-         id="feDisplacementMap4110"
-         in2="result1"
-         xChannelSelector="R"
-         yChannelSelector="G"
-         scale="30"
-         in="SourceGraphic" />
-    </filter>
-    <filter
-       id="filter4183"
-       inkscape:label="Chalk and sponge"
-       inkscape:menu="Distort"
-       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"
-       width="1.6"
-       height="2"
-       y="-0.5"
-       x="-0.30000001"
-       color-interpolation-filters="sRGB">
-      <feTurbulence
-         id="feTurbulence4185"
-         baseFrequency="0.4"
-         type="fractalNoise"
-         seed="0"
-         numOctaves="5"
-         result="result1" />
-      <feOffset
-         id="feOffset4187"
-         dx="-5"
-         dy="-5"
-         result="result2" />
-      <feDisplacementMap
-         id="feDisplacementMap4189"
-         in2="result1"
-         xChannelSelector="R"
-         yChannelSelector="G"
-         scale="30"
-         in="SourceGraphic" />
-    </filter>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4117-2"
-       effect="spiro" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.59"
-     inkscape:cx="351.05408"
-     inkscape:cy="216.30891"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1388"
-     inkscape:window-height="833"
-     inkscape:window-x="50"
-     inkscape:window-y="223"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3834"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-56.941089px"
-       originy="-465.18127px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-56.941089,17.879098)">
-    <path
-       style="fill:none;stroke:#74b674;stroke-width:27.59247017;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:82.77741051, 27.59247017;stroke-dashoffset:27.59247017"
-       d="m 70.761814,288.36996 c -0.01207,-1.2669 -0.02449,-2.53589 -0.02449,-3.80671 0,-159.41492 129.271656,-288.6461129 288.736206,-288.6461129 159.46457,0 288.73621,129.2311929 288.73621,288.6461129 l 0,0 0,0 c 0,1.27082 -0.009,2.53969 -0.0245,3.80671"
-       id="path3802-8"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:34.42315674;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path2985-7"
-       sodipodi:cx="381.42856"
-       sodipodi:cy="433.79074"
-       sodipodi:rx="130"
-       sodipodi:ry="118.57143"
-       d="m 511.42856,433.79074 a 130,118.57143 0 1 1 -260,0 130,118.57143 0 1 1 260,0 z"
-       transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"
-       />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:18.45480156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 417.41556,287.80173 211.44171,0"
-       id="path3757-7"
-       inkscape:path-effect="#path-effect3759-7"
-       inkscape:original-d="m 417.41556,287.80173 211.44171,0"
-       inkscape:connector-curvature="0"
-       />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:18.17925262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 294.08479,287.66116 -211.718251,0.2812"
-       id="path3761-7"
-       inkscape:path-effect="#path-effect3763-2"
-       inkscape:original-d="m 294.08479,287.66116 -211.718251,0.2812"
-       inkscape:connector-curvature="0"
-       />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"
-       id="path3768-2"
-       inkscape:path-effect="#path-effect3770-6"
-       inkscape:original-d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"
-       id="path3768-9-7"
-       inkscape:path-effect="#path-effect3770-3-1"
-       inkscape:original-d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc"
-       />
-  </g>
-</svg>
diff --git a/run-uninstalled.sh b/run-uninstalled.sh
--- a/run-uninstalled.sh
+++ b/run-uninstalled.sh
@@ -3,8 +3,11 @@
 
 root="$(dirname ${0}})"
 
+# Cabal generates code that uses this
 bustle_datadir="${root}"
-export bustle_datadir
+# For Gtk+'s benefit
+XDG_DATA_HOME=$bustle_datadir/data
+export bustle_datadir XDG_DATA_HOME
 
 bustle="${root}"/dist/build/bustle/bustle