diff --git a/configure b/configure
index b69686694..14c747179 100755
--- a/configure
+++ b/configure
@@ -89,11 +89,11 @@ case $yn in
         rm "$wd/actions/22x22" "$wd/devices/scalable" "$wd/panel/16" \
         "$wd/panel/24" "$wd/places/16x16" "$wd/status/scalable"
 
-        ln -sfr "$wd/actions/22x22-dark" "$wd/actions/22x22"
-        ln -sfr "$wd/devices/scalable-dark" "$wd/devices/scalable"
-        ln -sfr "$wd/emblems/scalable/avatar-default-dark.svg" "$wd/emblems/scalable/avatar-default.svg"
-        ln -sfr "$wd/places/16x16-dark" "$wd/places/16x16"
-        ln -sfr "$wd/status/scalable-dark" "$wd/status/scalable"
+        ln -sf "22x22-dark" "$wd/actions/22x22"
+        ln -sf "scalable-dark" "$wd/devices/scalable"
+        ln -sf "avatar-default-dark.svg" "$wd/emblems/scalable/avatar-default.svg"
+        ln -sf "16x16-dark" "$wd/places/16x16"
+        ln -sf "scalable-dark" "$wd/status/scalable"
         echo "Updated theme to use icons for dark GTK+ themes."
         ;;
 
@@ -101,24 +101,24 @@ case $yn in
         rm "$wd/actions/22x22" "$wd/devices/scalable" "$wd/panel/16" \
         "$wd/panel/24" "$wd/places/16x16" "$wd/status/scalable"
 
-        ln -sfr "$wd/actions/22x22-light" "$wd/actions/22x22"
-        ln -sfr "$wd/devices/scalable-light" "$wd/devices/scalable"
-        ln -sfr "$wd/emblems/scalable/avatar-default-light.svg" "$wd/emblems/scalable/avatar-default.svg"
-        ln -sfr "$wd/places/16x16-light" "$wd/places/16x16"
-        ln -sfr "$wd/status/scalable-light" "$wd/status/scalable"
+        ln -sf "22x22-light" "$wd/actions/22x22"
+        ln -sf "scalable-light" "$wd/devices/scalable"
+        ln -sf "avatar-default-light.svg" "$wd/emblems/scalable/avatar-default.svg"
+        ln -sf "16x16-light" "$wd/places/16x16"
+        ln -sf "scalable-light" "$wd/status/scalable"
         echo "Updated theme to use icons for light GTK+ themes."
         ;;
 esac
 read -p "Use icons for a dark coloured panel? [y/N] " yn
 case $yn in
     [Yy]* )
-        ln -sfr "$wd/panel/16-dark" "$wd/panel/16"
-        ln -sfr "$wd/panel/24-dark" "$wd/panel/24"
+        ln -sf "16-dark" "$wd/panel/16"
+        ln -sf "24-dark" "$wd/panel/24"
         echo "Updated theme to use dark icons for the panel."
         ;;
     * )
-        ln -sfr "$wd/panel/16-light" "$wd/panel/16"
-        ln -sfr "$wd/panel/24-light" "$wd/panel/24"
+        ln -sf "16-light" "$wd/panel/16"
+        ln -sf "24-light" "$wd/panel/24"
         echo "Updated theme to use light icons for the panel."
         ;;
 esac
@@ -157,8 +157,8 @@ ln -sf distributor-logo.svg start-here.svg # fixes potentially broken link
 
 cd "$wd"
 
-ln -sfr "$wd"/places/scalable/distributor-logo.svg "$wd"/apps/scalable/cs-desktop.svg
-ln -sfr "$wd"/places/scalable/distributor-logo.svg "$wd"/apps/scalable/applications-system.svg
+ln -sf ../../places/scalable/distributor-logo.svg "$wd"/apps/scalable/cs-desktop.svg
+ln -sf ../../places/scalable/distributor-logo.svg "$wd"/apps/scalable/applications-system.svg
 
 echo "Updated distributor logo."