diff --git a/imgsrc/mimetypes/djvu.svg b/imgsrc/mimetypes/djvu.svg
new file mode 100644
index 0000000000..401d9b4091
--- /dev/null
+++ b/imgsrc/mimetypes/djvu.svg
@@ -0,0 +1,438 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2606"
+   inkscape:version="0.48.1 "
+   sodipodi:docname="C:\cygwin\home\mperry\calibre\imgsrc\mimetypes\djvu.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="975"
+     inkscape:window-height="735"
+     id="namedview3077"
+     showgrid="false"
+     inkscape:zoom="2.0390625"
+     inkscape:cx="64"
+     inkscape:cy="64"
+     inkscape:window-x="298"
+     inkscape:window-y="122"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2606" />
+  <defs
+     id="defs2608">
+    <linearGradient
+       id="linearGradient10207">
+      <stop
+         id="stop10209"
+         style="stop-color:#a2a2a2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop10211"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="96"
+       y1="104"
+       x2="88.000198"
+       y2="96.000198"
+       id="XMLID_12_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop83"
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop85"
+         style="stop-color:#8c8e89;stop-opacity:1"
+         offset="0.0072" />
+      <stop
+         id="stop87"
+         style="stop-color:#abaca9;stop-opacity:1"
+         offset="0.0673" />
+      <stop
+         id="stop89"
+         style="stop-color:#c5c6c4;stop-opacity:1"
+         offset="0.1347" />
+      <stop
+         id="stop91"
+         style="stop-color:#dbdbda;stop-opacity:1"
+         offset="0.2652576" />
+      <stop
+         id="stop93"
+         style="stop-color:#ebebeb;stop-opacity:1"
+         offset="0.37646064" />
+      <stop
+         id="stop95"
+         style="stop-color:#f7f7f6;stop-opacity:1"
+         offset="0.48740286" />
+      <stop
+         id="stop97"
+         style="stop-color:#fdfdfd;stop-opacity:1"
+         offset="0.6324091" />
+      <stop
+         id="stop99"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="XMLID_8_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop41"
+         style="stop-color:#b7b8b9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop47"
+         style="stop-color:#ececec;stop-opacity:1"
+         offset="0.18851049" />
+      <stop
+         id="stop49"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.25718147" />
+      <stop
+         id="stop51"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.30111277" />
+      <stop
+         id="stop53"
+         style="stop-color:#fafafa;stop-opacity:1"
+         offset="0.53130001" />
+      <stop
+         id="stop55"
+         style="stop-color:#ebecec;stop-opacity:1"
+         offset="0.84490001" />
+      <stop
+         id="stop57"
+         style="stop-color:#e1e2e3;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <filter
+       x="-0.19200002"
+       y="-0.19199999"
+       width="1.3839999"
+       height="1.3839999"
+       color-interpolation-filters="sRGB"
+       id="filter6697">
+      <feGaussianBlur
+         id="feGaussianBlur6699"
+         stdDeviation="1.9447689" />
+    </filter>
+    <clipPath
+       id="clipPath7084">
+      <path
+         d="m 72,88 -32,32 -8,0 0,-40 40,0 0,8 z"
+         id="path7086"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    </clipPath>
+    <radialGradient
+       cx="102"
+       cy="112.3047"
+       r="139.55859"
+       id="radialGradient9437"
+       xlink:href="#XMLID_8_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9996653,2e-6,0.00301608)" />
+    <linearGradient
+       x1="98.617439"
+       y1="106.41443"
+       x2="91.228737"
+       y2="99.254974"
+       id="linearGradient10213"
+       xlink:href="#linearGradient10207"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter2770">
+      <feGaussianBlur
+         id="feGaussianBlur2772"
+         stdDeviation="2.0786429" />
+    </filter>
+    <linearGradient
+       x1="45.033901"
+       y1="44.966038"
+       x2="11.675456"
+       y2="1.4610662"
+       id="linearGradient2774"
+       xlink:href="#linearGradient2545"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0115079,0,0,1.0161106,5.5234761,9.1336546)" />
+    <linearGradient
+       x1="25.553648"
+       y1="34.006008"
+       x2="0"
+       y2="34.153435"
+       id="linearGradient2756"
+       xlink:href="#linearGradient11545"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)" />
+    <linearGradient
+       x1="40.864098"
+       y1="40.518246"
+       x2="33.136433"
+       y2="32.651588"
+       id="linearGradient2749"
+       xlink:href="#linearGradient11663"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)" />
+    <linearGradient
+       x1="45.033901"
+       y1="44.966038"
+       x2="11.675456"
+       y2="1.4610662"
+       id="linearGradient2543"
+       xlink:href="#linearGradient2545"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9880039,0,0,0.9757112,0.5252674,0.07904551)" />
+    <linearGradient
+       id="linearGradient2545">
+      <stop
+         id="stop2547"
+         style="stop-color:#342679;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2553"
+         style="stop-color:#7b51ae;stop-opacity:0.96862745"
+         offset="0.72235626" />
+      <stop
+         id="stop2549"
+         style="stop-color:#d9cce8;stop-opacity:0.96862745"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.553648"
+       y1="34.006008"
+       x2="0"
+       y2="34.153435"
+       id="linearGradient11653"
+       xlink:href="#linearGradient11545"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4601868,0,0,0.9728475,2.2307835,28.622031)" />
+    <linearGradient
+       id="linearGradient11545">
+      <stop
+         id="stop11547"
+         style="stop-color:#f89c11;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop11549"
+         style="stop-color:#fabf60;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <clipPath
+       id="clip7">
+      <path
+         d="m 10.84375,39.414062 -10.84375,0 0,-10.953124 10.84375,0 0,-28.45703175 35.542969,0 0,32.73437475 -13.058594,13.058594 -22.484375,0 0,-6.382813"
+         id="path25" />
+    </clipPath>
+    <clipPath
+       id="clip32">
+      <path
+         d="m 10.84375,39.414062 -10.84375,0 0,-10.953124 10.84375,0 0,-28.45703175 35.542969,0 0,32.73437475 -13.058594,13.058594 -22.484375,0 0,-6.382813"
+         id="path100" />
+    </clipPath>
+    <clipPath
+       id="clip48">
+      <path
+         d="m 10.84375,39.414062 -10.84375,0 0,-10.953124 10.84375,0 0,-28.45703175 35.542969,0 0,32.73437475 -13.058594,13.058594 -22.484375,0 0,-6.382813"
+         id="path148" />
+    </clipPath>
+    <linearGradient
+       x1="25.553648"
+       y1="34.006008"
+       x2="0"
+       y2="34.153435"
+       id="linearGradient2525"
+       xlink:href="#linearGradient11545"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="40.864098"
+       y1="40.518246"
+       x2="33.136433"
+       y2="32.651588"
+       id="linearGradient2518"
+       xlink:href="#linearGradient11663"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient11663">
+      <stop
+         id="stop11665"
+         style="stop-color:#342679;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop11667"
+         style="stop-color:#dacfe4;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata2611">
+    <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
+     id="layer1">
+    <path
+       d="m 16,8 0,112 c 0,0 63.15625,0 63.15625,0 l 0.03125,0 c 3e-6,0 11.90625,-9.90625 17.40625,-15.40625 C 102.09375,99.09375 112,87.1875 112,87.1875 L 112,87.15625 112,8 16,8 z"
+       transform="matrix(1.0416667,0,0,1.0267857,-2.6666667,-1.2142891)"
+       id="path7865"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;filter:url(#filter2770)" />
+    <path
+       d="M 16.000001,8 16,120 c 0,0 63.146418,0 63.146418,0 L 112,87.14642 112,8 16.000001,8 z"
+       id="path34"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       d="m 18.000002,9.0000034 c -0.551,0 -1,0.44885 -1,0.999665 l 0,107.9638516 c 0,0.55181 0.449,0.99966 1,0.99966 l 59.171997,0 c 0.263,0 2.76268,0.11813 2.948681,-0.0688 L 110.707,88.094202 C 110.894,87.907264 111,85.40942 111,85.146508 l 0,-75.1468396 c 0,-0.550815 -0.448,-0.999665 -1,-0.999665 l -91.999998,0 z"
+       id="path59"
+       style="fill:url(#radialGradient9437);fill-opacity:1" />
+    <path
+       d="m 41.879531,115.98249 c 0,0 24.309609,-24.309614 24.309609,-24.309614 0,0 -9.35314,2.913124 -19.60314,2.913124 0,10.25 -4.706469,21.39649 -4.706469,21.39649 z"
+       transform="translate(40,0)"
+       clip-path="url(#clipPath7084)"
+       id="path5540"
+       style="opacity:0.4;fill:#000000;fill-opacity:1;filter:url(#filter6697)" />
+    <path
+       d="m 79.172,120 c 0,0 11.914,-9.914 17.414,-15.414 5.5,-5.5 15.414,-17.414 15.414,-17.414 0,0 -13.75,8.828 -24,8.828 0,10.25 -8.828,24 -8.828,24 z"
+       id="path14523"
+       style="fill:url(#linearGradient10213);fill-opacity:1" />
+    <g
+       transform="matrix(2.6666667,0,0,2.6666667,-26.364309,-16.219923)"
+       id="layer1-2">
+      <g
+         transform="matrix(1.000026,0,0,0.9968473,-1.2968723e-4,0.405534)"
+         id="g2454">
+        <g
+           transform="matrix(1.0237894,0,0,1.0414051,9.6816161,-27.57005)"
+           id="g11649">
+          <rect
+             width="11.895136"
+             height="11.569371"
+             ry="2.7001941e-017"
+             x="3.1296141"
+             y="57.056187"
+             transform="matrix(0.9396926,-0.3420201,0.3420201,0.9396926,0,0)"
+             id="rect11645"
+             style="fill:#000000;fill-opacity:1" />
+          <rect
+             width="11.895135"
+             height="11.56937"
+             ry="2.7001941e-017"
+             x="2.2307839"
+             y="56.063431"
+             transform="matrix(0.9396926,-0.3420201,0.3420201,0.9396926,0,0)"
+             id="rect11641"
+             style="fill:url(#linearGradient11653);fill-opacity:1" />
+        </g>
+        <g
+           transform="matrix(1.0237894,0,0,1.0414051,4.9857129,9.0513362)"
+           clip-path="url(#clip7)"
+           id="g1139" />
+        <g
+           transform="matrix(1.0237894,0,0,1.0414051,0.779179,8.770206)"
+           id="g11677"
+           style="fill:#816392;fill-opacity:0.86179516">
+          <g
+             transform="translate(4.2261802,1.3274155)"
+             clip-path="url(#clip32)"
+             id="g11679"
+             style="fill:#816392;fill-opacity:0.86179516">
+            <path
+               d="m 26.128906,23.296875 c 2.015625,1.242187 4.480469,1.78125 6.523438,0.195313 1.574218,-1.210938 1.84375,-3.335938 1.324218,-5.414063 -0.917968,-3.585937 -4.5625,-7.527344 -4.5625,-7.527344 L 18.972656,-2.15625 c 0,0 -0.136718,-0.171875 -0.433594,-0.261719 -0.414062,-0.117187 -1.035156,0.261719 -0.683593,1.027344 l 10.910156,13.445313 c 0,0 3.265625,3.304687 3.886719,6.472656 0.296875,1.484375 0.214844,2.960937 -0.917969,3.871094 C 30.214844,23.621094 28.289062,22.9375 26.605469,21.863281 24.34375,20.417969 22.429688,18.09375 22.429688,18.09375 L 7.777344,0.679688 7.613281,2.613281 21.472656,19.136719 c 0,0 2.082032,2.566406 4.65625,4.160156"
+               id="path11681"
+               style="fill:#816392;fill-opacity:0.86179516;fill-rule:nonzero;stroke:none" />
+          </g>
+          <g
+             transform="translate(4.2261807,1.4535628)"
+             clip-path="url(#clip48)"
+             id="g11683"
+             style="fill:#816392;fill-opacity:0.86179516">
+            <path
+               d="m 28.304688,15.984375 c 2.003906,2.550781 0.160156,3.707031 -1.125,3.027344 -1.875,-1 -4.425782,-4.386719 -4.425782,-4.386719 L 15.613281,6.003906 C 15.070312,5.257812 14.429688,5.644531 14.296875,6.09375 c -0.09766,0.347656 0.238281,0.683594 0.238281,0.683594 l 7.191406,8.703125 c 0,0 2.207032,2.601562 3.398438,3.738281 3.5,3.367188 7.761719,0.152344 4.050781,-4.558594 C 27.074219,12 23.867188,8.175781 23.867188,8.175781 L 13.371094,-4.707031 11.859375,-4.839844 11.789062,-4.050781 22.511719,8.71875 c 0,0 3.636719,4.523438 5.792969,7.265625"
+               id="path11685"
+               style="fill:#816392;fill-opacity:0.86179516;fill-rule:nonzero;stroke:none" />
+          </g>
+        </g>
+        <g
+           transform="matrix(1.0237894,0,0,1.0414051,0.659598,7.725718)"
+           id="g11671">
+          <g
+             transform="translate(4.2261802,1.3274155)"
+             clip-path="url(#clip32)"
+             id="g3875">
+            <path
+               d="m 26.128906,23.296875 c 2.015625,1.242187 4.480469,1.78125 6.523438,0.195313 1.574218,-1.210938 1.84375,-3.335938 1.324218,-5.414063 -0.917968,-3.585937 -4.5625,-7.527344 -4.5625,-7.527344 L 18.972656,-2.15625 c 0,0 -0.136718,-0.171875 -0.433594,-0.261719 -0.414062,-0.117187 -1.035156,0.261719 -0.683593,1.027344 l 10.910156,13.445313 c 0,0 3.265625,3.304687 3.886719,6.472656 0.296875,1.484375 0.214844,2.960937 -0.917969,3.871094 C 30.214844,23.621094 28.289062,22.9375 26.605469,21.863281 24.34375,20.417969 22.429688,18.09375 22.429688,18.09375 L 7.777344,0.679688 7.613281,2.613281 21.472656,19.136719 c 0,0 2.082032,2.566406 4.65625,4.160156"
+               id="path3877"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+          </g>
+          <g
+             transform="translate(4.2261807,1.4535628)"
+             clip-path="url(#clip48)"
+             id="g6171">
+            <path
+               d="m 28.304688,15.984375 c 2.003906,2.550781 0.160156,3.707031 -1.125,3.027344 -1.875,-1 -4.425782,-4.386719 -4.425782,-4.386719 L 15.613281,6.003906 C 15.070312,5.257812 14.429688,5.644531 14.296875,6.09375 c -0.09766,0.347656 0.238281,0.683594 0.238281,0.683594 l 7.191406,8.703125 c 0,0 2.207032,2.601562 3.398438,3.738281 3.5,3.367188 7.761719,0.152344 4.050781,-4.558594 C 27.074219,12 23.867188,8.175781 23.867188,8.175781 L 13.371094,-4.707031 11.859375,-4.839844 11.789062,-4.050781 22.511719,8.71875 c 0,0 3.636719,4.523438 5.792969,7.265625"
+               id="path6173"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+          </g>
+        </g>
+        <text
+           x="6.855123"
+           y="40.434292"
+           transform="scale(0.9915063,1.0085665)"
+           id="text11553"
+           xml:space="preserve"
+           style="font-size:41.30238724px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><tspan
+             x="6.855123"
+             y="40.434292"
+             id="tspan11555" /></text>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.10181328,0,0,0.10181328,23.503861,90.420112)"
+       id="g8370">
+      <path
+         d="m 20.795,23.442 c 41.244,-1.555 81.688,-2.171 104.79,17.582 10.619,27.832 15.009,83.404 4.99,117.209 -18.421,31.11 -62.996,31.504 -109.78,29.303 0,-54.699 0,-109.396 0,-164.094 z m 34.93,134.79 c 11.643,0 23.287,0 34.93,0 16.604,-30.859 22.254,-125.032 -34.93,-105.488 0,35.163 0,70.326 0,105.488 z"
+         id="path8372"
+         style="fill-rule:evenodd" />
+      <path
+         d="m 165.505,23.442 c 33.267,0 66.533,0 99.8,0 7.251,46.182 16.995,89.436 34.931,123.07 14.479,-35.739 17.123,-85.377 29.939,-123.07 11.644,0 23.287,0 34.93,0 -12.062,58.113 -35.35,103.042 -44.909,164.093 -14.971,0 -29.94,0 -44.91,0 -9.471,-49.436 -28.165,-88.039 -39.92,-134.791 -23.287,0 -46.573,0 -69.86,0 -0.001,-9.767 -0.001,-19.535 -0.001,-29.302 z"
+         id="path8374"
+         style="fill-rule:evenodd" />
+      <path
+         d="m 385.065,76.186 c 12.301,-0.773 24.042,-0.888 29.939,5.86 -2.146,26.978 -3.585,49.781 4.99,76.186 45.408,12.307 33.898,-42.234 34.93,-82.046 9.98,0 19.96,0 29.94,0 0,37.116 0,74.232 0,111.349 -22.437,6.814 -26.368,-8.103 -29.94,-23.442 -14.933,22.293 -52.771,32.37 -69.859,5.86 0,-31.255 0,-62.511 0,-93.767 z"
+         id="path8376"
+         style="fill-rule:evenodd" />
+      <path
+         d="m 165.505,87.907 c 9.98,0 19.96,0 29.94,0 -2.328,48.057 6.913,109.699 -9.98,140.651 -23.857,2.642 -21.052,2.642 -44.91,0 24.686,-27.659 29.399,-78.774 24.95,-140.651 z"
+         id="path8378"
+         style="fill-rule:evenodd" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/images/mimetypes/djvu.png b/resources/images/mimetypes/djvu.png
new file mode 100755
index 0000000000..64dfc27ca7
Binary files /dev/null and b/resources/images/mimetypes/djvu.png differ
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 849521cd7e..22c9cc149f 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -423,6 +423,8 @@ class FileIconProvider(QFileIconProvider):
              'rtf'     : 'rtf',
              'odt'     : 'odt',
              'snb'     : 'snb',
+             'djv'     : 'djvu',
+             'djvu'    : 'djvu',
              }
 
     def __init__(self):