diff --git a/README.md b/README.md
index 2a3512dd..23bcc372 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 SparkleShare is an Open Source collaboration and sharing tool that is designed to keep things simple and to stay out of your way. It's available for Linux distributions, Mac, and Windows.
 
-![Banner](https://raw.githubusercontent.com/hbons/SparkleShare/master/SparkleShare/Common/Pixmaps/tutorial-slide-2%402x.png)
+![Banner](https://raw.githubusercontent.com/hbons/SparkleShare/master/SparkleShare/Common/Images/tutorial-slide-2%402x.png)
 
 
 ## How does it work?
diff --git a/SparkleShare/Common/Pixmaps/Makefile.am b/SparkleShare/Common/Images/Makefile.am
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Makefile.am
rename to SparkleShare/Common/Images/Makefile.am
diff --git a/SparkleShare/Common/Pixmaps/Sources/about-dialog.svg b/SparkleShare/Common/Images/Sources/about-dialog.svg
similarity index 99%
rename from SparkleShare/Common/Pixmaps/Sources/about-dialog.svg
rename to SparkleShare/Common/Images/Sources/about-dialog.svg
index c07d4541..2a862052 100644
--- a/SparkleShare/Common/Pixmaps/Sources/about-dialog.svg
+++ b/SparkleShare/Common/Images/Sources/about-dialog.svg
@@ -2114,7 +2114,7 @@
        id="g101011"
        transform="translate(-65.909,-78.641)"
        clip-path="url(#clipPath4254)"
-       inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/about@2x.png"
+       inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/about@2x.png"
        inkscape:export-xdpi="180"
        inkscape:export-ydpi="180">
       <rect
diff --git a/SparkleShare/Common/Pixmaps/Sources/actions.svg b/SparkleShare/Common/Images/Sources/actions.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/actions.svg
rename to SparkleShare/Common/Images/Sources/actions.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/app-icons.svg b/SparkleShare/Common/Images/Sources/app-icons.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/app-icons.svg
rename to SparkleShare/Common/Images/Sources/app-icons.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/bitbucket.svg b/SparkleShare/Common/Images/Sources/bitbucket.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/bitbucket.svg
rename to SparkleShare/Common/Images/Sources/bitbucket.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/folder-icons-mac-yosemite.svg b/SparkleShare/Common/Images/Sources/folder-icons-mac-yosemite.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/folder-icons-mac-yosemite.svg
rename to SparkleShare/Common/Images/Sources/folder-icons-mac-yosemite.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/folder-icons-mac.svg b/SparkleShare/Common/Images/Sources/folder-icons-mac.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/folder-icons-mac.svg
rename to SparkleShare/Common/Images/Sources/folder-icons-mac.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/folder-icons-windows.svg b/SparkleShare/Common/Images/Sources/folder-icons-windows.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/folder-icons-windows.svg
rename to SparkleShare/Common/Images/Sources/folder-icons-windows.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/github.svg b/SparkleShare/Common/Images/Sources/github.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/github.svg
rename to SparkleShare/Common/Images/Sources/github.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/gitlab.svg b/SparkleShare/Common/Images/Sources/gitlab.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/gitlab.svg
rename to SparkleShare/Common/Images/Sources/gitlab.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/planio.svg b/SparkleShare/Common/Images/Sources/planio.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/planio.svg
rename to SparkleShare/Common/Images/Sources/planio.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/side-splash.svg b/SparkleShare/Common/Images/Sources/side-splash.svg
similarity index 99%
rename from SparkleShare/Common/Pixmaps/Sources/side-splash.svg
rename to SparkleShare/Common/Images/Sources/side-splash.svg
index 2602f5bf..5559510d 100644
--- a/SparkleShare/Common/Pixmaps/Sources/side-splash.svg
+++ b/SparkleShare/Common/Images/Sources/side-splash.svg
@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.48.2 r9819"
    sodipodi:docname="side-splash.svg"
-   inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/side-splash.png"
+   inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/side-splash.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <sodipodi:namedview
diff --git a/SparkleShare/Common/Pixmaps/Sources/ssnet.svg b/SparkleShare/Common/Images/Sources/ssnet.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/ssnet.svg
rename to SparkleShare/Common/Images/Sources/ssnet.svg
diff --git a/SparkleShare/Common/Pixmaps/Sources/status-icons.svg b/SparkleShare/Common/Images/Sources/status-icons.svg
similarity index 98%
rename from SparkleShare/Common/Pixmaps/Sources/status-icons.svg
rename to SparkleShare/Common/Images/Sources/status-icons.svg
index 207cd116..b361de6a 100644
--- a/SparkleShare/Common/Pixmaps/Sources/status-icons.svg
+++ b/SparkleShare/Common/Images/Sources/status-icons.svg
@@ -1209,7 +1209,7 @@
          width="16"
          y="-135"
          x="42"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-idle@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-idle@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
@@ -1219,7 +1219,7 @@
          width="16"
          y="-135"
          x="72"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-error@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-error@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
@@ -1229,7 +1229,7 @@
          width="16"
          y="-135"
          x="102"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-up@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-up@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
@@ -1239,7 +1239,7 @@
          width="16"
          y="-135"
          x="132"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-down@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-down@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
@@ -1249,7 +1249,7 @@
          width="16"
          y="-135"
          x="162"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
@@ -2170,7 +2170,7 @@
          width="16"
          y="-115"
          x="102"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-up-active@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-up-active@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
@@ -2180,7 +2180,7 @@
          width="16"
          y="-115"
          x="132"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-down-active@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-down-active@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
@@ -2190,7 +2190,7 @@
          width="16"
          y="-115"
          x="162"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-active@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-active@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <g
@@ -2241,7 +2241,7 @@
          width="16"
          y="-114"
          x="41.96875"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-idle-active@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-idle-active@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <path
@@ -2249,13 +2249,13 @@
          style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill-rule:evenodd;enable-background:new;fill:#ffffff;fill-opacity:1"
          d="m 44.4375,-113 c -0.82205,0.092 -1.4425,0.79783 -1.4375,1.625 l 0,4.375 -0.5,0 -0.5,0 0,0.5 -0.03125,5.59375 c 0,0.74984 0.1756,1.43675 0.5,1.96875 0.3244,0.5319 0.84191,0.9375 1.46875,0.9375 L 56,-98 c 0.62679,0 1.14435,-0.4056 1.46875,-0.9375 0.3244,-0.5319 0.5,-1.21885 0.5,-1.96875 l 0.0625,-7.59375 0,-0.5 -0.5,0 -0.5625,0 0,-0.34375 -0.03125,-1.125 0,-0.5 -0.5,0 -5.71875,0 -2.15625,-1.90625 -0.15625,-0.125 -0.1875,0 -3.5625,0 c -0.01,-4.6e-4 -0.02175,3.1e-4 -0.03125,0 -0.0385,-0.001 -0.0865,-0.001 -0.125,0 l -0.03125,0 -0.03125,0 z M 50,-108.84375 a 0.58589994,0.58589994 0 0 1 0.5625,0.375 l 1.0625,2.375 2.46875,0.25 a 0.58589994,0.58589994 0 0 1 0.3125,1.03125 l -1.875,1.78125 0.46875,2.375 a 0.58589994,0.58589994 0 0 1 -0.84375,0.625 l -2.15625,-1.125 -2.3125,1.09375 a 0.58589994,0.58589994 0 0 1 -0.84375,-0.6875 l 0.5625,-2.3125 -1.875,-1.90625 a 0.58589994,0.58589994 0 0 1 0.375,-1 l 2.375,-0.125 L 49.5,-108.5 a 0.58589994,0.58589994 0 0 1 0.375,-0.3125 0.58589994,0.58589994 0 0 1 0.125,-0.0312 z m 0,1.96875 -0.84375,1.625 a 0.58589994,0.58589994 0 0 1 -0.46875,0.3125 l -1.40625,0.0937 1.1875,1.1875 a 0.58589994,0.58589994 0 0 1 0.15625,0.5625 l -0.34375,1.4375 1.46875,-0.6875 a 0.58589994,0.58589994 0 0 1 0.53125,0.0312 l 1.3125,0.6875 -0.28125,-1.5 a 0.58589994,0.58589994 0 0 1 0.15625,-0.53115 l 1.1875,-1.125 -1.5,-0.15625 a 0.58589994,0.58589994 0 0 1 -0.46875,-0.34375 L 50,-106.875 z"
          id="path4857-0"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-idle-active@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-idle-active@2x.png"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180" />
       <rect
          inkscape:export-ydpi="180"
          inkscape:export-xdpi="180"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Pixmaps/process-syncing-error-active@2x.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Mac/Images/process-syncing-error-active@2x.png"
          x="72"
          y="-115"
          width="16"
@@ -2269,14 +2269,14 @@
          width="48"
          id="rect7635"
          style="opacity:0;fill:#f57900;fill-opacity:1;stroke:none;enable-background:new"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-up-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-up-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90" />
       <g
          transform="matrix(1.0414,0,0,0.92475,-101.77499,-255.97)"
          style="opacity:0.7;fill-rule:evenodd;enable-background:new"
          id="g7637"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-up-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-up-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <rect
@@ -2304,7 +2304,7 @@
          transform="translate(-87.999989,-264)"
          style="enable-background:new"
          id="g7643"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-up-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-up-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -2354,7 +2354,7 @@
          transform="matrix(0.95581,0,0,0.96875,-73.859989,-261.12)"
          style="enable-background:new"
          id="g7659"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-up-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-up-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -2397,14 +2397,14 @@
          height="48"
          x="258"
          y="-214"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-down-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-down-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90" />
       <g
          id="g7701"
          style="opacity:0.7;fill-rule:evenodd;enable-background:new"
          transform="matrix(1.0414,0,0,0.92475,-51.774989,-255.97)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-down-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-down-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <rect
@@ -2432,7 +2432,7 @@
          id="g7707"
          style="enable-background:new"
          transform="translate(-37.999989,-264)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-down-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-down-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -2482,7 +2482,7 @@
          id="g7723"
          style="enable-background:new"
          transform="matrix(0.95581,0,0,0.96875,-23.859989,-261.12)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-down-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-down-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -2525,7 +2525,7 @@
          width="48"
          id="rect7763"
          style="opacity:0;fill:#f57900;fill-opacity:1;stroke:none;enable-background:new"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90" />
       <g
@@ -2557,7 +2557,7 @@
          transform="translate(12.000011,-264)"
          style="enable-background:new"
          id="g7771"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -2607,7 +2607,7 @@
          transform="matrix(0.95581,0,0,0.96875,26.140011,-261.12)"
          style="enable-background:new"
          id="g7787"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <g
@@ -2647,7 +2647,7 @@
          transform="translate(-192.99999,-13.999996)"
          style="enable-background:new"
          id="g7833"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-up-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-up-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <path
@@ -2667,7 +2667,7 @@
          style="enable-background:new"
          id="g7837"
          transform="matrix(1,0,0,-1,-142.99999,-361)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-down-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-down-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <path
@@ -2687,7 +2687,7 @@
          style="enable-background:new"
          transform="matrix(1,0,0,-1,-91.999989,-361)"
          id="g7843"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <path
@@ -2707,7 +2707,7 @@
          style="enable-background:new"
          id="g7849"
          transform="translate(-93.999989,-13.999996)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <path
@@ -2739,7 +2739,7 @@
            id="flowPara8732">GNOME 3</flowPara></flowRoot>      <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-error-48.png"
          style="opacity:0;fill:#f57900;fill-opacity:1;stroke:none;enable-background:new"
          id="rect8734"
          width="48"
@@ -2774,7 +2774,7 @@
       <g
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-error-48.png"
          id="g8742"
          style="enable-background:new"
          transform="translate(62.000011,-264)">
@@ -2824,7 +2824,7 @@
       <g
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-error-48.png"
          id="g8758"
          style="enable-background:new"
          transform="matrix(0.95581,0,0,0.96875,76.140011,-261.12)">
@@ -2865,7 +2865,7 @@
          id="g5833-3-4-4"
          style="stroke:#c36e11;stroke-width:2;enable-background:new"
          transform="matrix(2.2594,0,0,2.2594,-3935.313,-2059.767)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-error-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <path
@@ -2878,7 +2878,7 @@
          id="g5833-3-4"
          style="stroke:#fde2c0;stroke-width:2;enable-background:new"
          transform="matrix(2.2594,0,0,2.2594,-3935.313,-2060.767)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-error-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <path
@@ -2891,7 +2891,7 @@
          style="display:inline;enable-background:new"
          id="g20371"
          transform="translate(-338,-571)"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Pixmaps/icons/process-syncing-error-48.png"
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Linux/Images/icons/process-syncing-error-48.png"
          inkscape:export-xdpi="90"
          inkscape:export-ydpi="90">
         <path
diff --git a/SparkleShare/Common/Pixmaps/Sources/tutorial-slides.svg b/SparkleShare/Common/Images/Sources/tutorial-slides.svg
similarity index 99%
rename from SparkleShare/Common/Pixmaps/Sources/tutorial-slides.svg
rename to SparkleShare/Common/Images/Sources/tutorial-slides.svg
index faec2900..49e1a6f9 100644
--- a/SparkleShare/Common/Pixmaps/Sources/tutorial-slides.svg
+++ b/SparkleShare/Common/Images/Sources/tutorial-slides.svg
@@ -3064,7 +3064,7 @@
          style="fill:url(#radialGradient211652);fill-opacity:1;stroke:#261f1f;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:export-xdpi="180"
          inkscape:export-ydpi="180"
-         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png" />
+         inkscape:export-filename="/Users/hbons/Projects/SparkleShare/SparkleShare/Common/Images/tutorial-slide-1@2x.png" />
       <g
          transform="matrix(0.85916724,0,0,0.85916724,-926.30984,-650.2188)"
          id="g52133-7"
diff --git a/SparkleShare/Common/Pixmaps/Sources/user-icon-default.svg b/SparkleShare/Common/Images/Sources/user-icon-default.svg
similarity index 100%
rename from SparkleShare/Common/Pixmaps/Sources/user-icon-default.svg
rename to SparkleShare/Common/Images/Sources/user-icon-default.svg
diff --git a/SparkleShare/Common/Pixmaps/about.png b/SparkleShare/Common/Images/about.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/about.png
rename to SparkleShare/Common/Images/about.png
diff --git a/SparkleShare/Common/Pixmaps/about@2x.png b/SparkleShare/Common/Images/about@2x.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/about@2x.png
rename to SparkleShare/Common/Images/about@2x.png
diff --git a/SparkleShare/Common/Pixmaps/side-splash.png b/SparkleShare/Common/Images/side-splash.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/side-splash.png
rename to SparkleShare/Common/Images/side-splash.png
diff --git a/SparkleShare/Common/Pixmaps/side-splash@2x.png b/SparkleShare/Common/Images/side-splash@2x.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/side-splash@2x.png
rename to SparkleShare/Common/Images/side-splash@2x.png
diff --git a/SparkleShare/Common/Pixmaps/text-balloon.png b/SparkleShare/Common/Images/text-balloon.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/text-balloon.png
rename to SparkleShare/Common/Images/text-balloon.png
diff --git a/SparkleShare/Common/Pixmaps/text-balloon@2x.png b/SparkleShare/Common/Images/text-balloon@2x.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/text-balloon@2x.png
rename to SparkleShare/Common/Images/text-balloon@2x.png
diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-1.png b/SparkleShare/Common/Images/tutorial-slide-1.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/tutorial-slide-1.png
rename to SparkleShare/Common/Images/tutorial-slide-1.png
diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png b/SparkleShare/Common/Images/tutorial-slide-1@2x.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/tutorial-slide-1@2x.png
rename to SparkleShare/Common/Images/tutorial-slide-1@2x.png
diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-2.png b/SparkleShare/Common/Images/tutorial-slide-2.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/tutorial-slide-2.png
rename to SparkleShare/Common/Images/tutorial-slide-2.png
diff --git a/SparkleShare/Common/Pixmaps/tutorial-slide-2@2x.png b/SparkleShare/Common/Images/tutorial-slide-2@2x.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/tutorial-slide-2@2x.png
rename to SparkleShare/Common/Images/tutorial-slide-2@2x.png
diff --git a/SparkleShare/Common/Pixmaps/user-icon-default.png b/SparkleShare/Common/Images/user-icon-default.png
similarity index 100%
rename from SparkleShare/Common/Pixmaps/user-icon-default.png
rename to SparkleShare/Common/Images/user-icon-default.png
diff --git a/SparkleShare/Common/Makefile.am b/SparkleShare/Common/Makefile.am
index 04d55813..8daf95ba 100644
--- a/SparkleShare/Common/Makefile.am
+++ b/SparkleShare/Common/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = HTML \
 	Presets \
-	Pixmaps
+	Images
diff --git a/SparkleShare/Linux/Pixmaps/Makefile.am b/SparkleShare/Linux/Images/Makefile.am
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/Makefile.am
rename to SparkleShare/Linux/Images/Makefile.am
diff --git a/SparkleShare/Linux/Pixmaps/icons/Makefile.am b/SparkleShare/Linux/Images/icons/Makefile.am
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/Makefile.am
rename to SparkleShare/Linux/Images/icons/Makefile.am
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile.am b/SparkleShare/Linux/Images/icons/hicolor/Makefile.am
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile.am
rename to SparkleShare/Linux/Images/icons/hicolor/Makefile.am
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/document-added-12.png b/SparkleShare/Linux/Images/icons/hicolor/document-added-12.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/document-added-12.png
rename to SparkleShare/Linux/Images/icons/hicolor/document-added-12.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/document-deleted-12.png b/SparkleShare/Linux/Images/icons/hicolor/document-deleted-12.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/document-deleted-12.png
rename to SparkleShare/Linux/Images/icons/hicolor/document-deleted-12.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/document-edited-12.png b/SparkleShare/Linux/Images/icons/hicolor/document-edited-12.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/document-edited-12.png
rename to SparkleShare/Linux/Images/icons/hicolor/document-edited-12.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/document-moved-12.png b/SparkleShare/Linux/Images/icons/hicolor/document-moved-12.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/document-moved-12.png
rename to SparkleShare/Linux/Images/icons/hicolor/document-moved-12.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/list-point-16.png b/SparkleShare/Linux/Images/icons/hicolor/list-point-16.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/list-point-16.png
rename to SparkleShare/Linux/Images/icons/hicolor/list-point-16.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-16.png b/SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-16.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-16.png
rename to SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-16.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-22.png b/SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-22.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-22.png
rename to SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-22.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-24.png b/SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-24.png
rename to SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-256.png b/SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-256.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-256.png
rename to SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-256.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-32.png b/SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-32.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-32.png
rename to SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-32.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-48.png b/SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-48.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-48.png
rename to SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-48.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-symbolic.svg b/SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-symbolic.svg
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/org.sparkleshare.SparkleShare-symbolic.svg
rename to SparkleShare/Linux/Images/icons/hicolor/org.sparkleshare.SparkleShare-symbolic.svg
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-24.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-24.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-48.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-48.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-48.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-48.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-24.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-down-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-24.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-down-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-48.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-down-48.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-down-48.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-down-48.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-24.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-error-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-24.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-error-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-48.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-error-48.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-error-48.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-error-48.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-24.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-up-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-24.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-up-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-48.png b/SparkleShare/Linux/Images/icons/hicolor/process-syncing-up-48.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-syncing-up-48.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-syncing-up-48.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/hicolor/process-working-22.png b/SparkleShare/Linux/Images/icons/hicolor/process-working-22.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/hicolor/process-working-22.png
rename to SparkleShare/Linux/Images/icons/hicolor/process-working-22.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/Makefile.am
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile.am
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-dark/Makefile.am
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-down-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-down-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-down-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-down-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-error-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-error-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-error-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-error-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-idle-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-idle-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-idle-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-idle-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-up-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-up-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/process-syncing-up-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-dark/process-syncing-up-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.am b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/Makefile.am
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile.am
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-light/Makefile.am
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-down-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-down-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-down-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-down-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-error-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-error-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-error-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-error-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-idle-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-idle-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-idle-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-idle-24.png
diff --git a/SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-up-24.png b/SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-up-24.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/process-syncing-up-24.png
rename to SparkleShare/Linux/Images/icons/ubuntu-mono-light/process-syncing-up-24.png
diff --git a/SparkleShare/Linux/Pixmaps/tutorial-slide-3.png b/SparkleShare/Linux/Images/tutorial-slide-3.png
similarity index 100%
rename from SparkleShare/Linux/Pixmaps/tutorial-slide-3.png
rename to SparkleShare/Linux/Images/tutorial-slide-3.png
diff --git a/SparkleShare/Linux/Makefile.am b/SparkleShare/Linux/Makefile.am
index e3f0c2e9..2c308027 100644
--- a/SparkleShare/Linux/Makefile.am
+++ b/SparkleShare/Linux/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = Pixmaps
+SUBDIRS = Images
 
 ASSEMBLY = SparkleShare
 TARGET = exe
diff --git a/SparkleShare/Mac/SparkleShare.Mac.csproj b/SparkleShare/Mac/SparkleShare.Mac.csproj
index 6077cd90..0e1b5cbb 100644
--- a/SparkleShare/Mac/SparkleShare.Mac.csproj
+++ b/SparkleShare/Mac/SparkleShare.Mac.csproj
@@ -155,22 +155,22 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="..\Common\Pixmaps\side-splash.png">
+    <BundleResource Include="..\Common\Images\side-splash.png">
       <Link>Resources\side-splash.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Linux\Pixmaps\icons\hicolor\document-added-12.png">
+    <BundleResource Include="..\Linux\Images\icons\hicolor\document-added-12.png">
       <Link>Resources\document-added-12.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Linux\Pixmaps\icons\hicolor\document-edited-12.png">
+    <BundleResource Include="..\Linux\Images\icons\hicolor\document-edited-12.png">
       <Link>Resources\document-edited-12.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Linux\Pixmaps\icons\hicolor\document-deleted-12.png">
+    <BundleResource Include="..\Linux\Images\icons\hicolor\document-deleted-12.png">
       <Link>Resources\document-deleted-12.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Linux\Pixmaps\icons\hicolor\document-moved-12.png">
+    <BundleResource Include="..\Linux\Images\icons\hicolor\document-moved-12.png">
       <Link>Resources\document-moved-12.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\about.png">
+    <BundleResource Include="..\Common\Images\about.png">
       <Link>Resources\about.png</Link>
     </BundleResource>
     <BundleResource Include="Resources\tutorial-slide-3.png">
@@ -181,10 +181,10 @@
     <BundleResource Include="Resources\process-syncing-idle.png" />
     <BundleResource Include="Resources\process-syncing-up.png" />
     <BundleResource Include="Resources\process-syncing.png" />
-    <BundleResource Include="..\Common\Pixmaps\user-icon-default.png">
+    <BundleResource Include="..\Common\Images\user-icon-default.png">
       <Link>Resources\user-icon-default.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\side-splash%402x.png">
+    <BundleResource Include="..\Common\Images\side-splash%402x.png">
       <Link>Resources\side-splash%402x.png</Link>
     </BundleResource>
     <BundleResource Include="Resources\process-syncing-down%402x.png" />
@@ -192,19 +192,19 @@
     <BundleResource Include="Resources\process-syncing-idle%402x.png" />
     <BundleResource Include="Resources\process-syncing-up%402x.png" />
     <BundleResource Include="Resources\process-syncing%402x.png" />
-    <BundleResource Include="..\Common\Pixmaps\about%402x.png">
+    <BundleResource Include="..\Common\Images\about%402x.png">
       <Link>Resources\about%402x.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\tutorial-slide-1.png">
+    <BundleResource Include="..\Common\Images\tutorial-slide-1.png">
       <Link>Resources\tutorial-slide-1.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\tutorial-slide-1%402x.png">
+    <BundleResource Include="..\Common\Images\tutorial-slide-1%402x.png">
       <Link>Resources\tutorial-slide-1%402x.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\tutorial-slide-2.png">
+    <BundleResource Include="..\Common\Images\tutorial-slide-2.png">
       <Link>Resources\tutorial-slide-2.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\tutorial-slide-2%402x.png">
+    <BundleResource Include="..\Common\Images\tutorial-slide-2%402x.png">
       <Link>Resources\tutorial-slide-2%402x.png</Link>
     </BundleResource>
     <BundleResource Include="..\Common\Presets\bitbucket%402x.png">
@@ -244,10 +244,10 @@
     <BundleResource Include="..\Common\Presets\planio%402x.png">
       <Link>Presets\planio%402x.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\text-balloon.png">
+    <BundleResource Include="..\Common\Images\text-balloon.png">
       <Link>Resources\text-balloon.png</Link>
     </BundleResource>
-    <BundleResource Include="..\Common\Pixmaps\text-balloon%402x.png">
+    <BundleResource Include="..\Common\Images\text-balloon%402x.png">
       <Link>Resources\text-balloon%402x.png</Link>
     </BundleResource>
     <BundleResource Include="Resources\sparkleshare-app.icns">
diff --git a/SparkleShare/Windows/Pixmaps/folder.png b/SparkleShare/Windows/Images/folder.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/folder.png
rename to SparkleShare/Windows/Images/folder.png
diff --git a/SparkleShare/Windows/Pixmaps/process-syncing-down.png b/SparkleShare/Windows/Images/process-syncing-down.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/process-syncing-down.png
rename to SparkleShare/Windows/Images/process-syncing-down.png
diff --git a/SparkleShare/Windows/Pixmaps/process-syncing-error.png b/SparkleShare/Windows/Images/process-syncing-error.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/process-syncing-error.png
rename to SparkleShare/Windows/Images/process-syncing-error.png
diff --git a/SparkleShare/Windows/Pixmaps/process-syncing-idle.png b/SparkleShare/Windows/Images/process-syncing-idle.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/process-syncing-idle.png
rename to SparkleShare/Windows/Images/process-syncing-idle.png
diff --git a/SparkleShare/Windows/Pixmaps/process-syncing-up.png b/SparkleShare/Windows/Images/process-syncing-up.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/process-syncing-up.png
rename to SparkleShare/Windows/Images/process-syncing-up.png
diff --git a/SparkleShare/Windows/Pixmaps/process-syncing.png b/SparkleShare/Windows/Images/process-syncing.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/process-syncing.png
rename to SparkleShare/Windows/Images/process-syncing.png
diff --git a/SparkleShare/Windows/Pixmaps/sparkleshare-app.ico b/SparkleShare/Windows/Images/sparkleshare-app.ico
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/sparkleshare-app.ico
rename to SparkleShare/Windows/Images/sparkleshare-app.ico
diff --git a/SparkleShare/Windows/Pixmaps/sparkleshare-folder.ico b/SparkleShare/Windows/Images/sparkleshare-folder.ico
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/sparkleshare-folder.ico
rename to SparkleShare/Windows/Images/sparkleshare-folder.ico
diff --git a/SparkleShare/Windows/Pixmaps/sparkleshare-folder.png b/SparkleShare/Windows/Images/sparkleshare-folder.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/sparkleshare-folder.png
rename to SparkleShare/Windows/Images/sparkleshare-folder.png
diff --git a/SparkleShare/Windows/Pixmaps/tutorial-slide-3.png b/SparkleShare/Windows/Images/tutorial-slide-3.png
similarity index 100%
rename from SparkleShare/Windows/Pixmaps/tutorial-slide-3.png
rename to SparkleShare/Windows/Images/tutorial-slide-3.png
diff --git a/SparkleShare/Windows/SparkleController.cs b/SparkleShare/Windows/SparkleController.cs
index 9c2fa5b0..9c030b4c 100644
--- a/SparkleShare/Windows/SparkleController.cs
+++ b/SparkleShare/Windows/SparkleController.cs
@@ -136,7 +136,7 @@ namespace SparkleShare {
             SparkleLogger.LogInfo ("Config", "Created '" + FoldersPath + "'");
 
             string app_path       = Path.GetDirectoryName (Forms.Application.ExecutablePath);
-            string icon_file_path = Path.Combine (app_path, "Pixmaps", "sparkleshare-folder.ico");
+            string icon_file_path = Path.Combine (app_path, "Images", "sparkleshare-folder.ico");
 
             if (!File.Exists (icon_file_path)) {
                 string ini_file_path  = Path.Combine (FoldersPath, "desktop.ini");
diff --git a/SparkleShare/Windows/SparkleEventLog.cs b/SparkleShare/Windows/SparkleEventLog.cs
index 008aded5..24aa73ec 100644
--- a/SparkleShare/Windows/SparkleEventLog.cs
+++ b/SparkleShare/Windows/SparkleEventLog.cs
@@ -275,7 +275,7 @@ namespace SparkleShare {
         
         public void UpdateContent (string html)
         {
-            string pixmaps_path = Path.Combine (SparkleLib.SparkleConfig.DefaultConfig.TmpPath, "Pixmaps".SHA1 ());
+            string pixmaps_path = Path.Combine (SparkleLib.SparkleConfig.DefaultConfig.TmpPath, "Images".SHA1 ());
             pixmaps_path        = pixmaps_path.Replace ("\\", "/");
             
             html = html.Replace ("<a href=", "<a class='windows' href=");
@@ -310,7 +310,7 @@ namespace SparkleShare {
         private void WriteOutImages ()
         {
             string tmp_path     = SparkleLib.SparkleConfig.DefaultConfig.TmpPath;
-            string pixmaps_path = Path.Combine (tmp_path, "Pixmaps".SHA1 ());
+            string pixmaps_path = Path.Combine (tmp_path, "Images".SHA1 ());
             
             if (!Directory.Exists (pixmaps_path)) {
                 Directory.CreateDirectory (pixmaps_path);
diff --git a/SparkleShare/Windows/SparkleEventLogWindow.xaml.cs b/SparkleShare/Windows/SparkleEventLogWindow.xaml.cs
index e9ce2305..b686da9d 100644
--- a/SparkleShare/Windows/SparkleEventLogWindow.xaml.cs
+++ b/SparkleShare/Windows/SparkleEventLogWindow.xaml.cs
@@ -1,4 +1,4 @@
-//   SparkleShare, a collaboration and sharing tool.
+//   SparkleShare, a collaboration and sharing tool.
 //   Copyright (C) 2010  Hylke Bons <hylkebons@gmail.com>
 //
 //   This program is free software: you can redistribute it and/or modify
@@ -145,7 +145,7 @@ namespace SparkleShare
 
         private void UpdateContent (string html)
         {
-            string pixmaps_path = Path.Combine (Sparkles.SparkleConfig.DefaultConfig.TmpPath, "Pixmaps");
+            string pixmaps_path = Path.Combine (Sparkles.SparkleConfig.DefaultConfig.TmpPath, "Images");
             pixmaps_path = pixmaps_path.Replace ("\\", "/");
 
 			html = html.Replace ("<a href=", "<a class='windows' href=");
@@ -208,7 +208,7 @@ namespace SparkleShare
         private void WriteOutImages ()
         {
             string tmp_path = Sparkles.SparkleConfig.DefaultConfig.TmpPath;
-			string pixmaps_path = Path.Combine (tmp_path, "Pixmaps");
+			string pixmaps_path = Path.Combine (tmp_path, "Images");
 
 			if (!Directory.Exists (pixmaps_path))
             {
diff --git a/SparkleShare/Windows/SparkleNote.xaml b/SparkleShare/Windows/SparkleNote.xaml
index 22f2b24b..355b2cd2 100644
--- a/SparkleShare/Windows/SparkleNote.xaml
+++ b/SparkleShare/Windows/SparkleNote.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="SparkleShare.SparkleNote"
+<Window x:Class="SparkleShare.SparkleNote"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -26,7 +26,7 @@
         </StackPanel>
         <TextBox x:Name="balloon_text_field" Grid.Row="1" Grid.ColumnSpan="2" Width="438" Height="72" BorderBrush="{x:Null}" BorderThickness="0" Padding="8,12,8,8" TextWrapping="Wrap" AcceptsReturn="True" Text="Anything to add?" >
             <TextBox.Background>
-                <ImageBrush ImageSource="pack://application:,,,/SparkleShare;component/Pixmaps/text-balloon.png" Stretch="Uniform"></ImageBrush>
+                <ImageBrush ImageSource="pack://application:,,,/SparkleShare;component/Images/text-balloon.png" Stretch="Uniform"></ImageBrush>
             </TextBox.Background>
         </TextBox>
         <StackPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Bottom" HorizontalAlignment="Right" Orientation="Horizontal">
diff --git a/SparkleShare/Windows/SparkleShare.Windows.csproj b/SparkleShare/Windows/SparkleShare.Windows.csproj
index 24620acc..9a4da88a 100644
--- a/SparkleShare/Windows/SparkleShare.Windows.csproj
+++ b/SparkleShare/Windows/SparkleShare.Windows.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -29,7 +29,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <ApplicationIcon>Pixmaps\sparkleshare-app.ico</ApplicationIcon>
+    <ApplicationIcon>Images\sparkleshare-app.ico</ApplicationIcon>
     <ReleaseVersion>
     </ReleaseVersion>
   </PropertyGroup>
@@ -142,11 +142,11 @@
     <Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Common\Pixmaps\about.png">
-      <Link>Pixmaps\about.png</Link>
+    <EmbeddedResource Include="..\Common\Images\about.png">
+      <Link>Images\about.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Common\Pixmaps\side-splash.png">
-      <Link>Pixmaps\side-splash.png</Link>
+    <EmbeddedResource Include="..\Common\Images\side-splash.png">
+      <Link>Images\side-splash.png</Link>
     </EmbeddedResource>
     <EmbeddedResource Include="..\Common\HTML\day-entry.html">
       <Link>HTML\day-entry.html</Link>
@@ -161,33 +161,33 @@
     <EmbeddedResource Include="..\Common\HTML\jquery.js">
       <Link>HTML\jquery.js</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Common\Pixmaps\user-icon-default.png">
-      <Link>Pixmaps\user-icon-default.png</Link>
+    <EmbeddedResource Include="..\Common\Images\user-icon-default.png">
+      <Link>Images\user-icon-default.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Linux\Pixmaps\icons\document-added-12.png">
-      <Link>Pixmaps\document-added-12.png</Link>
+    <EmbeddedResource Include="..\Linux\Images\icons\document-added-12.png">
+      <Link>Images\document-added-12.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Linux\Pixmaps\icons\document-deleted-12.png">
-      <Link>Pixmaps\document-deleted-12.png</Link>
+    <EmbeddedResource Include="..\Linux\Images\icons\document-deleted-12.png">
+      <Link>Images\document-deleted-12.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Linux\Pixmaps\icons\document-edited-12.png">
-      <Link>Pixmaps\document-edited-12.png</Link>
+    <EmbeddedResource Include="..\Linux\Images\icons\document-edited-12.png">
+      <Link>Images\document-edited-12.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Linux\Pixmaps\icons\document-moved-12.png">
-      <Link>Pixmaps\document-moved-12.png</Link>
+    <EmbeddedResource Include="..\Linux\Images\icons\document-moved-12.png">
+      <Link>Images\document-moved-12.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Linux\Pixmaps\icons\process-working-22.png">
-      <Link>Pixmaps\process-working-22.png</Link>
+    <EmbeddedResource Include="..\Linux\Images\icons\process-working-22.png">
+      <Link>Images\process-working-22.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pixmaps\process-syncing-down.png" />
-    <EmbeddedResource Include="Pixmaps\process-syncing-idle.png" />
-    <EmbeddedResource Include="Pixmaps\process-syncing-up.png" />
-    <EmbeddedResource Include="Pixmaps\process-syncing.png" />
-    <EmbeddedResource Include="..\Common\Pixmaps\tutorial-slide-1.png">
-      <Link>Pixmaps\tutorial-slide-1.png</Link>
+    <EmbeddedResource Include="Images\process-syncing-down.png" />
+    <EmbeddedResource Include="Images\process-syncing-idle.png" />
+    <EmbeddedResource Include="Images\process-syncing-up.png" />
+    <EmbeddedResource Include="Images\process-syncing.png" />
+    <EmbeddedResource Include="..\Common\Images\tutorial-slide-1.png">
+      <Link>Images\tutorial-slide-1.png</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="..\Common\Pixmaps\tutorial-slide-2.png">
-      <Link>Pixmaps\tutorial-slide-2.png</Link>
+    <EmbeddedResource Include="..\Common\Images\tutorial-slide-2.png">
+      <Link>Images\tutorial-slide-2.png</Link>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -243,19 +243,19 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pixmaps\folder.png" />
-    <EmbeddedResource Include="Pixmaps\process-syncing-error.png" />
-    <EmbeddedResource Include="Pixmaps\sparkleshare-app.ico" />
-    <EmbeddedResource Include="Pixmaps\sparkleshare-folder.png" />
+    <EmbeddedResource Include="Images\folder.png" />
+    <EmbeddedResource Include="Images\process-syncing-error.png" />
+    <EmbeddedResource Include="Images\sparkleshare-app.ico" />
+    <EmbeddedResource Include="Images\sparkleshare-folder.png" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pixmaps\tutorial-slide-3.png" />
+    <EmbeddedResource Include="Images\tutorial-slide-3.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="..\Common\Pixmaps\text-balloon.png">
-      <Link>Pixmaps\text-balloon.png</Link>
+    <Resource Include="..\Common\Images\text-balloon.png">
+      <Link>Images\text-balloon.png</Link>
     </Resource>
-    <Content Include="Pixmaps\sparkleshare-folder.ico" />
+    <Content Include="Images\sparkleshare-folder.ico" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="SparkleEventLogWindow.xaml">
diff --git a/SparkleShare/Windows/SparkleShare.wxs b/SparkleShare/Windows/SparkleShare.wxs
index 3b6c6871..9bd44834 100644
--- a/SparkleShare/Windows/SparkleShare.wxs
+++ b/SparkleShare/Windows/SparkleShare.wxs
@@ -22,7 +22,7 @@
             <Component Id='Libraries' Guid='0DA692D5-4DBE-4251-9F62-E7C1A76F10E1'>
               <File Id='Sparkles.Git.dll' Name='Sparkles.Git.dll' Source='!(wix.root)\bin\Sparkles.Git.dll' DiskId='1' />
               <File Id='Sparkles.dll' Name='Sparkles.dll' Source='!(wix.root)\bin\Sparkles.dll' DiskId='1' />
-              <File Id='sparkleshare_app.ico' Name='sparkleshare.ico' Source='!(wix.root)\SparkleShare\Windows\Pixmaps\sparkleshare-app.ico' DiskId='1' />
+              <File Id='sparkleshare_app.ico' Name='sparkleshare.ico' Source='!(wix.root)\SparkleShare\Windows\Images\sparkleshare-app.ico' DiskId='1' />
             </Component>
             <Directory Id='MSYSGIT_DIR' Name='msysgit'>
             </Directory>
diff --git a/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
index 379d7808..c7c97a3f 100644
--- a/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
+++ b/SparkleShare/Windows/SparkleShareInviteOpener/SparkleShareInviteOpener.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -11,7 +11,7 @@
     <RootNamespace>SparkleShareInviteOpener</RootNamespace>
     <AssemblyName>SparkleShareInviteOpener</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <ApplicationIcon>..\Pixmaps\sparkleshare-app.ico</ApplicationIcon>
+    <ApplicationIcon>..\Images\sparkleshare-app.ico</ApplicationIcon>
     <ReleaseVersion />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
diff --git a/SparkleShare/Windows/SparkleUIHelpers.cs b/SparkleShare/Windows/SparkleUIHelpers.cs
index ff289c80..640f17d3 100644
--- a/SparkleShare/Windows/SparkleUIHelpers.cs
+++ b/SparkleShare/Windows/SparkleUIHelpers.cs
@@ -44,7 +44,7 @@ namespace SparkleShare {
         public static BitmapFrame GetImageSource (string name, string type)
         {
             Assembly assembly = Assembly.GetExecutingAssembly();
-            Stream image_stream = assembly.GetManifestResourceStream("SparkleShare.Pixmaps." + name + "." + type);
+            Stream image_stream = assembly.GetManifestResourceStream("SparkleShare.Images." + name + "." + type);
             return BitmapFrame.Create(image_stream);
         }
 
@@ -62,7 +62,7 @@ namespace SparkleShare {
         public static Drawing.Bitmap GetBitmap (string name)
         {                                          
             Assembly assembly   = Assembly.GetExecutingAssembly ();
-            Stream image_stream = assembly.GetManifestResourceStream ("SparkleShare.Pixmaps." + name + ".png");
+            Stream image_stream = assembly.GetManifestResourceStream ("SparkleShare.Images." + name + ".png");
             return (Drawing.Bitmap) Drawing.Bitmap.FromStream (image_stream);
         }
         
diff --git a/SparkleShare/Windows/build.cmd b/SparkleShare/Windows/build.cmd
index e01316cb..2cae645b 100644
--- a/SparkleShare/Windows/build.cmd
+++ b/SparkleShare/Windows/build.cmd
@@ -6,7 +6,7 @@ if not exist %msbuild% set msbuild="%WinDirNet%\v4.0.30319\msbuild.exe"
 set wixBinDir=%WIX%\bin
 
 if not exist ..\..\bin mkdir ..\..\bin
-copy Pixmaps\sparkleshare-app.ico ..\..\bin\
+copy Images\sparkleshare-app.ico ..\..\bin\
 
 %msbuild% /t:Rebuild /p:Configuration=Release /p:Platform="Any CPU" "%~dp0\SparkleShare.sln"