Merge lp:~victored/beat-box/icon-system into lp:beat-box

[Victor Martinez]

[Scott Ringwelski (sgringwe)]

Looks good. There is one issue though, where I get a warning about GIcon and Pixbuf's.

[WARN 13:34:45.984354] [GLib-GObject] unable to set property `pixbuf' of type `GdkPixbuf' from value of type `GIcon'

It is merged though, so that can be picked up in trunk if you'd like (might be easier). Don't forget to mark fixed bugs as fix-released :).

[Victor Martinez (victored)]

Ok, thanks for your review!

That issue is weird. Although I removed the pixbuf property, it appears sometimes. It might have something to to with the initialization process.

=== modified file 'images/CMakeLists.txt'
--- images/CMakeLists.txt	2012-01-11 22:40:39 +0000
+++ images/CMakeLists.txt	2012-01-31 01:07:25 +0000
@@ -19,6 +19,9 @@
 # radio icon
 install(FILES icons/16x16/mimetypes/internet-radio.svg DESTINATION share/beatbox/icons/hicolor/16x16/mimetypes)
 
+# CD icon
+install(FILES icons/16x16/mimetypes/media-cdrom-audio.svg DESTINATION share/beatbox/icons/hicolor/16x16/mimetypes)
+
 # media-audio for default album image
 install(FILES icons/128x128/mimetypes/media-audio.png DESTINATION share/beatbox/icons/hicolor/128x128/mimetypes)
 install(FILES icons/128x128/mimetypes/drop-album.svg DESTINATION share/beatbox/icons/hicolor/128x128/mimetypes)
@@ -37,11 +40,16 @@
 install(FILES icons/16x16/status/media-playlist-no-shuffle-symbolic.svg DESTINATION share/beatbox/icons/hicolor/16x16/status)
 
 # now-playing icon
-install(FILES icons/16x16/status/audio-volume-high-symbolic.svg DESTINATION share/beatbox/icons/hicolor/16x16/status)
+install(FILES icons/16x16/actions/media-playback-start-symbolic.svg DESTINATION share/beatbox/icons/hicolor/16x16/actions)
+install(FILES icons/16x16/actions/media-playback-pause-symbolic.svg DESTINATION share/beatbox/icons/hicolor/16x16/actions)
 
 # starred and not-starrred icons
 install(FILES icons/16x16/status/starred.svg DESTINATION share/beatbox/icons/hicolor/16x16/status)
 install(FILES icons/16x16/status/not-starred.svg DESTINATION share/beatbox/icons/hicolor/16x16/status)
+install(FILES icons/16x16/status/starred-symbolic.svg DESTINATION share/beatbox/icons/hicolor/16x16/status)
+install(FILES icons/16x16/status/non-starred-symbolic.svg DESTINATION share/beatbox/icons/hicolor/16x16/status)
+
+# new podcast icon
 install(FILES icons/16x16/status/podcast-new.svg DESTINATION share/beatbox/icons/hicolor/16x16/status)
 
 # playlist icons

=== added file 'images/icons/16x16/actions/media-playback-pause-symbolic.svg'
--- images/icons/16x16/actions/media-playback-pause-symbolic.svg	1970-01-01 00:00:00 +0000
+++ images/icons/16x16/actions/media-playback-pause-symbolic.svg	2012-01-31 01:07:25 +0000
@@ -0,0 +1,61 @@
+<?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="16px"
+   height="16px"
+   id="svg5979"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="media-playback-pause-symbolic.svg">
+  <defs
+     id="defs5981" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="7.0314356"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5984">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       id="rect10309-7"
+       style="opacity:1;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 9,1 4,0 0,13 -4,0 z M 3,1 7,1 7,14 3,14 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

=== added file 'images/icons/16x16/actions/media-playback-start-symbolic.svg'
--- images/icons/16x16/actions/media-playback-start-symbolic.svg	1970-01-01 00:00:00 +0000
+++ images/icons/16x16/actions/media-playback-start-symbolic.svg	2012-01-31 01:07:25 +0000
@@ -0,0 +1,65 @@
+<?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"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="media-playback-start-symbolic.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1129"
+     inkscape:window-height="664"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="29.375"
+     inkscape:cx="2.9957447"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs11" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     inkscape:connector-curvature="0"
+     d="m 2,0.99996 0,13 L 14,7.49997 2,0.99996 z"
+     id="path2843-39-5-5"
+     style="opacity:1;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>

=== added file 'images/icons/16x16/mimetypes/media-cdrom-audio.svg'
--- images/icons/16x16/mimetypes/media-cdrom-audio.svg	1970-01-01 00:00:00 +0000
+++ images/icons/16x16/mimetypes/media-cdrom-audio.svg	2012-01-31 01:07:25 +0000
@@ -0,0 +1,481 @@
+<?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"
+   width="16px"
+   height="16px"
+   id="svg3468"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="media-optical-audio.svg">
+  <defs
+     id="defs3470">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7067-5"
+       id="radialGradient3328"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17229922,-0.03416223,0.00604943,0.18162052,5.8195328,7.0847586)"
+       cx="17.058823"
+       cy="41.058823"
+       fx="14.68769"
+       fy="37.45607"
+       r="5.7384715" />
+    <linearGradient
+       id="linearGradient7067-5">
+      <stop
+         id="stop7069-9"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop7071-3"
+         style="stop-color:white;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2372-9"
+       id="linearGradient3340"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08571781,0,0,0.08522814,7.9176253,-4.3076115)"
+       x1="28.503141"
+       y1="137.53885"
+       x2="26.256771"
+       y2="125.39074" />
+    <linearGradient
+       id="linearGradient2372-9">
+      <stop
+         id="stop2374-9"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2376-4"
+         style="stop-color:white;stop-opacity:0.34482759"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3668-5"
+       id="radialGradient3334"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.20116938,-0.03223979,0.00439091,0.18585691,10.178365,6.1248025)"
+       cx="17.058823"
+       cy="41.058823"
+       fx="14.757765"
+       fy="37.841019"
+       r="5.7384715" />
+    <linearGradient
+       id="linearGradient3668-5">
+      <stop
+         id="stop3670-7"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3672-4"
+         style="stop-color:white;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2372-9"
+       id="linearGradient3337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.16347277,0,0,0.08545271,11.122671,-4.958012)"
+       x1="28.739122"
+       y1="144.11652"
+       x2="26.256771"
+       y2="125.39074" />
+    <linearGradient
+       x1="12.2744"
+       y1="32.4165"
+       x2="35.391201"
+       y2="14.2033"
+       id="linearGradient4083"
+       xlink:href="#linearGradient3263"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.4285752,-0.4285752,0,17.900088,-2.2858061)" />
+    <linearGradient
+       x1="12.2744"
+       y1="32.4165"
+       x2="35.391201"
+       y2="14.2033"
+       id="linearGradient3263"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3265"
+         style="stop-color:#dedbde;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3267"
+         style="stop-color:#e6e6e6;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3269"
+         style="stop-color:#d2d2d2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-21.915663"
+       y1="3"
+       x2="-21.915663"
+       y2="45.032898"
+       id="linearGradient4085"
+       xlink:href="#linearGradient3772"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3658536,0,0,0.3658536,17.609167,-0.78048667)" />
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         id="stop3774"
+         style="stop-color:#b4b4b4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3776"
+         style="stop-color:#969696;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20.580074"
+       y1="10.774516"
+       x2="24.27351"
+       y2="9.8622112"
+       id="linearGradient3312"
+       xlink:href="#linearGradient3487"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient3487">
+      <stop
+         id="stop3489"
+         style="stop-color:#e6cde2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3491"
+         style="stop-color:#e6cde2;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="17.494959"
+       y1="11.200086"
+       x2="21.047453"
+       y2="9.7956104"
+       id="linearGradient3314"
+       xlink:href="#linearGradient3495"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient3495">
+      <stop
+         id="stop3497"
+         style="stop-color:#c1cbe4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3499"
+         style="stop-color:#c1cbe4;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="14.084608"
+       y1="13.045606"
+       x2="16.994024"
+       y2="10.732353"
+       id="linearGradient3316"
+       xlink:href="#linearGradient3503"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient3503">
+      <stop
+         id="stop3505"
+         style="stop-color:#c4ebdd;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3507"
+         style="stop-color:#c4ebdd;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.371647"
+       y1="16.188046"
+       x2="14.609327"
+       y2="13.461712"
+       id="linearGradient3318"
+       xlink:href="#linearGradient3511"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient3511">
+      <stop
+         id="stop3513"
+         style="stop-color:#ebeec7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3515"
+         style="stop-color:#ebeec7;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="10.609375"
+       y1="17.886322"
+       x2="9.7297754"
+       y2="20.612656"
+       id="linearGradient3320"
+       xlink:href="#linearGradient3519"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       id="linearGradient3519">
+      <stop
+         id="stop3521"
+         style="stop-color:#fcd9cd;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3523"
+         style="stop-color:#fcd9cd;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20.580074"
+       y1="10.774516"
+       x2="24.27351"
+       y2="9.8622112"
+       id="linearGradient3301"
+       xlink:href="#linearGradient3487"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       x1="17.494959"
+       y1="11.200086"
+       x2="21.047453"
+       y2="9.7956104"
+       id="linearGradient3303"
+       xlink:href="#linearGradient3495"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       x1="14.084608"
+       y1="13.045606"
+       x2="16.994024"
+       y2="10.732353"
+       id="linearGradient3305"
+       xlink:href="#linearGradient3503"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       x1="12.371647"
+       y1="16.188046"
+       x2="14.609327"
+       y2="13.461712"
+       id="linearGradient3307"
+       xlink:href="#linearGradient3511"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       x1="10.609375"
+       y1="17.886322"
+       x2="9.7297754"
+       y2="20.612656"
+       id="linearGradient3309"
+       xlink:href="#linearGradient3519"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       x1="18.775953"
+       y1="4.0378027"
+       x2="18.203465"
+       y2="45.962208"
+       id="linearGradient3054"
+       xlink:href="#linearGradient6036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1767888,0,0,-0.1767887,3.6957217,12.41972)" />
+    <linearGradient
+       id="linearGradient6036">
+      <stop
+         id="stop6038"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6040"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4011">
+      <stop
+         id="stop4013"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4015"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.507761" />
+      <stop
+         id="stop4017"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.83456558" />
+      <stop
+         id="stop4019"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="44.340794"
+       x2="71.204407"
+       y1="6.2375584"
+       x1="71.204407"
+       gradientTransform="matrix(0.35135135,0,0,0.35135138,-17.203666,-0.9093005)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3466"
+       xlink:href="#linearGradient4011"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="447"
+     inkscape:window-height="446"
+     inkscape:window-x="415"
+     inkscape:window-y="167"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3473">
+    <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"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="layer1-4">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 15.5,8.0000004 c 0,-4.1571805 -3.34282,-7.49999949 -7.5000007,-7.49999949 -4.1571809,0 -7.49999939,3.34281929 -7.49999939,7.49999949 C 0.49999911,12.15718 3.8428187,15.5 7.9999993,15.5 12.157179,15.499999 15.5,12.15718 15.5,8.0000004 z m -5,0 C 10.5,9.2939445 9.5060913,10.5 7.9999993,10.5 6.4939073,10.5 5.5,9.1934915 5.5,8.0000004 c 0,-1.2270178 1.0349902,-2.5 2.4999993,-2.5 1.4985143,0 2.5000007,1.2056213 2.5000007,2.5 z"
+         id="path2781"
+         style="fill:url(#linearGradient4083);fill-rule:nonzero;stroke:url(#linearGradient4085);stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
+      <g
+         transform="matrix(0.3357395,0,0,0.3357395,-0.1714995,-0.39196467)"
+         id="g3527">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 15.856928,5.7307748 20.625,16.34375 C 21.660403,15.885186 22.795334,15.625 24,15.625 c 0.03206,0 0.06178,-3.6e-4 0.09375,0 L 24.10801,4.0047512 c -2.94215,-0.070687 -5.543041,0.6572865 -8.251083,1.7260236 l 10e-7,0 z"
+           transform="matrix(0.9996011,0.02824295,-0.02824295,0.9996011,0.6924114,-0.6708346)"
+           id="path3296"
+           style="opacity:0.8;fill:url(#linearGradient3312);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 12.121471,7.9060109 6.931026,9.3601041 c 0.913109,-0.669755 1.965938,-1.167064 3.142629,-1.425169 0.03132,-0.0069 0.06026,-0.01359 0.09157,-0.02009 L 19.857174,4.426276 c -2.888973,0.5613244 -5.31953,1.8556038 -7.735703,3.4797349 l 0,0 z"
+           id="path3308"
+           style="opacity:0.8;fill:url(#linearGradient3314);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 8.2523933,11.646535 9.2137237,7.155818 c 0.70865,-0.883264 1.596891,-1.636119 2.666685,-2.18998 0.02847,-0.01474 0.05469,-0.02872 0.08325,-0.0431 L 14.86585,6.2506132 C 12.220599,7.5405321 10.165881,9.452393 8.2523933,11.646535 z"
+           id="path3310"
+           style="opacity:0.8;fill:url(#linearGradient3316);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 5.6328855,16.073974 c 7.1748065,2.242248 7.8502625,7.031463 12.7767855,1.754127 L 10.499985,9.1321388 C 8.2787249,11.062747 6.9132871,13.459349 5.6328855,16.073974 z"
+           id="path3312"
+           style="opacity:0.8;fill:url(#linearGradient3318);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="M 7.155289,13.193173 C 5.9722117,14.945185 5.2475768,16.829547 4.6301929,18.837116 L 15.96875,21.8125 C 16.184264,21.049497 16.486796,20.297733 16.9375,19.59375 16.95479,19.56675 16.98246,19.52673 17,19.5 L 7.155289,13.193173 z"
+           id="path3314"
+           style="opacity:0.8;fill:url(#linearGradient3320);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      </g>
+      <g
+         transform="matrix(-0.3507965,0,0,-0.3507965,16.408914,16.448702)"
+         id="g3297">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 15.856928,5.7307748 20.625,16.34375 C 21.660403,15.885186 22.795334,15.625 24,15.625 c 0.03206,0 0.06178,-3.6e-4 0.09375,0 L 24.10801,4.0047512 c -2.94215,-0.070687 -5.543041,0.6572865 -8.251083,1.7260236 l 10e-7,0 z"
+           transform="matrix(0.9996011,0.02824295,-0.02824295,0.9996011,0.6924114,-0.6708346)"
+           id="path3299"
+           style="opacity:0.8;fill:url(#linearGradient3301);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 12.121471,7.9060109 6.931026,9.3601041 c 0.913109,-0.669755 1.965938,-1.167064 3.142629,-1.425169 0.03132,-0.0069 0.06026,-0.01359 0.09157,-0.02009 L 19.857174,4.426276 c -2.888973,0.5613244 -5.31953,1.8556038 -7.735703,3.4797349 l 0,0 z"
+           id="path3301"
+           style="opacity:0.8;fill:url(#linearGradient3303);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 8.2523933,11.646535 9.2137237,7.155818 c 0.70865,-0.883264 1.596891,-1.636119 2.666685,-2.18998 0.02847,-0.01474 0.05469,-0.02872 0.08325,-0.0431 L 14.86585,6.2506132 C 12.220599,7.5405321 10.165881,9.452393 8.2523933,11.646535 z"
+           id="path3303"
+           style="opacity:0.8;fill:url(#linearGradient3305);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 5.6328855,16.073974 c 7.1748065,2.242248 7.8502625,7.031463 12.7767855,1.754127 L 10.499985,9.1321388 C 8.2787249,11.062747 6.9132871,13.459349 5.6328855,16.073974 z"
+           id="path3305"
+           style="opacity:0.8;fill:url(#linearGradient3307);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           d="M 7.155289,13.193173 C 5.9722117,14.945185 5.2475768,16.829547 4.6301929,18.837116 L 15.96875,21.8125 C 16.184264,21.049497 16.486796,20.297733 16.9375,19.59375 16.95479,19.56675 16.98246,19.52673 17,19.5 L 7.155289,13.193173 z"
+           id="path3307"
+           style="opacity:0.8;fill:url(#linearGradient3309);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         d="M 7.9999996,11.5 C 6.0599997,11.5 4.5,9.9400008 4.5,8.000001 4.5,6.0600013 6.0599997,4.5000015 7.9999996,4.5000015 9.9399998,4.5000015 11.5,6.0600013 11.5,8.000001 11.5,9.9400008 9.9399998,11.5 7.9999996,11.5 l 0,0 0,0 0,0 z"
+         id="path3281"
+         style="opacity:0.4;fill:none;stroke:url(#linearGradient3054);stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         d="M 14.5,7.9997706 C 14.5,11.589738 11.589638,14.5 8.0000825,14.5 4.4102002,14.5 1.5,11.589704 1.5,7.9997706 c 0,-3.5898007 2.9102002,-6.49977 6.5000825,-6.49977 3.5895555,0 6.4999175,2.9099693 6.4999175,6.49977 l 0,0 z"
+         id="path8655"
+         style="opacity:0.55;color:#000000;fill:none;stroke:url(#linearGradient3466);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       d="M 15.014621,5.506415 C 13.419752,5.7588616 11.387357,5.9855721 9.7937385,6.2444672 9.3599881,6.459916 9.527947,7.0071043 9.5,7.393093 c -3e-7,1.6700032 0,3.340006 0,5.010009 -1.1136559,-0.245674 -1.978553,0.614328 -1.9880749,1.782557 -0.050141,0.750216 0.6811556,1.371844 1.4168459,1.303138 0.9972545,-0.05062 1.678008,-1.006812 1.571229,-2.02782 -10e-7,-1.670184 0,-3.600649 0,-5.2708335 1.315246,-0.1877147 2.684807,-0.3941718 4,-0.5822413 -10e-7,1.2874907 0,2.8352618 0,4.1227528 -1.067149,-0.304301 -2.176088,0.393273 -2.352921,1.508425 -0.147859,0.657173 0.316097,1.317694 0.949833,1.505511 1.186282,0.384896 2.523393,-0.750309 2.383483,-1.964262 -0.0032,-2.277028 0.01,-4.5540619 0,-6.8310825 C 15.452519,5.7229137 15.263681,5.494971 15.014621,5.506415 z"
+       id="path3406"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#333333;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 14.921691,11.92924 0.02179,-4.3530885 c 0.229606,-0.021437 0.03525,-0.00344 0.344866,-0.035557 0.0042,0.8131135 0.0058,1.3607734 0.0058,4.4316845 0,0.02285 -0.133724,-0.01147 -0.372473,-0.04304 l 2e-6,0 z"
+       id="path3996"
+       style="opacity:0.25;fill:url(#linearGradient3337);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 14.944768,13.011681 c 0,0.580213 -0.516845,1.137525 -1.154405,1.244791 -0.63756,0.107266 -1.154405,-0.276135 -1.154405,-0.856347 0,-0.580213 0.516845,-1.137526 1.154405,-1.244792 0.63756,-0.107265 1.154405,0.276135 1.154405,0.856348 z"
+       id="path2716"
+       style="opacity:0.6;fill:url(#radialGradient3334);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 9.8732835,12.574598 0,-5.6854586 c 0,0 0.09148,-0.3687964 0.3724725,-0.3699258 0.02442,0.041852 4.469668,-0.7398515 4.469668,-0.7398515 0,0 0.07318,0.3761083 -1.966354,0.6660794 -2.9029735,0.412731 -2.503314,0.5170323 -2.503314,0.8136236 0,0.8748438 0,2.363452 0,5.5488869 -0.06242,-0.05272 -0.2472855,-0.201869 -0.3724725,-0.233354 z"
+       id="path2720"
+       style="opacity:0.3;fill:url(#linearGradient3340);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:nodetypes="ccccssccc" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 9.9958716,13.769247 c 0,0.567226 -0.4426717,1.112062 -0.9887343,1.216927 -0.5460633,0.104865 -0.9887345,-0.269953 -0.9887345,-0.837179 0,-0.567225 0.4426712,-1.112062 0.9887345,-1.216927 0.5460626,-0.104865 0.9887343,0.269953 0.9887343,0.837179 z"
+       id="path2712"
+       style="opacity:0.6;fill:url(#radialGradient3328);fill-opacity:1;stroke:none" />
+  </g>
+</svg>

=== removed file 'images/icons/16x16/status/audio-volume-high-symbolic.svg'
--- images/icons/16x16/status/audio-volume-high-symbolic.svg	2011-12-30 01:58:16 +0000
+++ images/icons/16x16/status/audio-volume-high-symbolic.svg	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <title id="title9167">Gnome Symbolic Icon Theme</title>
- <metadata id="metadata90">
-  <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>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <defs id="defs7386">
-  <clipPath id="clipPath6279-3">
-   <rect id="rect6281-9" style="color:#bebebe;fill:#bebebe" height="6.375" width="3.825" y="220.75" x="26.85"/>
-  </clipPath>
-  <clipPath id="clipPath6265-334">
-   <rect id="rect6267-61" style="color:#bebebe;fill:#bebebe" height="5.2159" width="2.8977" y="221.33" x="26.966"/>
-  </clipPath>
-  <clipPath id="clipPath6259-5">
-   <rect id="rect6261-61" style="color:#bebebe;fill:#bebebe" height="4.8735" width="1.8763" y="221.5" x="26.999"/>
-  </clipPath>
- </defs>
- <g id="layer9" transform="translate(-41 -197)">
-  <path id="path3718" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m26.938 220.41a1.2751 1.2751 0 0 0 -0.65625 2.1875c0.75756 0.75756 0.75756 1.9299 0 2.6875a1.2816 1.2816 0 1 0 1.8125 1.8125c1.732-1.732 1.732-4.5805 0-6.3125a1.2751 1.2751 0 0 0 -1.1562 -0.375z" clip-path="url(#clipPath6279-3)" transform="matrix(.78431 0 0 .78431 26.941 28.863)"/>
-  <path id="path3726" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m27.125 221.09a0.5796 0.5796 0 0 0 -0.34375 1c1.0233 1.0233 1.0233 2.6642 0 3.6875a0.5796 0.5796 0 1 0 0.8125 0.8125c1.4663-1.4663 1.4663-3.8462 0-5.3125a0.5796 0.5796 0 0 0 -0.46875 -0.1875z" clip-path="url(#clipPath6265-334)" transform="matrix(1.7255 0 0 1.7255 3.4708 -181.9)"/>
-  <path id="path3728" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;fill:#bebebe" d="m27.062 221.31a0.37504 0.37504 0 0 0 -0.125 0.625c1.1015 1.1015 1.1015 2.8985 0 4a0.37565 0.37565 0 1 0 0.53125 0.53125c1.3881-1.3881 1.3881-3.6744 0-5.0625a0.37504 0.37504 0 0 0 -0.40625 -0.0937z" clip-path="url(#clipPath6259-5)" transform="matrix(2.6667 0 0 2.6667 -20 -392.67)"/>
-  <path id="path5491" style="color:#bebebe;fill:#bebebe" d="m41 202h2.4844l2.9688-3 0.54687 0.0156v11l-0.4753 0.00083-3.04-3.02h-2.4844v-5z"/>
- </g>
-</svg>

=== added file 'images/icons/16x16/status/non-starred-symbolic.svg'
--- images/icons/16x16/status/non-starred-symbolic.svg	1970-01-01 00:00:00 +0000
+++ images/icons/16x16/status/non-starred-symbolic.svg	2012-01-31 01:07:25 +0000
@@ -0,0 +1,70 @@
+<?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"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="non-starred-symbolic.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1129"
+     inkscape:window-height="664"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="29.375"
+     inkscape:cx="1.9404256"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs11" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     sodipodi:type="arc"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="path3027"
+     sodipodi:cx="8"
+     sodipodi:cy="8"
+     sodipodi:rx="1.5319149"
+     sodipodi:ry="1.5319149"
+     d="M 9.5319149,8 A 1.5319149,1.5319149 0 1 1 6.4680851,8 1.5319149,1.5319149 0 1 1 9.5319149,8 z"
+     transform="matrix(1.3055555,0,0,1.3055555,-2.444444,-2.444444)" />
+</svg>

=== added file 'images/icons/16x16/status/starred-symbolic.svg'
--- images/icons/16x16/status/starred-symbolic.svg	1970-01-01 00:00:00 +0000
+++ images/icons/16x16/status/starred-symbolic.svg	2012-01-31 01:07:25 +0000
@@ -0,0 +1,34 @@
+<?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"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384">
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs11" />
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="M 7.96875,1 C 7.3575435,1.0990989 7.1304889,1.770894 6.8421505,2.2428721 6.3809449,3.1598603 6.017643,4.1176435 5.5153311,5.0106092 5.0291624,5.2825821 4.3915699,5.2577824 3.8400152,5.3779423 3.066531,5.5163683 2.2779276,5.5751356 1.5235455,5.7975165 0.9267977,6.005526 0.8353545,6.8090819 1.3106319,7.1930703 c 0.6207334,0.8504968 1.4519447,1.5167073 2.1019628,2.328389 0.61245,0.4060827 0.4327151,1.0986887 0.31253,1.7042007 -0.1638765,1.00286 -0.403059,2.005472 -0.4085828,3.024766 0.031918,0.610342 0.7660244,0.940977 1.2610558,0.599969 1.0409092,-0.393598 1.9569489,-1.040628 2.9735473,-1.478759 0.5591475,-0.426642 1.1031916,0.164269 1.6217991,0.37229 0.7520546,0.415344 1.5117309,0.814302 2.2880419,1.177032 0.558015,0.244868 1.264576,-0.250942 1.137888,-0.866843 C 12.574142,12.72886 12.226383,11.435829 12.10962,10.121032 12.337194,9.601525 12.875802,9.2387371 13.253925,8.8078584 13.849712,8.2131103 14.451544,7.6094892 14.916867,6.9080348 15.149211,6.4124494 14.776425,5.7992397 14.236509,5.7493533 13.449492,5.4973688 12.623198,5.4208897 11.8125,5.28125 11.328208,5.1941709 10.45489,5.2462638 10.291367,4.5675274 9.7704237,3.6047931 9.3370261,2.6021655 8.8268353,1.6391087 8.6191976,1.364994 8.3467069,1.005705 7.96875,1 z"
+     id="path3800"
+     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>

=== modified file 'src/BeatBox.vala'
--- src/BeatBox.vala	2012-01-25 02:40:53 +0000
+++ src/BeatBox.vala	2012-01-31 01:07:25 +0000
@@ -34,7 +34,8 @@
 	public static LibraryWindow _program;
 	public static bool enableStore;
 	public static unowned string[] args;
-	
+
+/*
 	const Gtk.StockItem[] stock_items = {
 		{ "beatbox", null, 0, 0 },
 		{ "library-music", null, 0, 0 },
@@ -64,10 +65,10 @@
 		{ "multimedia-player", null, 0, 0},
 		{ "media-eject", null, 0, 0 },
 		{ "process-completed-symbolic", null, 0, 0},
-		{ "process-error-symbolic", null, 0, 0}
-		
+		{ "process-error-symbolic", null, 0, 0}	
     };
-	
+*/
+
 	static const OptionEntry[] my_options = {
 		{ "add-to-library", 'a', 0, OptionArg.FILENAME_ARRAY, ref Option.to_add, "Adds the list of files to the BeatBox library", "FILE1 FILE2 ..." },
 		{ "play-uri", 'p', 0, OptionArg.STRING, ref Option.to_play, "Plays given uri", "URI" },
@@ -94,7 +95,7 @@
 		//BeatBox.clutter_usable = GtkClutter.init(ref args) == Clutter.InitError.SUCCESS;
 		
 		Notify.init("beatbox");
-		add_stock_images();
+		//add_stock_images();
 		
 		app = new Beatbox();
 		app.set_application_id("net.launchpad.beatbox");
@@ -188,7 +189,8 @@
 		
 		_program.set_application(this);
 	}
-	
+
+/*
 	public static void add_stock_images() {
 		var iFactory = new Gtk.IconFactory();
 		
@@ -210,4 +212,5 @@
 		Gtk.Stock.add(stock_items);
 		iFactory.add_default();
 	}
+*/	
 }

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-01-24 20:20:58 +0000
+++ src/CMakeLists.txt	2012-01-31 01:07:25 +0000
@@ -6,7 +6,7 @@
 
 set(DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 set(PKG_DATADIR "${CMAKE_INSTALL_PREFIX}/share/beatbox")
-set(ICON_FOLDER "${CMAKE_INSTALL_PREFIX}/share/beatbox/icons")
+set(ICON_FOLDER "${CMAKE_INSTALL_PREFIX}/share/beatbox/icons/hicolor")
 set(GETTEXT_PACKAGE "beatbox")
 set(RELEASE_NAME "Acolyte")
 set(VERSION "0.3")
@@ -98,6 +98,7 @@
     Devices/AndroidDevice.vala
     Devices/CDRomDevice.vala
     Devices/DevicePreferences.vala
+    Icons.vala
     LibraryWindow.vala
     LibraryManager.vala
     Objects/TreeViewSetup.vala
@@ -112,7 +113,7 @@
     Objects/MPRIS.vala
     Objects/Playlist.vala
     Objects/PodcastManager.vala
-    Objects/Icons.vala
+    Objects/Icon.vala
     Widgets/TopDisplay.vala
     Widgets/SimilarSongsView.vala
     Widgets/ScrollingLabel.vala

=== modified file 'src/Devices/CDRomDevice.vala'
--- src/Devices/CDRomDevice.vala	2012-01-25 01:37:06 +0000
+++ src/Devices/CDRomDevice.vala	2012-01-31 01:07:25 +0000
@@ -289,7 +289,7 @@
 					lm.lw.notification.close();
 					lm.lw.notification.update("Import Complete", "BeatBox has finished importing " + (current_list_index + 1).to_string() + " songs from Audio CD", "beatbox");
 					
-					var beatbox_icon = lm.icons.beatbox_icon.render(Gtk.IconSize.DIALOG, null);
+					var beatbox_icon = Icons.BEATBOX_ICON.render(Gtk.IconSize.DIALOG, null);
 					lm.lw.notification.set_image_from_pixbuf(beatbox_icon);
 					
 					lm.lw.notification.show();

=== modified file 'src/Dialogs/AddPodcastWindow.vala'
--- src/Dialogs/AddPodcastWindow.vala	2012-01-06 16:11:04 +0000
+++ src/Dialogs/AddPodcastWindow.vala	2012-01-31 01:07:25 +0000
@@ -68,13 +68,13 @@
 		padding = new HBox(false, 10);
 		
 		/* get pixbufs */
-		valid = lw.lm.icons.process_completed_icon.render (IconSize.MENU, null);
-		not_valid = lw.lm.icons.process_error_icon.render (IconSize.MENU, null);
+		valid = Icons.PROCESS_COMPLETED_ICON.render (IconSize.MENU);
+		not_valid = Icons.PROCESS_ERROR_ICON.render (IconSize.MENU);
 		
 		if(valid == null)
-			valid = render_icon(Gtk.Stock.YES, IconSize.MENU, null);
+			valid = Icons.render_icon(Gtk.Stock.YES, IconSize.MENU);
 		if(not_valid == null)
-			not_valid = render_icon(Gtk.Stock.NO, IconSize.MENU, null);
+			not_valid = Icons.render_icon(Gtk.Stock.NO, IconSize.MENU);
 		
 		/* start out by creating all category labels */
 		Label sourceLabel = new Label("Podcast RSS Source");

=== modified file 'src/Dialogs/EqualizerWindow.vala'
--- src/Dialogs/EqualizerWindow.vala	2012-01-14 04:53:53 +0000
+++ src/Dialogs/EqualizerWindow.vala	2012-01-31 01:07:25 +0000
@@ -26,7 +26,7 @@
 
 	LibraryManager lm;
 	LibraryWindow lw;
-	
+
 	private Switch eq_switch;
 	private PresetList preset_combo;
 	private Entry new_preset_entry;
@@ -44,29 +44,29 @@
 
 	private List<VScale> scale_list;
 	private List<Label> label_list;
-	
+
 	private bool in_transition;
 	private Gee.ArrayList<int> target_levels;
-	
+
 	private string new_preset_name;
 
 	public EqualizerWindow (LibraryManager lm, LibraryWindow lw) {
-	
+
 		this.lm = lm;
 		this.lw = lw;
-		
+
 		scale_list = new List<VScale>();
 		label_list = new List<Label>();
 		target_levels = new Gee.ArrayList<int>();
-		
+
 		closing = false;
 		adding_preset = false;
 		initialized = false;
 		apply_changes = false;
-				
+
 		build_ui();
 		load_presets();
-				
+
 		initialized = true;
 
 		if (lm.settings.getAutoSwitchPreset ()) {
@@ -80,10 +80,10 @@
 		on_eq_switch_toggled ();
 		apply_changes = true;
 	}
-	
+
 	void build_ui () {
 		set_title("Equalizer");
-		
+
 		window_position = WindowPosition.CENTER;
 		type_hint = Gdk.WindowTypeHint.DIALOG;
 		set_transient_for(lw);
@@ -92,17 +92,17 @@
 		set_deletable(false);
 
 		set_icon(render_icon(Gtk.Stock.PREFERENCES, IconSize.DIALOG, null));
-		
+
 		var outer_box = new HBox(false, 10);
 		var inner_box = new VBox(false, 0);
 		var scales = new HBox(false, 0);
-		
+
 		bottom_toolbar = new Toolbar();
 		eq_switch = new Switch();
 		preset_combo = new PresetList(lm, lw);
-		
+
 		eq_switch.set_active(lm.settings.getEqualizerEnabled());
-		
+
 		string[] decibels = {"32", "64", "125", "250", "500", "1k", "2k", "4k", "8k", "16k"};
 
 		for (int index = 0; index < 10; ++index) {
@@ -113,14 +113,14 @@
 			v.inverted = true;
 
 			var label = new Label(decibels[index]);
-			
+
 			holder.pack_start(v, true, true, 0);
 			holder.pack_end(wrap_alignment(label, 4, 0, 0, 0), false, false, 0);
-			
+
 			scales.pack_start(holder, true, true, 6);
 			scale_list.append(v);
 			label_list.append(label);
-			
+
 			v.value_changed.connect( () => {
 				if(apply_changes && initialized && !preset_combo.automatic_chosen) {
 					lm.player.setEqualizerGain(scale_list.index(v), (int)scale_list.nth_data(scale_list.index(v)).get_value());
@@ -146,9 +146,10 @@
 
 		new_preset_entry = new Entry();
 		new_preset_entry.set_size_request(165, -1);
-		var ok_icon = lm.icons.ok_icon.render(IconSize.MENU, null);
-		new_preset_entry.set_icon_from_pixbuf(Gtk.EntryIconPosition.SECONDARY, ok_icon);
-		new_preset_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, "Save this preset");
+
+		var entry_icon = Icons.render_icon ("dialog-apply", IconSize.MENU);
+		new_preset_entry.set_icon_from_pixbuf(Gtk.EntryIconPosition.SECONDARY, entry_icon);
+		new_preset_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, "Save preset");
 
 		new_preset_field = new ToolItem();
 		new_preset_field.add(new_preset_entry);
@@ -170,12 +171,12 @@
 		// Set the egtk bottom toolbar style.
 		bottom_toolbar.get_style_context().add_class("bottom-toolbar");
 
-		inner_box.pack_end(wrap_alignment(bottom_toolbar, 0, 0, 0, 0), false, false, 0);	
+		inner_box.pack_end(wrap_alignment(bottom_toolbar, 0, 0, 0, 0), false, false, 0);
 		inner_box.pack_start(wrap_alignment(scales, 0, 12, 0, 12), true, true, 10);
-		
+
 		outer_box.pack_start(inner_box);
 		add(outer_box);
-		
+
 		eq_switch.notify["active"].connect(on_eq_switch_toggled);
 		preset_combo.automatic_preset_chosen.connect(on_automatic_chosen);
 		preset_combo.add_preset_chosen.connect(add_preset_clicked);
@@ -187,35 +188,35 @@
 
 		close_button.clicked.connect(on_quit);
 		destroy.connect(on_quit);
-		
+
 		show_all();
 	}
-	
+
 	bool on_entry_focus_out () {
 		if (!closing)
 			new_preset_entry.grab_focus();
 		return false;
 	}
-	
+
 	static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
-	
+
 		var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
 		alignment.top_padding = top;
 		alignment.right_padding = right;
 		alignment.bottom_padding = bottom;
 		alignment.left_padding = left;
-		
+
 		alignment.add(widget);
 		return alignment;
 	}
-	
+
 	void set_sliders_sensitivity (bool sensitivity) {
 		foreach (var scale in scale_list) {
 			label_list.nth_data(scale_list.index(scale)).sensitive = sensitivity;
 			scale.sensitive = sensitivity;
-		}	
+		}
 	}
-	
+
 	void on_eq_switch_toggled () {
 		in_transition = false;
 
@@ -242,7 +243,7 @@
 				lm.player.setEqualizerGain(i, 0);
 		}
 	}
-	
+
 	void load_presets () {
 		var default_presets = lm.settings.getDefaultPresets();
 		var custom_presets = lm.settings.getCustomPresets();
@@ -254,7 +255,7 @@
 			preset.is_default = true;
 			preset_combo.addPreset(preset);
 		}
-		
+
 		foreach (EqualizerPreset preset in custom_presets)
 			preset_combo.addPreset(preset);
 
@@ -286,7 +287,7 @@
 
 		set_sliders_sensitivity (true);
 		target_levels.clear();
-		
+
 		foreach (int i in p.gains) {
 			target_levels.add(i);
 		}
@@ -299,25 +300,25 @@
 			Timeout.add(ANIMATION_TIMEOUT, transition_scales);
 		}
 	}
-	
+
 	void set_target_levels () {
 		in_transition = false;
 
 		for (int index = 0; index < 10; ++index)
 			scale_list.nth_data(index).set_value(target_levels.get(index));
 	}
-	
+
 	bool transition_scales () {
 		if (!in_transition)
 			return false;
 
 		bool is_finished = true;
-		
+
 		for (int index = 0; index < 10; ++index) {
 			double currLvl = scale_list.nth_data(index).get_value();
 			double targetLvl = target_levels.get(index);
 			double difference = targetLvl - currLvl;
-			
+
 			if (closing || Math.fabs(difference) <= 1) {
 				scale_list.nth_data(index).set_value(targetLvl);
 				// if switching from the automatic mode, apply the changes correctly
@@ -329,7 +330,7 @@
 				is_finished = false;
 			}
 		}
-		
+
 		if (is_finished) {
 			in_transition = false;
 			return false; // stop
@@ -337,7 +338,7 @@
 
 		return true; // keep going
 	}
-	
+
 	void on_automatic_chosen () {
 		lm.settings.setAutoSwitchPreset (preset_combo.automatic_chosen);
 
@@ -420,14 +421,14 @@
 
 		int i = 0;
 		bool is_valid = false;
-		
+
 		string current_preset_name = (from_current)? preset_combo.getSelectedPreset().name : "";
 		string preset_name = "Custom Preset";
 
 		do
 		{
 			preset_name = (from_current)? current_preset_name + " (" : "";
-			preset_name += "Custom" + ((from_current)? "" : " Preset"); 
+			preset_name += "Custom" + ((from_current)? "" : " Preset");
 			preset_name += (!is_valid && i > 0)? " " + i.to_string() : "";
 			preset_name += (from_current)? ")" : "";
 
@@ -451,8 +452,8 @@
 
 		unichar c;
 		for (int i = 0; preset_name.get_next_char (ref i, out c);)
-		    if (c.isspace())
-		    	++white_space;
+			if (c.isspace())
+				++white_space;
 
 		if (white_space == str_length)
 			return false;
@@ -467,7 +468,7 @@
 				break;
 			}
 		}
-		
+
 		return !preset_already_exists;
 	}
 
@@ -477,17 +478,17 @@
 		pnw.preset_saved.connect(preset_name_window_saved);
 		pnw.action_canceled.connect(select_last_used_preset);
 	}
-	
+
 	void select_last_used_preset () {
 
 		var last_preset = preset_combo.last_selected_preset;
-	
+
 		if(!lm.settings.getAutoSwitchPreset () && last_preset != null)
 			preset_combo.selectPreset(last_preset.name);
 		else
 			preset_combo.selectAutomaticPreset();
 	}
-	
+
 	void preset_name_window_saved (EqualizerPreset p) {
 		preset_combo.addPreset(p);
 	}

=== modified file 'src/Dialogs/SetMusicFolderConfirmation.vala'
--- src/Dialogs/SetMusicFolderConfirmation.vala	2012-01-25 02:40:53 +0000
+++ src/Dialogs/SetMusicFolderConfirmation.vala	2012-01-31 01:07:25 +0000
@@ -121,8 +121,8 @@
 			is_working.hide();
 			is_finished.show();
 			
-			var process_completed_icon = lm.icons.process_completed_icon.render (IconSize.MENU, null);
-			var process_error_icon = lm.icons.process_error_icon.render (IconSize.MENU, null);
+			var process_completed_icon = Icons.PROCESS_COMPLETED_ICON.render (IconSize.MENU);
+			var process_error_icon = Icons.PROCESS_ERROR_ICON.render (IconSize.MENU);
 			
 			is_finished.set_from_pixbuf(success ? process_completed_icon : process_error_icon);
 		}

=== modified file 'src/GStreamer/Streamer.vala'
--- src/GStreamer/Streamer.vala	2012-01-28 00:17:25 +0000
+++ src/GStreamer/Streamer.vala	2012-01-31 01:07:25 +0000
@@ -175,9 +175,7 @@
 					if(pipe.videoStreamCount() > 0) {
 						if(lw.viewSelector.get_children().length() != 4) {
 							//stdout.printf("turning on video\n");
-							var viewSelectorStyle = lw.viewSelector.get_style_context ();
-							var view_video_icon = lm.icons.view_video_icon.render (Gtk.IconSize.MENU, viewSelectorStyle);
-							lw.viewSelector.append(new Gtk.Image.from_pixbuf(view_video_icon));
+							lw.viewSelector.append(Icons.VIEW_VIDEO_ICON.render_image (Gtk.IconSize.MENU));
 							lw.viewSelector.selected = 3;
 						}
 					}

=== added file 'src/Icons.vala'
--- src/Icons.vala	1970-01-01 00:00:00 +0000
+++ src/Icons.vala	2012-01-31 01:07:25 +0000
@@ -0,0 +1,203 @@
+/*-
+ * Copyright (c) 2011		Scott Ringwelski <[e-mail]>
+ *
+ * Originally Written by Scott Ringwelski and Victor Eduardo for
+ * BeatBox Music Player: http://www.launchpad.net/beat-box
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * Here we store the icon information, Gdk.Pixbuf-related functions and even
+ * preloaded pixbufs.
+ */
+
+namespace Icons {
+
+	public enum Type {
+		MIMETYPE,
+		ACTION,
+		STATUS,
+		APP
+	}
+
+	public enum FileType {
+		SVG,
+		PNG
+	}
+
+	public const string MIMETYPES_FOLDER = "mimetypes";
+	public const string ACTIONS_FOLDER = "actions";
+	public const string STATUS_FOLDER = "status";
+	public const string APPS_FOLDER = "apps";
+
+	public const string PNG_EXT = ".png";
+	public const string SVG_EXT = ".svg";
+
+	/**
+	 * Size of the cover art used in the album view
+	 **/
+	public const int ALBUM_VIEW_IMAGE_SIZE = 128;
+
+	/**
+	 * ICON INFORMATION
+	 * Use render() or render_image() to load these icons
+	**/
+
+	// 128 x 128
+	public BeatBox.Icon DEFAULT_ALBUM_ART;
+	public BeatBox.Icon DROP_ALBUM;
+	public BeatBox.Icon MUSIC_FOLDER;
+
+	// 22 x 22
+	public BeatBox.Icon HISTORY_ICON;
+
+	// 16 x 16
+	public BeatBox.Icon BEATBOX_ICON;
+	public BeatBox.Icon RADIO_ICON;
+	public BeatBox.Icon MUSIC_ICON;
+	public BeatBox.Icon PODCAST_ICON;
+	public BeatBox.Icon AUDIOBOOK_ICON;
+	public BeatBox.Icon AUDIO_CD_ICON;
+	public BeatBox.Icon PLAYLIST_ICON;
+	public BeatBox.Icon SMART_PLAYLIST_ICON;
+	public BeatBox.Icon LASTFM_LOVE_ICON;
+	public BeatBox.Icon LASTFM_BAN_ICON;
+	public BeatBox.Icon STARRED_ICON;
+	public BeatBox.Icon NOT_STARRED_ICON;
+	public BeatBox.Icon INFO_ICON;
+	public BeatBox.Icon NEW_PODCAST_ICON;
+
+	// SYMBOLIC ICONS
+	public BeatBox.Icon MEDIA_PLAY_SYMBOLIC;
+	public BeatBox.Icon MEDIA_PAUSE_SYMBOLIC;
+	public BeatBox.Icon STARRED_SYMBOLIC_ICON;
+	public BeatBox.Icon NOT_STARRED_SYMBOLIC_ICON;
+	public BeatBox.Icon PROCESS_COMPLETED_ICON;
+	public BeatBox.Icon PROCESS_ERROR_ICON;
+	public BeatBox.Icon PROCESS_STOP_ICON;
+	public BeatBox.Icon SHUFFLE_ON_ICON;
+	public BeatBox.Icon SHUFFLE_OFF_ICON;
+	public BeatBox.Icon REPEAT_ON_ICON;
+	public BeatBox.Icon REPEAT_ONCE_ICON;
+	public BeatBox.Icon REPEAT_OFF_ICON;
+	public BeatBox.Icon VIEW_COLUMN_ICON;
+	public BeatBox.Icon VIEW_DETAILS_ICON;
+	public BeatBox.Icon VIEW_ICONS_ICON;
+	public BeatBox.Icon VIEW_VIDEO_ICON;
+
+	/**
+	 * RENDERED ICONS.
+	 * These are pre-rendered pixbufs. Any static image which otherwise would need
+	 * to be rendered many times should be a preloaded pixbuf. They are loaded
+	 * in the load() function.
+	 */
+	public Gdk.Pixbuf DROP_ALBUM_PIXBUF;
+	public Gdk.Pixbuf DEFAULT_ALBUM_ART_PIXBUF;
+	public Gdk.Pixbuf BEATBOX_DIALOG_PIXBUF; // Used in the notifications from LibraryWindow.vala
+
+	/**
+	 * These methods are useful for rendering non-loaded icons (Stock icons, etc.)
+	 **/
+	public Gdk.Pixbuf? render_icon (string icon_name, Gtk.IconSize size, Gtk.StyleContext? context = null) {
+		var icon = new BeatBox.Icon (icon_name, null, null, null, false);
+		return icon.render (size, context);
+	}
+
+	public Gtk.Image? render_image (string icon_name, Gtk.IconSize size) {
+		var icon = new BeatBox.Icon (icon_name, null, null, null, false);
+		return icon.render_image (size);
+	}
+
+	/**
+	 * @param surface_size the size of the new pixbuf. Set a value of 0 to use the pixbuf's natural size.
+	 **/
+	public Gdk.Pixbuf get_pixbuf_shadow (Gdk.Pixbuf pixbuf, int surface_size = ALBUM_VIEW_IMAGE_SIZE,
+	                                      int shadow_size = 5, double alpha = 0.8) {
+		int S_WIDTH = (surface_size > 0)? surface_size : pixbuf.width;
+		int S_HEIGHT = (surface_size > 0)? surface_size : pixbuf.height;
+
+		var buffer_surface = new Granite.Drawing.BufferSurface(S_WIDTH, S_HEIGHT);
+
+		S_WIDTH -= 2 * shadow_size;
+		S_HEIGHT -= 2 * shadow_size;
+
+		buffer_surface.context.rectangle (shadow_size, shadow_size, S_WIDTH, S_HEIGHT);
+		buffer_surface.context.set_source_rgba (0, 0, 0, alpha);
+		buffer_surface.context.fill();
+		buffer_surface.fast_blur(2, 3);
+		Gdk.cairo_set_source_pixbuf(buffer_surface.context, pixbuf.scale_simple (S_WIDTH, S_HEIGHT, Gdk.InterpType.BILINEAR), shadow_size, shadow_size);
+		buffer_surface.context.paint();
+
+		return buffer_surface.load_to_pixbuf();
+	}
+
+	/**
+	 * Loads icon information and renders [preloaded] pixbufs
+	 **/
+	public void load () {
+
+		// 128 x 128
+		DEFAULT_ALBUM_ART = new BeatBox.Icon ("media-audio", 128, Type.MIMETYPE, FileType.PNG, true);
+		DROP_ALBUM = new BeatBox.Icon ("drop-album", 128, Type.MIMETYPE, null, true);
+		MUSIC_FOLDER = new BeatBox.Icon ("folder-music", 128, Type.MIMETYPE, null, true);
+
+		HISTORY_ICON = new BeatBox.Icon ("document-open-recent", 22, Type.ACTION, null, true);
+
+		// 16 x 16
+		BEATBOX_ICON = new BeatBox.Icon ("beatbox", 16, Type.APP, null, true);
+		RADIO_ICON = new BeatBox.Icon ("internet-radio", 16, Type.MIMETYPE, null, true);
+		MUSIC_ICON = new BeatBox.Icon ("library-music", 16, Type.MIMETYPE, null, true);
+		PODCAST_ICON = new BeatBox.Icon ("library-podcast", 16, Type.MIMETYPE, null, true);
+		AUDIOBOOK_ICON = new BeatBox.Icon ("library-audiobook", 16, Type.MIMETYPE, null, true);
+		AUDIO_CD_ICON = new BeatBox.Icon ("media-cdrom-audio", 16, Type.MIMETYPE, null, true);
+		PLAYLIST_ICON = new BeatBox.Icon ("playlist", 16, Type.MIMETYPE, null, true);
+		SMART_PLAYLIST_ICON = new BeatBox.Icon ("playlist-automatic", 16, Type.MIMETYPE, null, true);
+		LASTFM_LOVE_ICON = new BeatBox.Icon ("lastfm-love", 16, Type.ACTION, null, true);
+		LASTFM_BAN_ICON = new BeatBox.Icon ("lastfm-ban", 16, Type.ACTION, null, true);
+		STARRED_ICON = new BeatBox.Icon ("starred", 16, Type.STATUS, null, true);
+		NOT_STARRED_ICON = new BeatBox.Icon ("not-starred", 16, Type.STATUS, null, true);
+		INFO_ICON = new BeatBox.Icon ("help-info", 16, Type.STATUS, null, true);
+		NEW_PODCAST_ICON = new BeatBox.Icon ("podcast-new", 16, Type.STATUS, null, true);
+
+		// SYMBOLIC ICONS
+
+		MEDIA_PLAY_SYMBOLIC = new BeatBox.Icon ("media-playback-start-symbolic", 16, Type.ACTION, null, true);
+		MEDIA_PAUSE_SYMBOLIC = new BeatBox.Icon ("media-playback-pause-symbolic", 16, Type.ACTION, null, true);
+
+		STARRED_SYMBOLIC_ICON = new BeatBox.Icon ("starred-symbolic", 16, Type.STATUS, null, true);
+		NOT_STARRED_SYMBOLIC_ICON = new BeatBox.Icon ("non-starred-symbolic", 16, Type.STATUS, null, true);
+		PROCESS_COMPLETED_ICON = new BeatBox.Icon ("process-completed-symbolic", 16, Type.STATUS, null, true);
+		PROCESS_ERROR_ICON = new BeatBox.Icon ("process-error-symbolic", 16, Type.STATUS, null, true);
+		PROCESS_STOP_ICON = new BeatBox.Icon ("process-stop-symbolic", 16, Type.ACTION, null, true);
+		SHUFFLE_ON_ICON = new BeatBox.Icon ("media-playlist-shuffle-symbolic", 16, Type.STATUS, null, true);
+		SHUFFLE_OFF_ICON = new BeatBox.Icon ("media-playlist-no-shuffle-symbolic", 16, Type.STATUS, null, true);
+		REPEAT_ON_ICON = new BeatBox.Icon ("media-playlist-repeat-symbolic", 16, Type.STATUS, null, true);
+		REPEAT_ONCE_ICON = new BeatBox.Icon ("media-playlist-repeat-one-symbolic", 16, Type.STATUS, null, true);
+		REPEAT_OFF_ICON = new BeatBox.Icon ("media-playlist-no-repeat-symbolic", 16, Type.STATUS, null, true);
+		VIEW_COLUMN_ICON = new BeatBox.Icon ("view-list-column-symbolic", 16, Type.ACTION, null, true);
+		VIEW_DETAILS_ICON =new BeatBox.Icon ("view-list-details-symbolic", 16, Type.ACTION, null, true);
+		VIEW_ICONS_ICON = new BeatBox.Icon ("view-list-icons-symbolic", 16, Type.ACTION, null, true);
+		VIEW_VIDEO_ICON = new BeatBox.Icon ("view-list-video-symbolic", 16, Type.ACTION, null, true);
+
+		/* Render Pixbufs */
+		DROP_ALBUM_PIXBUF = DROP_ALBUM.render (null, null, 250);
+		DEFAULT_ALBUM_ART_PIXBUF = DEFAULT_ALBUM_ART.render (null, null, 150);
+
+		BEATBOX_DIALOG_PIXBUF = BEATBOX_ICON.render (Gtk.IconSize.DIALOG);
+	}
+}
+

=== modified file 'src/LibraryManager.vala'
--- src/LibraryManager.vala	2012-01-28 19:50:35 +0000
+++ src/LibraryManager.vala	2012-01-31 01:07:25 +0000
@@ -36,7 +36,6 @@
 	public BeatBox.Streamer player;
 	public BeatBox.DeviceManager dm;
 	public BeatBox.PodcastManager pm;
-	public BeatBox.Icons icons;
 	
 	private HashMap<int, SmartPlaylist> _smart_playlists; // rowid, smart playlist
 	public HashMap<int, Playlist> _playlists; // rowid, playlist of all playlists
@@ -57,7 +56,6 @@
 	private LinkedList<int> _already_played; // Media of already played
 	private HashMap<string, Gdk.Pixbuf> _album_art; // All album art
 	private HashMap<string, Gdk.Pixbuf> _cover_album_art; // All album art
-    const int shadow_size = 5;
 	
 	public LastFM.Core lfm;
 	private HashMap<string, LastFM.ArtistInfo> _artists;//key:artist
@@ -153,9 +151,6 @@
 		_album_art = new HashMap<string, Gdk.Pixbuf>();
 		_cover_album_art = new HashMap<string, Gdk.Pixbuf>();
 		
-		icons = new Icons(this, lw);
-		icons.load_icons();
-		
 		lfm = new LastFM.Core(this);
 		_artists = new HashMap<string, LastFM.ArtistInfo>();
 		_albums = new HashMap<string, LastFM.AlbumInfo>();
@@ -286,20 +281,6 @@
 		}
 	}
 
-    public Gdk.Pixbuf get_cover_shadow(Gdk.Pixbuf pixbuf) {
-        var buffer_surface = new Granite.Drawing.BufferSurface(128, 128);
-        
-        buffer_surface.context.rectangle(shadow_size, shadow_size, 128 - 2*shadow_size, 128-2*shadow_size);
-        buffer_surface.context.set_source_rgba(0,0,0,0.8);
-        buffer_surface.context.fill();
-        buffer_surface.fast_blur(2, 3);
-        Gdk.cairo_set_source_pixbuf(buffer_surface.context, pixbuf.scale_simple(128-2*shadow_size, 128-2*shadow_size, Gdk.InterpType.BILINEAR), shadow_size, shadow_size);
-        buffer_surface.context.paint();
-        var pix = buffer_surface.load_to_pixbuf();
-        
-        return pix;
-    }
-	
 	/************ Library/Collection management stuff ************/
 	public virtual void dbProgress(string? message, double progress) {
 		progress_notification(message, progress);
@@ -1365,7 +1346,7 @@
 		
 		// check that the file exists
 		if((settings.getMusicFolder() != "" && File.new_for_uri(m.uri).get_path().has_prefix(settings.getMusicFolder()) && !GLib.File.new_for_uri(m.uri).query_exists())) {
-			m.unique_status_image = icons.process_error_icon.render(IconSize.MENU, ((ViewWrapper)lw.sideTree.getWidget(lw.sideTree.library_music_iter)).list.get_style_context());
+			m.unique_status_image = Icons.PROCESS_ERROR_ICON.render(IconSize.MENU, ((ViewWrapper)lw.sideTree.getWidget(lw.sideTree.library_music_iter)).list.get_style_context());
 			m.location_unknown = true;
 			lw.media_not_found(id);
 			stopPlayback();
@@ -1653,7 +1634,7 @@
 						_album_art.set(s.artist+s.album, pix);
 						
                         if(!_cover_album_art.has_key(s.artist + s.album))
-							_cover_album_art.set(s.artist+s.album, get_cover_shadow(pix));
+							_cover_album_art.set(s.artist+s.album, Icons.get_pixbuf_shadow(pix));
 					}
 						
 					previousAlbum = s.album;
@@ -1721,11 +1702,11 @@
 		if(s == null)
 			return null;
 		
-		return _cover_album_art.get(s.artist+s.album);
+		return _cover_album_art.get(s.artist + s.album);
 	}
 	
 	public Gdk.Pixbuf? get_cover_album_art_from_key(string album_artist, string album) {
-		return _cover_album_art.get(album_artist+album);
+		return _cover_album_art.get(album_artist + album);
 	}
 	
 	public void set_album_art(int id, Gdk.Pixbuf pix) {
@@ -1734,8 +1715,8 @@
 		
 		Media s = media_from_id(id);
 		
-		_album_art.set(s.artist+s.album, pix);
-        _cover_album_art.set(s.artist+s.album, get_cover_shadow(pix));
+		_album_art.set(s.artist + s.album, pix);
+        _cover_album_art.set(s.artist + s.album, Icons.get_pixbuf_shadow(pix));
 	}
 	
 	/* Device Preferences */
@@ -1803,3 +1784,4 @@
 		}
 	}
 }
+

=== modified file 'src/LibraryWindow.vala'
--- src/LibraryWindow.vala	2012-01-28 05:21:55 +0000
+++ src/LibraryWindow.vala	2012-01-31 01:07:25 +0000
@@ -26,12 +26,12 @@
 
 public class BeatBox.LibraryWindow : Gtk.Window {
 	public static Granite.Application app { get; private set; }
-	
+
 	public BeatBox.LibraryManager lm;
 	BeatBox.Settings settings;
 	LastFM.SimilarMedias similarMedias;
 	BeatBox.MediaKeyListener mkl;
-	
+
 	HashMap<int, Device> welcome_screen_keys;
 	bool queriedlastfm; // whether or not we have queried last fm for the current media info
 	bool media_considered_played; //whether or not we have updated last played and added to already played list
@@ -40,13 +40,13 @@
 	bool scrobbled_track;
 	LinkedList<string> timeout_search;//stops from doing useless search
 	string last_search;//stops from searching same thing multiple times
-	
+
 	public bool dragging_from_music;
 	public bool millerVisible;
 	bool askToSetFolder;
-	
+
 	public bool initializationFinished;
-	
+
 	VBox verticalBox;
 	public VBox mainViews;
 	public MillerColumns miller;
@@ -76,10 +76,10 @@
 	SimpleOptionChooser shuffleChooser;
 	SimpleOptionChooser repeatChooser;
 	SimpleOptionChooser infoPanelChooser;
-	
+
 	// we use one album list view popup for the whole app
 	public AlbumListView alv;
-	
+
 	// basic file stuff
 	ImageMenuItem libraryOperations;
 	Gtk.Menu libraryOperationsMenu;
@@ -88,30 +88,30 @@
 	Gtk.MenuItem fileRescanMusicFolder;
 	Gtk.MenuItem editEqualizer;
 	ImageMenuItem editPreferences;
-	
+
 	// Base color
 	public static Gdk.RGBA base_color;
 
     Gtk.Menu settingsMenu;
-	
+
 	public Notify.Notification notification;
-	
+
 	public signal void playPauseChanged();
-	
+
 	public LibraryWindow(Granite.Application app, string[] args) {
 		this.app = app;
 		settings = new BeatBox.Settings();
-		
+
 		//this is used by many objects, is the media backend
 		lm = new BeatBox.LibraryManager(settings, this, args);
-		
+
 		//various objects
 		welcome_screen_keys = new HashMap<int, Device>();
 		similarMedias = new LastFM.SimilarMedias(lm);
 		timeout_search = new LinkedList<string>();
 		mkl = new MediaKeyListener(lm, this);
 		last_search = "";
-		
+
 #if HAVE_INDICATE
 #if HAVE_DBUSMENU
 		stdout.printf("Initializing MPRIS and sound menu\n");
@@ -119,10 +119,10 @@
 		mpris.initialize();
 #endif
 #endif
-		
+
 		dragging_from_music = false;
 		askToSetFolder = false;
-		
+
 		this.lm.player.end_of_stream.connect(end_of_stream);
 		this.lm.player.current_position_update.connect(current_position_update);
 		//this.lm.player.media_not_found.connect(media_not_found);
@@ -139,19 +139,19 @@
 		this.lm.dm.device_added.connect(device_added);
 		this.lm.dm.device_removed.connect(device_removed);
 		this.similarMedias.similar_retrieved.connect(similarRetrieved);
-		
+
 		destroy.connect (on_quit);
 		check_resize.connect(on_resize);
 		this.destroy.connect (Gtk.main_quit);
-		
+
 		if(lm.media_count() == 0 && settings.getMusicFolder() == "") {
 			stdout.printf("First run.\n");
-			
+
 		}
 		else {
 			lm.clearCurrent();
 			//((MusicTreeView)sideTree.getWidget(sideTree.library_music_iter)).set_as_current_list("0");
-			
+
 			// make sure we don't re-count stats
 			if((int)settings.getLastMediaPosition() > 5)
 				queriedlastfm = true;
@@ -159,19 +159,22 @@
 				media_considered_played = true;
 			if(lm.media_info.media != null && (double)((int)settings.getLastMediaPosition()/(double)lm.media_info.media.length) > 0.90)
 				added_to_play_count = true;
-			
+
 			// rescan on startup
 			/*lm.rescan_music_folder();*/
 		}
-		
+
 		/*if(!File.new_for_path(settings.getMusicFolder()).query_exists() && settings.getMusicFolder() != "") {
 			doAlert("Music folder not mounted", "Your music folder is not mounted. Please mount your music folder before using BeatBox.");
 		}*/
 	}
-	
+
 	public void build_ui() {
 		// simple message to terminal
-		stdout.printf("Building user interface\n");
+		stdout.printf ("Building user interface\n");
+
+		// Load icon information
+		Icons.load ();
 
 		// Setup base color
 		var unused_icon_view = new IconView();
@@ -179,22 +182,22 @@
 		base_style.add_class (Gtk.STYLE_CLASS_VIEW);
 		base_color = base_style.get_background_color(StateFlags.NORMAL);
 		unused_icon_view.destroy();
-		
+
 		// set the size based on saved gconf settings
 		set_default_size(settings.getWindowWidth(), settings.getWindowHeight());
 		resize(settings.getWindowWidth(), settings.getWindowHeight());
-		
+
 		// set window min/max
 		Gdk.Geometry geo = Gdk.Geometry();
 		geo.min_width = 700;
 		geo.min_height = 400;
 		set_geometry_hints(this, geo, Gdk.WindowHints.MIN_SIZE);
-		
+
 		// set the title
 		set_title("BeatBox");
-		
+
 		// set the icon
-		set_icon(lm.icons.beatbox_icon.render (IconSize.MENU, null));
+		set_icon(Icons.BEATBOX_ICON.render (IconSize.MENU, null));
 
 		/* Initialize all components */
 		verticalBox = new VBox(false, 0);
@@ -206,9 +209,9 @@
 		videoArea = new DrawingArea();
 		welcomeScreen = new Welcome(_("Get Some Tunes"), _("BeatBox can't seem to find your music."));
 
-		sideTree = new SideTreeView(lm, this);	
+		sideTree = new SideTreeView(lm, this);
 		sideTreeScroll = new ScrolledWindow(null, null);
-		coverArt = new CoverArtImage(lm, this);	
+		coverArt = new CoverArtImage(lm, this);
 		libraryOperations = new ImageMenuItem.from_stock("library-music", null);
 		libraryOperationsMenu = new Gtk.Menu();
 		fileSetMusicFolder = new Gtk.MenuItem.with_label(_("Set Music Folder"));
@@ -233,101 +236,102 @@
 		statusBar = new HBox(false, 0);
 		statusBarLabel = new Label("");
 		alv = new AlbumListView(lm);
-		
-		var statusBarStyle = statusBar.get_style_context ();
-
-		var shuffle_on_icon = lm.icons.shuffle_on_icon.render (IconSize.MENU, statusBarStyle);
-		var shuffle_off_icon = lm.icons.shuffle_off_icon.render (IconSize.MENU, statusBarStyle);
-		var repeat_on_icon = lm.icons.repeat_on_icon.render (IconSize.MENU, statusBarStyle);
-		var repeat_off_icon = lm.icons.repeat_off_icon.render (IconSize.MENU, statusBarStyle);
-
-		shuffleChooser = new SimpleOptionChooser(shuffle_on_icon, shuffle_off_icon);
-		repeatChooser = new SimpleOptionChooser(repeat_on_icon, repeat_off_icon);
-		infoPanelChooser = new SimpleOptionChooser(lm.icons.info_icon.render(IconSize.MENU, null), lm.icons.info_icon.render(IconSize.MENU, null));
-		
+
+		var shuffle_on_image = Icons.SHUFFLE_ON_ICON.render_image (IconSize.MENU);
+		var shuffle_off_image = Icons.SHUFFLE_OFF_ICON.render_image (IconSize.MENU);
+		var repeat_on_image = Icons.REPEAT_ON_ICON.render_image (IconSize.MENU);
+		var repeat_off_image = Icons.REPEAT_OFF_ICON.render_image (IconSize.MENU);
+        var info_image = Icons.INFO_ICON.render_image (IconSize.MENU);
+
+		shuffleChooser = new SimpleOptionChooser.from_image (shuffle_on_image, shuffle_off_image);
+		repeatChooser = new SimpleOptionChooser.from_image (repeat_on_image, repeat_off_image);
+		infoPanelChooser = new SimpleOptionChooser.from_image (info_image, info_image);
+
 		notification = (Notify.Notification)GLib.Object.new (
 						typeof (Notify.Notification),
 						"summary", _("Title"),
 						"body", "%s\n%s".printf(_("Artist"), _("Album")));
-		
+
 		/* Set properties of various controls */
 		//sideBar.set_size_request(200, -1);
 		sourcesToMedias.set_position(settings.getSidebarWidth());
 		mediasToInfo.set_position((lm.settings.getWindowWidth() - lm.settings.getSidebarWidth()) - lm.settings.getMoreWidth());
-		
+
 		//for setting maximum size for setting hpane position max size
 		//sideBar.set_geometry_hints(
-		
-		stdout.printf("building side tree\n");
+
+		stdout.printf ("building side tree\n");
 		buildSideTree();
-		stdout.printf("done with side tree\n");
-		
+		stdout.printf ("done with side tree\n");
+
 		sideTreeScroll = new ScrolledWindow(null, null);
 		sideTreeScroll.set_policy (PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
 		sideTreeScroll.add(sideTree);
-		
+
 		var coverArtScroll = new ScrolledWindow(null, null);
 		coverArtScroll.set_policy (PolicyType.AUTOMATIC, PolicyType.NEVER);
 		coverArtScroll.add_with_viewport(coverArt);
-		
+
 		millerPane.set_position(settings.getMillerHeight());
-		
+
 		updateSensitivities();
-		
+
 		/* create appmenu menu */
 		libraryOperationsMenu.append(fileSetMusicFolder);
 		libraryOperationsMenu.append(fileImportMusic);
 		libraryOperationsMenu.append(fileRescanMusicFolder);
 		libraryOperations.submenu = libraryOperationsMenu;
 		libraryOperations.set_label(_("Library"));
-		
+
 		settingsMenu.append(libraryOperations);
 		settingsMenu.append(new SeparatorMenuItem());
 		settingsMenu.append(editEqualizer);
 		settingsMenu.append(editPreferences);
-		
+
 		fileSetMusicFolder.activate.connect(editPreferencesClick);
 		fileImportMusic.activate.connect(fileImportMusicClick);
 		fileRescanMusicFolder.activate.connect(fileRescanMusicFolderClick);
-		
+
 		editPreferences.set_label(_("Preferences"));
-		
+
 		editEqualizer.activate.connect(editEqualizerClick);
 		editPreferences.activate.connect(editPreferencesClick);
-		
+
 		EventBox statusEventBox = new EventBox();
 		statusEventBox.add(statusBar);
-		
+
 		// paint the background
 		statusEventBox.override_background_color (StateFlags.NORMAL, base_color);
-		
+
 		repeatChooser.appendItem(_("Off"));
 		repeatChooser.appendItem(_("Song"));
 		repeatChooser.appendItem(_("Album"));
 		repeatChooser.appendItem(_("Artist"));
 		repeatChooser.appendItem(_("All"));
-		
+
 		shuffleChooser.appendItem(_("Off"));
 		shuffleChooser.appendItem(_("All"));
-		
+
 		infoPanelChooser.appendItem(_("Hide"));
 		infoPanelChooser.appendItem(_("Show"));
-		
+
 		repeatChooser.setOption(settings.getRepeatMode());
 		shuffleChooser.setOption(settings.getShuffleMode());
 		infoPanelChooser.setOption(settings.getMoreVisible() ? 1 : 0);
-		
+
 		/* Add controls to the GUI */
 		add(verticalBox);
 		verticalBox.pack_start(topControls, false, true, 0);
 		verticalBox.pack_start(videoArea, true, true, 0);
 		verticalBox.pack_start(sourcesToMedias, true, true, 0);
 
-		// Ugly workaround to make the view-mode button smaller
+		// FIXME: Ugly workaround to make the view-mode button smaller
 		var viewSelectorContainer = new Box (Orientation.VERTICAL, 0);
 		var viewSelectorInnerContainer = new Box (Orientation.HORIZONTAL, 0);
 		viewSelectorInnerContainer.pack_start (new Box (Orientation.HORIZONTAL, 10), true, true, 0);
-		viewSelectorInnerContainer.pack_start (viewSelector, false, false, 0);
+
+		viewSelectorInnerContainer.pack_start (viewSelector, false, false, 0); // VIEW SELECTOR
+
 		viewSelectorInnerContainer.pack_end (new Box (Orientation.HORIZONTAL, 10), true, true, 0);
 		viewSelectorContainer.pack_start (new Box (Orientation.VERTICAL, 5), true, true, 0);
 		viewSelectorContainer.pack_start (viewSelectorInnerContainer, false, false, 0);
@@ -345,21 +349,14 @@
 		topDisplayBin.set_expand(true);
 
 		// Set theming
-		//viewSelector.get_style_context().add_class("raised");
-		topControls.get_style_context().add_class("primary-toolbar");		
+		topControls.get_style_context().add_class("primary-toolbar");
 		sourcesToMedias.get_style_context().add_class("sidebar-pane-separator");
-		sideTree.get_style_context().add_class("sidebar");		
-
-		var viewSelectorStyle = topControls.get_style_context ();
-
-		var view_column_icon = lm.icons.view_column_icon.render (IconSize.MENU, viewSelectorStyle);
-		var view_details_icon = lm.icons.view_details_icon.render (IconSize.MENU, viewSelectorStyle);
-		var view_icons_icon = lm.icons.view_icons_icon.render (IconSize.MENU, viewSelectorStyle);
-
-		viewSelector.append(new Image.from_pixbuf(view_icons_icon));
-		viewSelector.append(new Image.from_pixbuf(view_details_icon));
-		viewSelector.append(new Image.from_pixbuf(view_column_icon));
-		
+		sideTree.get_style_context().add_class("sidebar");
+
+		viewSelector.append(Icons.VIEW_ICONS_ICON.render_image (IconSize.MENU));
+		viewSelector.append(Icons.VIEW_DETAILS_ICON.render_image (IconSize.MENU));
+		viewSelector.append(Icons.VIEW_COLUMN_ICON.render_image (IconSize.MENU));
+
 		topControls.insert(previousButton, 0);
 		topControls.insert(playButton, 1);
 		topControls.insert(nextButton, 2);
@@ -367,39 +364,39 @@
 		topControls.insert(topDisplayBin, 4);
 		topControls.insert(searchFieldBin, 5);
 		topControls.insert(app.create_appmenu(settingsMenu), 6);
-		
+
 		// for consistency
 		topControls.set_size_request(-1, 45);
 
 		contentBox.pack_start(welcomeScreen, true, true, 0);
-		
-		var music_folder_icon = lm.icons.music_folder.render (IconSize.DIALOG, null);
+
+		var music_folder_icon = Icons.MUSIC_FOLDER.render (IconSize.DIALOG, null);
 		welcomeScreen.append_with_pixbuf(music_folder_icon, _("Locate"), _("Change your music folder."));
-		
+
 		millerPane.pack1(miller, false, true);
 		millerPane.pack2(mainViews, true, true);
-		
+
 		contentBox.pack_start(millerPane, true, true, 0);
 
 		contentBox.pack_start(statusEventBox, false, true, 0);
-		
+
 		mediasToInfo.pack1(contentBox, true, true);
 		mediasToInfo.pack2(infoPanel, false, false);
-		
+
 		sourcesToMedias.pack1(sideBar, false, true);
 		sourcesToMedias.pack2(mediasToInfo, true, true);
-		
+
 		sideBar.pack_start(sideTreeScroll, true, true, 0);
 		sideBar.pack_end(coverArtScroll, false, true, 0);
-		
+
 		statusBar.pack_start(shuffleChooser, false, false, 2);
 		statusBar.pack_start(repeatChooser, false, false, 2);
 		statusBar.pack_start(statusBarLabel, true, true, 0);
 		statusBar.pack_start(wrap_alignment(infoPanelChooser, 0, 10, 0, 0), false, false, 2);
-		
+
 		// add mounts to side tree view
 		lm.dm.loadPreExistingMounts();
-		
+
 		/* Connect events to functions */
 		sourcesToMedias.get_child1().size_allocate.connect(sourcesToMediasHandleSet);
 		welcomeScreen.activated.connect(welcomeScreenActivated);
@@ -416,19 +413,19 @@
 		miller.changed.connect(millerChanged);
 		searchField.changed.connect(searchFieldChanged);
 		searchField.activate.connect(searchFieldActivate);
-		
+
 		/* set up drag dest stuff */
 		drag_dest_set(this, DestDefaults.ALL, {}, Gdk.DragAction.MOVE);
 		Gtk.drag_dest_add_uri_targets(this);
 		drag_data_received.connect(dragReceived);
-		
+
 		viewSelector.selected = settings.getViewMode();
-		
+
 		bool genreV, artistV, albumV;
 		lm.settings.getMillerVisibilities(out genreV, out artistV, out albumV);
 		miller.updateColumnVisibilities(genreV, artistV, albumV);
-		stdout.printf("User interface has been built\n");
-		
+		stdout.printf ("User interface has been built\n");
+
 		int i = settings.getLastMediaPlaying();
 		if(i != 0 && lm.media_from_id(i) != null && File.new_for_uri(lm.media_from_id(i).uri).query_exists()) {
 			lm.media_from_id(i).resume_pos;
@@ -438,113 +435,112 @@
 			// don't show info panel if nothing playing
 			infoPanel.set_visible(false);
 		}
-		
+
 		initializationFinished = true;
-		
+
 		sideTree.resetView();
 		var vw = (ViewWrapper)sideTree.getSelectedWidget();
 		if(lm.media_info.media != null) {
 			vw.list.set_as_current_list(0, true);
-			stdout.printf("set a view as current list\n");
+			stdout.printf ("set a view as current list\n");
 			if(settings.getShuffleMode() == LibraryManager.Shuffle.ALL) {
 				lm.setShuffleMode(LibraryManager.Shuffle.ALL, true);
 			}
 		}
-		
+
 		searchField.set_text(lm.settings.getSearchString());
 		//vw.doUpdate(vw.currentView, vw.get_media_ids(), false, true, false);
-		
+
 		show_all();
 		resize(settings.getWindowWidth(), this.default_height);
-		
+
 		updateSensitivities();
-		
+
 		if(lm.song_ids().size == 0)
 			setMusicFolder(Environment.get_user_special_dir(UserDirectory.MUSIC));
 	}
-	
+
 	public static Gtk.Alignment wrap_alignment (Gtk.Widget widget, int top, int right, int bottom, int left) {
 		var alignment = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 1.0f);
 		alignment.top_padding = top;
 		alignment.right_padding = right;
 		alignment.bottom_padding = bottom;
 		alignment.left_padding = left;
-		
+
 		alignment.add(widget);
 		return alignment;
 	}
-	
+
 	/** Builds the side tree on TreeView view
-	 * @param view The side tree to build it on
+	 * @param view The side tree to build it on : TODO
 	 */
 	private void buildSideTree() {
 		ViewWrapper vw;
-		
+
 		sideTree.addBasicItems();
-		
+
 		vw = new ViewWrapper(lm, this, new LinkedList<int>(), lm.similar_setup.sort_column, lm.similar_setup.sort_direction, ViewWrapper.Hint.SIMILAR, -1);
 		sideTree.addSideItem(sideTree.playlists_iter, null, vw, _("Similar"), ViewWrapper.Hint.SIMILAR);
 		mainViews.pack_start(vw, true, true, 0);
-		
+
 		vw = new ViewWrapper(lm, this, lm.queue(), lm.queue_setup.sort_column, lm.queue_setup.sort_direction, ViewWrapper.Hint.QUEUE, -1);
 		sideTree.addSideItem(sideTree.playlists_iter, null, vw, _("Queue"), ViewWrapper.Hint.QUEUE);
 		mainViews.pack_start(vw, true, true, 0);
-		
+
 		vw = new ViewWrapper(lm, this, lm.already_played(), lm.history_setup.sort_column, lm.history_setup.sort_direction, ViewWrapper.Hint.HISTORY, -1);
 		sideTree.addSideItem(sideTree.playlists_iter, null, vw, _("History"), ViewWrapper.Hint.HISTORY);
 		mainViews.pack_start(vw, true, true, 0);
-		
+
 		vw = new ViewWrapper(lm, this, lm.media_ids(), lm.music_setup.sort_column, lm.music_setup.sort_direction, ViewWrapper.Hint.MUSIC, -1);
 		sideTree.addSideItem(sideTree.library_iter, null, vw, _("Music"), ViewWrapper.Hint.MUSIC);
 		mainViews.pack_start(vw, true, true, 0);
-		
+
 		vw = new ViewWrapper(lm, this, lm.podcast_ids(), lm.podcast_setup.sort_column, lm.podcast_setup.sort_direction, ViewWrapper.Hint.PODCAST, -1);
 		sideTree.addSideItem(sideTree.library_iter, null, vw, _("Podcasts"), ViewWrapper.Hint.PODCAST);
 		mainViews.pack_start(vw, true, true, 0);
-		
+
 		vw = new ViewWrapper(lm, this, lm.station_ids(), lm.station_setup.sort_column, lm.station_setup.sort_direction, ViewWrapper.Hint.STATION, -1);
 		sideTree.addSideItem(sideTree.network_iter, null, vw, _("Internet Radio"), ViewWrapper.Hint.STATION);
 		mainViews.pack_start(vw, true, true, 0);
-		
+
 		if(BeatBox.Beatbox.enableStore) {
 			Store.StoreView storeView = new Store.StoreView(lm, this);
 			sideTree.addSideItem(sideTree.network_iter, null, storeView, _("Music Store"), ViewWrapper.Hint.NONE);
 			mainViews.pack_start(storeView, true, true, 0);
 		}
-		
-		
+
 		// load smart playlists
 		foreach(SmartPlaylist p in lm.smart_playlists()) {
 			addSideListItem(p);
 		}
-		
+
 		// load playlists
 		foreach(Playlist p in lm.playlists()) {
 			addSideListItem(p);
 		}
 	}
-	
+
 	public void addSideListItem(GLib.Object o) {
 		TreeIter item = sideTree.library_music_iter; //just a default
 		ViewWrapper vw = null;
-		
+
 		if(o is Playlist) {
 			Playlist p = (Playlist)o;
-			
+
 			vw = new ViewWrapper(lm, this, lm.medias_from_playlist(p.rowid), p.tvs.sort_column, p.tvs.sort_direction, ViewWrapper.Hint.PLAYLIST, p.rowid);
 			item = sideTree.addSideItem(sideTree.playlists_iter, p, vw, p.name, ViewWrapper.Hint.PLAYLIST);
 			mainViews.pack_start(vw, true, true, 0);
 		}
 		else if(o is SmartPlaylist) {
 			SmartPlaylist p = (SmartPlaylist)o;
-			
+
 			vw = new ViewWrapper(lm, this, lm.medias_from_smart_playlist(p.rowid), p.tvs.sort_column, p.tvs.sort_direction, ViewWrapper.Hint.SMART_PLAYLIST, p.rowid);
 			item = sideTree.addSideItem(sideTree.playlists_iter, p, vw, p.name, ViewWrapper.Hint.SMART_PLAYLIST);
 			mainViews.pack_start(vw, true, true, 0);
 		}
 		else if(o is Device) {
 			Device d = (Device)o;
-			
+
 			if(d.getContentType() == "cdrom") {
 				vw = new DeviceViewWrapper(lm, this, d.get_medias(), "Track", Gtk.SortType.ASCENDING, ViewWrapper.Hint.CDROM, -1, d);
 				item = sideTree.addSideItem(sideTree.devices_iter, d, vw, d.getDisplayName(), ViewWrapper.Hint.CDROM);
@@ -558,13 +554,13 @@
 				mainViews.pack_start(dv, true, true, 0);
 			}
 		}
-		
+
 		if(vw == null || vw.list == null || vw.albumView == null)
 			return;
-		
+
 		if(!initializationFinished)
 			return;
-		
+
 		vw.show_all();
 		if(viewSelector.selected == 0) {
 			vw.albumView.show();
@@ -575,27 +571,27 @@
 			vw.albumView.hide();
 		}
 	}
-	
+
 	public void updateSensitivities() {
 		if(!initializationFinished)
 			return;
-		
+
 		bool folderSet = (lm.settings.getMusicFolder() != "");
 		bool haveMedias = lm.media_count() > 0;
 		bool haveSongs = lm.song_ids().size > 0;
 		bool doingOps = lm.doing_file_operations();
 		bool nullMedia = (lm.media_info.media == null);
 		bool showMore = lm.settings.getMoreVisible();
-		
+
 		bool showingMediaList = (sideTree.getSelectedWidget() is ViewWrapper);
 		bool songsInList = showingMediaList ? (((ViewWrapper)sideTree.getSelectedWidget()).media_count > 0) : false;
 		bool showingMusicList = sideTree.convertToChild(sideTree.getSelectedIter()) == sideTree.library_music_iter;
 		bool showMainViews = (haveSongs || (haveMedias &&!showingMusicList));
-		
+
 		fileSetMusicFolder.set_sensitive(!doingOps);
 		fileImportMusic.set_sensitive(!doingOps && folderSet);
 		fileRescanMusicFolder.set_sensitive(!doingOps && folderSet);
-		
+
 		if(doingOps)
 			topDisplay.show_progressbar();
 		else if(!nullMedia && lm.media_info.media.mediatype == 3) {
@@ -603,91 +599,91 @@
 		}
 		else
 			topDisplay.show_scale();
-		
+
 		sourcesToMedias.set_visible(viewSelector.selected != 3);
 		videoArea.set_visible(viewSelector.selected == 3);
-		
+
 		topDisplay.set_visible(!nullMedia || doingOps);
 		topDisplay.set_scale_sensitivity(!nullMedia);
-		
+
 		previousButton.set_sensitive(!nullMedia || songsInList);
 		playButton.set_sensitive(!nullMedia || songsInList);
 		nextButton.set_sensitive(!nullMedia || songsInList);
 		searchField.set_sensitive(showingMediaList && songsInList && showMainViews);
 		viewSelector.set_sensitive(showingMediaList);
-		
+
 		mainViews.set_visible(showMainViews);
 		miller.set_visible((showMainViews) && viewSelector.selected == 2 && showingMediaList);
 		welcomeScreen.set_visible(!showMainViews);
 		millerPane.set_visible(showMainViews);
-		
+
 		welcomeScreen.set_sensitivity(0, !doingOps);
 		foreach(int key in welcome_screen_keys.keys)
 			welcomeScreen.set_sensitivity(key, !doingOps);
-		
+
 		statusBar.set_visible(showMainViews && showingMediaList);
-		
+
 		infoPanel.set_visible(showMainViews && showMore && !nullMedia);
 		infoPanelChooser.set_visible(showMainViews && !nullMedia);
 		coverArt.set_visible(!nullMedia);
-		
+
 		// hide playlists when media list is empty
 		sideTree.setVisibility(sideTree.playlists_iter, haveMedias);
-		
+
 		if(lm.media_info.media == null || haveMedias && !lm.playing) {
 			playButton.set_stock_id(Gtk.Stock.MEDIA_PLAY);
 		}
 	}
-	
+
 	public virtual void progressNotification(string? message, double progress) {
 		if(message != null && progress >= 0.0 && progress <= 1.0)
 			topDisplay.set_label_markup(message);
-		
+
 		topDisplay.set_progress_value(progress);
 	}
-	
+
 	public bool updateCurrentMedia() {
 		//loop through all musictreeviews and call updatecurrentmedia
-		
+
 		if(lm.media_info.media != null) {
 			if(lm.get_album_art(lm.media_info.media.rowid) != null)
 				coverArt.set_from_pixbuf(lm.get_album_art(lm.media_info.media.rowid));
 			else {
-				coverArt.set_from_pixbuf(lm.icons.drop_album.render(null, null));
+				coverArt.set_from_pixbuf(Icons.DROP_ALBUM_PIXBUF);
 			}
-			
+
 			coverArt.update_allocated_space(sourcesToMedias.position);
 		}
-		
+
 		return false;
 	}
-	
+
 	public void updateInfoLabel() {
 		if(lm.doing_file_operations()) {
 			stdout.printf("doing file operations, returning null in updateInfoLabel\n");
 			return;
 		}
-			
+
 		if(lm.media_info.media == null) {
 			topDisplay.set_label_markup("");
 			stdout.printf("setting info label as ''\n");
 			return;
 		}
-		
+
 		string beg = "";
 		if(lm.media_info.media.mediatype == 3) // radio
 			beg = "<b>" + lm.media_info.media.album_artist.replace("\n", "") + "</b>\n";
-		
+
 		//set the title
 		Media s = lm.media_info.media;
 		var title = "<b>" + s.title.replace("&", "&amp;") + "</b>";
 		var artist = ((s.artist != "" && s.artist != _("Unknown Artist")) ? (_(" by ") + "<b>" + s.artist.replace("&", "&amp;") + "</b>") : "");
 		var album = ((s.album != "" && s.album != _("Unknown Album")) ? (_(" on ") + "<b>" + s.album.replace("&", "&amp;") + "</b>") : "");
-		
+
 		var media_label = beg + title + artist + album;
 		topDisplay.set_label_markup(media_label);
 	}
-	
+
 	/** This should be used whenever a call to play a new media is made
 	 * @param s The media that is now playing
 	 */
@@ -695,22 +691,22 @@
 		/*if(old == -2 && i != -2) { // -2 is id reserved for previews
 			Media s = settings.getLastMediaPlaying();
 			s = lm.media_from_name(s.title, s.artist);
-			
+
 			if(s.rowid != 0) {
 				lm.playMedia(s.rowid);
 				int position = (int)settings.getLastMediaPosition();
 				topDisplay.change_value(ScrollType.NONE, position);
 			}
-			
+
 			return;
 		}*/
-		
+
 		updateInfoLabel();
-		
+
 		//reset the media position
 		topDisplay.set_scale_sensitivity(true);
 		topDisplay.set_scale_range(0.0, lm.media_info.media.length);
-		
+
 		if(lm.media_from_id(i).mediatype == 1 || lm.media_from_id(i).mediatype == 2) {
 			/*stdout.printf("setting position to resume_pos which is %d\n", lm.media_from_id(i).resume_pos );
 			Timeout.add(250, () => {
@@ -721,34 +717,34 @@
 		else {
 			topDisplay.change_value(ScrollType.NONE, 0);
 		}
-		
+
 		//if(!mediaPosition.get_sensitive())
 		//	mediaPosition.set_sensitive(true);
-		
+
 		//reset some booleans
 		tested_for_video = false;
 		queriedlastfm = false;
 		media_considered_played = false;
 		added_to_play_count = false;
 		scrobbled_track = false;
-		
+
 		if(!lm.media_info.media.isPreview) {
 			updateCurrentMedia();
-			
+
 			infoPanel.updateMedia(lm.media_info.media.rowid);
 			if(settings.getMoreVisible())
 				infoPanel.set_visible(true);
-			
+
 			updateMillerColumns();
 		}
-		
+
 		updateSensitivities();
-		
+
 		// if radio, we can't depend on current_position_update. do that stuff now.
 		if(lm.media_info.media.mediatype == 3) {
 			queriedlastfm = true;
 			similarMedias.queryForSimilar(lm.media_info.media);
-			
+
 			try {
 				Thread.create<void*>(lastfm_track_thread_function, false);
 				Thread.create<void*>(lastfm_album_thread_function, false);
@@ -758,101 +754,101 @@
 			catch(GLib.ThreadError err) {
 				stdout.printf("ERROR: Could not create last fm thread: %s \n", err.message);
 			}
-			
+
 			// always show notifications for the radio, since user likely does not know media
 			mkl.showNotification(lm.media_info.media.rowid);
 		}
 	}
-	
+
 	public virtual void playback_stopped(int was_playing) {
 		//reset some booleans
 		tested_for_video = false;
 		queriedlastfm = false;
 		media_considered_played = false;
 		added_to_play_count = false;
-		
+
 		// this will hide album cover art
 		updateCurrentMedia();
-		
+
 		updateSensitivities();
-		
+
 		stdout.printf("stopped\n");
 	}
-	
+
 	public virtual void medias_updated(Collection<int> ids) {
 		if(lm.media_info.media != null && ids.contains(lm.media_info.media.rowid)) {
 			updateInfoLabel();
 		}
 	}
-	
+
 	void medias_added(LinkedList<int> ids) {
 		/*var new_songs = new LinkedList<int>();
 		var new_podcasts = new LinkedList<int>();
-		
+
 		foreach(int i in ids) {
 			if(lm.media_from_id(i).mediatype == 0)
 				new_songs.add(i);
 			else if(lm.media_from_id(i).mediatype == 1)
 				new_podcasts.add(i);
 		}
-		
+
 		stdout.printf("appending...\n");
 		ViewWrapper vw = (ViewWrapper)sideTree.getWidget(sideTree.library_music_iter);
 		vw.add_medias(new_songs);
-		
+
 		vw = (ViewWrapper)sideTree.getWidget(sideTree.library_podcasts_iter);
 		vw.add_medias(new_podcasts);
 		stdout.printf("appended\n");*/
-		
+
 		var w = sideTree.getSelectedWidget();
 		if(w is ViewWrapper) {
 			miller.populateColumns("", ((ViewWrapper)w).get_media_ids());
 		}
-		
+
 		updateSensitivities();
 	}
-	
+
 	public void* lastfm_track_thread_function () {
 		LastFM.TrackInfo track = new LastFM.TrackInfo.basic();
-		
+
 		string artist_s = lm.media_info.media.artist;
 		string track_s = lm.media_info.media.title;
-		
+
 		/* first fetch track info since that is most likely to change */
 		if(!lm.track_info_exists(track_s + " by " + artist_s)) {
 			track = new LastFM.TrackInfo.with_info(artist_s, track_s);
-			
+
 			if(track != null)
 				lm.save_track(track);
-			
+
 			if(track_s == lm.media_info.media.title && artist_s == lm.media_info.media.artist)
 				lm.media_info.track = track;
 		}
-		
+
 		return null;
 	}
-	
+
 	public void* lastfm_album_thread_function () {
 		LastFM.AlbumInfo album = new LastFM.AlbumInfo.basic();
-		
+
 		string artist_s = lm.media_info.media.artist;
 		string album_s = lm.media_info.media.album;
-		
+
 		/* fetch album info now. only save if still on current media */
 		if(!lm.album_info_exists(album_s + " by " + artist_s) || lm.get_album_art(lm.media_info.media.rowid) == null) {
 			album = new LastFM.AlbumInfo.with_info(artist_s, album_s);
-			
+
 			if(album != null)
 				lm.save_album(album);
-			
+
 			/* make sure we save image to right location (user hasn't changed medias) */
 			if(lm.media_info.media != null && album != null && album_s == lm.media_info.media.album &&
 			artist_s == lm.media_info.media.artist && lm.media_info.media.getAlbumArtPath().contains("media-audio.png")) {
 				lm.media_info.album = album;
-			
+
 				if (album.url_image.url != null && lm.settings.getUpdateFolderHierarchy()) {
 					lm.save_album_locally(lm.media_info.media.rowid, album.url_image.url);
-					
+
 					// start thread to load all the medias pixbuf's
 					try {
 						Thread.create<void*>(lm.fetch_thread_function, false);
@@ -866,66 +862,66 @@
 				return null;
 			}
 		}
-		
+
 		Idle.add(updateCurrentMedia);
-		
+
 		return null;
 	}
-	
+
 	public void* lastfm_artist_thread_function () {
 		LastFM.ArtistInfo artist = new LastFM.ArtistInfo.basic();
-		
+
 		string artist_s = lm.media_info.media.artist;
-		
+
 		/* fetch artist info now. save only if still on current media */
 		if(!lm.artist_info_exists(artist_s)) {
 			artist = new LastFM.ArtistInfo.with_artist(artist_s);
-			
+
 			if(artist != null)
 				lm.save_artist(artist);
-			
+
 			//try to save artist art locally
 			if(lm.media_info.media != null && artist != null && artist_s == lm.media_info.media.artist &&
 			!File.new_for_path(lm.media_info.media.getArtistImagePath()).query_exists()) {
 				lm.media_info.artist = artist;
-				
+
 			}
 			else {
 				return null;
 			}
 		}
-		
+
 		Idle.add( () => { infoPanel.updateArtistImage(true); return false;});
-		
+
 		return null;
 	}
-	
+
 	public void* lastfm_update_nowplaying_thread_function() {
 		if(lm.media_info.media != null) {
 			lm.lfm.updateNowPlaying(lm.media_info.media.title, lm.media_info.media.artist);
 		}
-		
+
 		return null;
 	}
-	
+
 	public void* lastfm_scrobble_thread_function () {
 		if(lm.media_info.media != null) {
 			lm.lfm.scrobbleTrack(lm.media_info.media.title, lm.media_info.media.artist);
 		}
-		
+
 		return null;
 	}
-	
+
 	public bool updateMediaInfo() {
 		infoPanel.updateMedia(lm.media_info.media.rowid);
-		
+
 		return false;
 	}
-	
+
 	public virtual void previousClicked () {
 		if(lm.player.getPosition() < 5000000000 || (lm.media_info.media != null && lm.media_info.media.mediatype == 3)) {
 			int prev_id = lm.getPrevious(true);
-			
+
 			/* test to stop playback/reached end */
 			if(prev_id == 0) {
 				lm.player.pause();
@@ -937,7 +933,7 @@
 		else
 			topDisplay.change_value(ScrollType.NONE, 0);
 	}
-	
+
 	public virtual void playClicked () {
 		if(lm.media_info.media == null) {
 			stdout.printf("No media is currently playing. Starting from the top\n");
@@ -950,9 +946,9 @@
 				w = sideTree.getWidget(sideTree.library_music_iter);
 				((ViewWrapper)w).list.set_as_current_list(1, true);
 			}
-			
+
 			lm.getNext(true);
-			
+
 			lm.playing = true;
 			playButton.set_stock_id(Gtk.Stock.MEDIA_PAUSE);
 			lm.player.play();
@@ -961,7 +957,7 @@
 			if(lm.playing) {
 				lm.playing = false;
 				lm.player.pause();
-				
+
 				playButton.set_stock_id(Gtk.Stock.MEDIA_PLAY);
 			}
 			else {
@@ -970,19 +966,19 @@
 				playButton.set_stock_id(Gtk.Stock.MEDIA_PAUSE);
 			}
 		}
-		
+
 		playPauseChanged();
 	}
-	
+
 	public virtual void nextClicked() {
 		// if not 90% done, skip it
 		if(!added_to_play_count) {
 			lm.media_info.media.skip_count++;
-			
+
 			// don't update, it will be updated eventually
 			//lm.update_media(lm.media_info.media, false, false);
 		}
-		
+
 		int next_id;
 		if(lm.next_gapless_id != 0) {
 			next_id = lm.next_gapless_id;
@@ -990,7 +986,7 @@
 		}
 		else
 			next_id = lm.getNext(true);
-		
+
 		/* test to stop playback/reached end */
 		if(next_id == 0) {
 			lm.player.pause();
@@ -999,34 +995,34 @@
 			return;
 		}
 	}
-	
+
 	public virtual void loveButtonClicked() {
 		lm.lfm.loveTrack(lm.media_info.media.title, lm.media_info.media.artist);
 	}
-	
+
 	public virtual void banButtonClicked() {
 		lm.lfm.banTrack(lm.media_info.media.title, lm.media_info.media.artist);
 	}
-	
+
 	public virtual void searchFieldIconPressed(EntryIconPosition p0, Gdk.Event p1) {
 		Widget w = sideTree.getSelectedWidget();
 		w.focus(DirectionType.UP);
 	}
-	
+
 	public virtual void millerResized(Allocation rectangle) {
 		if(viewSelector.selected == 2) {
 			settings.setMillerHeight(rectangle.height);
 		}
 	}
-	
+
 	public virtual void sourcesToMediasHandleSet(Allocation rectangle) {
 		updateCurrentMedia();
-		
+
 		if(settings.getSidebarWidth() != rectangle.width) {
 			settings.setSidebarWidth(rectangle.width);
 		}
 	}
-	
+
 	public virtual void on_resize() {
 		int width;
 		int height;
@@ -1034,7 +1030,7 @@
 		settings.setWindowWidth(width);
 		settings.setWindowHeight(height);
 	}
-	
+
 	public virtual void on_quit() {
 		lm.settings.setLastMediaPosition((int)((double)lm.player.getPosition()/1000000000));
 		if(lm.media_info.media != null) {
@@ -1043,36 +1039,36 @@
 		}
 		lm.player.pause();
 	}
-	
+
 	public virtual void fileImportMusicClick() {
 		if(!lm.doing_file_operations()) {
 			/*if(!(GLib.File.new_for_path(lm.settings.getMusicFolder()).query_exists() && lm.settings.getCopyImportedMusic())) {
-				var dialog = new MessageDialog(this, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.OK, 
+				var dialog = new MessageDialog(this, DialogFlags.DESTROY_WITH_PARENT, MessageType.ERROR, ButtonsType.OK,
 				"Before importing, you must mount your music folder.");
-				
+
 				var result = dialog.run();
 				dialog.destroy();
-				
+
 				return;
 			}*/
-			
+
 			string folder = "";
 			var file_chooser = new FileChooserDialog (_("Import Music"), this,
 									  FileChooserAction.SELECT_FOLDER,
 									  Gtk.Stock.CANCEL, ResponseType.CANCEL,
 									  Gtk.Stock.OPEN, ResponseType.ACCEPT);
 			file_chooser.set_local_only(true);
-			
+
 			if (file_chooser.run () == ResponseType.ACCEPT) {
 				folder = file_chooser.get_filename();
 			}
 			file_chooser.destroy ();
-			
+
 			if(folder != "" && folder != settings.getMusicFolder()) {
 				if(GLib.File.new_for_path(lm.settings.getMusicFolder()).query_exists()) {
 					topDisplay.set_label_markup(_("<b>Importing</b> music from <b>%s</b> to library.").printf(folder));
 					topDisplay.show_progressbar();
-					
+
 					lm.add_folder_to_library(folder);
 					updateSensitivities();
 				}
@@ -1082,13 +1078,13 @@
 			stdout.printf("Can't add to library.. already doing file operations\n");
 		}
 	}
-	
+
 	public virtual void fileRescanMusicFolderClick() {
 		if(!lm.doing_file_operations()) {
 			if(GLib.File.new_for_path(this.settings.getMusicFolder()).query_exists()) {
 				topDisplay.set_label_markup("<b>" + _("Rescanning music folder for changes") + "</b>");
 				topDisplay.show_progressbar();
-				
+
 				lm.rescan_music_folder();
 				updateSensitivities();
 			}
@@ -1100,10 +1096,10 @@
 			stdout.printf("Can't rescan.. doing file operations already\n");
 		}
 	}
-	
+
 	public void resetSideTree(bool clear_views) {
 		sideTree.resetView();
-		
+
 		// clear all other playlists, reset to Music, populate music
 		if(clear_views) {
 			stdout.printf("clearing all views...\n");
@@ -1121,51 +1117,50 @@
 			ViewWrapper vw = (ViewWrapper)sideTree.getWidget(sideTree.library_music_iter);
 			vw.doUpdate(vw.currentView, lm.song_ids(), true, true, false);
 			miller.populateColumns("", lm.song_ids());
-			
+
 			vw = (ViewWrapper)sideTree.getWidget(sideTree.library_podcasts_iter);
 			vw.doUpdate(vw.currentView, lm.podcast_ids(), true, true, false);
-			
+
 			//vw = (ViewWrapper)sideTree.getWidget(sideTree.library_audiobooks_iter);
 			//vw.doUpdate(vw.currentView, lm.audiobook_ids(), true, true, false);
-			
+
 			vw = (ViewWrapper)sideTree.getWidget(sideTree.network_radio_iter);
 			vw.doUpdate(vw.currentView, lm.station_ids(), true, true, false);
 		}
 	}
-	
+
 	public virtual void musicCounted(int count) {
 		stdout.printf("found %d medias, importing.\n", count);
 	}
-	
+
 	/* this is after setting the music library */
 	public virtual void musicAdded(LinkedList<string> not_imported) {
-		
+
 		if(lm.media_info.media != null) {
 			updateInfoLabel();
 		}
 		else
 			topDisplay.set_label_text("");
-		
+
 		//resetSideTree(false);
 		//var init = searchField.get_text();
 		//searchField.set_text("up");
-		
+
 		if(not_imported.size > 0) {
 			NotImportedWindow nim = new NotImportedWindow(this, not_imported, lm.settings.getMusicFolder());
 			nim.show();
 		}
-		
+
 		updateSensitivities();
-		
+
 		//now notify user
 		try {
 			notification.close();
 			if(!has_toplevel_focus) {
 				notification.update(_("Import Complete"), _("BeatBox has imported your library."), "beatbox");
-				
-				var beatbox_icon = lm.icons.beatbox_icon.render (IconSize.DIALOG, null);
-				notification.set_image_from_pixbuf(beatbox_icon);
-				
+
+				notification.set_image_from_pixbuf(Icons.BEATBOX_DIALOG_PIXBUF);
+
 				notification.show();
 				notification.set_timeout(5000);
 			}
@@ -1174,55 +1169,55 @@
 			stderr.printf("Could not show notification: %s\n", err.message);
 		}
 	}
-	
+
 	/* this is when you import music from a foreign location into the library */
 	public virtual void musicImported(LinkedList<Media> new_medias, LinkedList<string> not_imported) {
 		if(lm.media_info.media != null) {
-			updateInfoLabel();	
+			updateInfoLabel();
 		}
 		else
 			topDisplay.set_label_text("");
-		
+
 		resetSideTree(false);
 		//searchField.changed();
-		
+
 		updateSensitivities();
 	}
-	
+
 	public virtual void musicRescanned(LinkedList<Media> new_medias, LinkedList<string> not_imported) {
 		if(lm.media_info.media != null) {
 			updateInfoLabel();
 		}
 		else
 			topDisplay.set_label_text("");
-		
+
 		resetSideTree(false);
 		//searchField.changed();
 		stdout.printf("music Rescanned\n");
 		updateSensitivities();
 	}
-	
+
 	public virtual void medias_removed(LinkedList<int> removed) {
 		updateSensitivities();
 	}
-	
+
 	public void editEqualizerClick() {
 		EqualizerWindow ew = new EqualizerWindow(lm, this);
 		ew.show();
 	}
-	
+
 	public void editPreferencesClick() {
 		PreferencesWindow pw = new PreferencesWindow(lm, this);
-		
+
 		pw.changed.connect( (folder) => {
 			setMusicFolder(folder);
 		});
 	}
-	
+
 	public void setMusicFolder(string folder) {
 		if(lm.doing_file_operations())
 			return;
-		
+
 		if(lm.song_ids().size > 0 || lm.playlist_count() > 0) {
 			var smfc = new SetMusicFolderConfirmation(lm, this, folder);
 			smfc.finished.connect( (cont) => {
@@ -1235,33 +1230,33 @@
 			lm.set_music_folder(folder);
 		}
 	}
-	
+
 	public virtual void end_of_stream() {
 		nextClicked();
 	}
-	
+
 	public virtual void current_position_update(int64 position) {
 		if(lm.media_info.media != null && lm.media_info.media.rowid == -2) // is preview
 			return;
-		
+
 		double sec = 0.0;
 		if(lm.media_info.media != null) {
 			sec = ((double)position/1000000000);
-			
+
 			if(lm.player.set_resume_pos) {
 				lm.media_info.media.resume_pos = (int)sec;
 			}
-			
+
 			// at about 3 seconds, update last fm. we wait to avoid excessive querying last.fm for info
 			if(position > 3000000000 && !queriedlastfm) {
 				queriedlastfm = true;
-				
+
 				ViewWrapper vw = (ViewWrapper)sideTree.getWidget(sideTree.playlists_similar_iter);
 				if(!vw.list.get_is_current()) {
 					vw.show_retrieving_similars();
 					similarMedias.queryForSimilar(lm.media_info.media);
 				}
-				
+
 				try {
 					Thread.create<void*>(lastfm_track_thread_function, false);
 					Thread.create<void*>(lastfm_album_thread_function, false);
@@ -1272,22 +1267,22 @@
 					stdout.printf("ERROR: Could not create last fm thread: %s \n", err.message);
 				}
 			}
-			
+
 			//at 30 seconds in, we consider the media as played
 			if(position > 30000000000 && !media_considered_played) {
 				media_considered_played = true;
-				
+
 				lm.media_info.media.last_played = (int)time_t();
 				if(lm.media_info.media.mediatype == 1) { //podcast
 					added_to_play_count = true;
 					++lm.media_info.media.play_count;
 				}
 				lm.update_media(lm.media_info.media, false, false);
-				
+
 				// add to the already played list
 				lm.add_already_played(lm.media_info.media.rowid);
 				sideTree.updateAlreadyPlayed();
-				
+
 #if HAVE_ZEITGEIST
 				var event = new Zeitgeist.Event.full(Zeitgeist.ZG_ACCESS_EVENT,
 					Zeitgeist.ZG_SCHEDULED_ACTIVITY, "app://beatbox.desktop",
@@ -1298,7 +1293,7 @@
 				new Zeitgeist.Log ().insert_events_no_reply(event);
 #endif
 			}
-			
+
 			// at halfway, scrobble
 			if((double)(sec/(double)lm.media_info.media.length) > 0.50 && !scrobbled_track) {
 				scrobbled_track = true;
@@ -1309,43 +1304,43 @@
 					stdout.printf("ERROR: Could not create last fm thread: %s \n", err.message);
 				}
 			}
-			
+
 			// at 90% done with media, add 1 to play count
 			if((double)(sec/(double)lm.media_info.media.length) > 0.90 && !added_to_play_count) {
 				added_to_play_count = true;
 				lm.media_info.media.play_count++;
 				lm.update_media(lm.media_info.media, false, false);
 			}
-			
+
 		}
 		else {
-			
+
 		}
 	}
-	
+
 	public void media_not_found(int id) {
 		var not_found = new FileNotFoundDialog(lm, this, id);
 		not_found.show();
 	}
-	
+
 	public virtual void similarRetrieved(LinkedList<int> similarIDs, LinkedList<Media> similarDont) {
 		Widget w = sideTree.getWidget(sideTree.playlists_similar_iter);
-		
+
 		((ViewWrapper)w).similarsFetched = true;
 		((ViewWrapper)w).doUpdate(((ViewWrapper)w).currentView, similarIDs, true, true, false);
-		
+
 		infoPanel.updateMediaList(similarDont);
-		
+
 		if(((ViewWrapper)w).isCurrentView && !((ViewWrapper)w).list.get_is_current()) {
 			miller.populateColumns("", ((ViewWrapper)w).list.get_medias());
 			updateMillerColumns();
 		}
 	}
-	
+
 	public void set_statusbar_text(string text) {
 		statusBarLabel.set_text(text);
 	}
-	
+
 	public void welcomeScreenActivated(int index) {
 		if(index == 0) {
 			if(!lm.doing_file_operations()) {
@@ -1359,7 +1354,7 @@
 					folder = file_chooser.get_filename();
 				}
 				file_chooser.destroy ();
-				
+
 				if(folder != "" && (folder != settings.getMusicFolder() || lm.media_count() == 0)) {
 					setMusicFolder(folder);
 				}
@@ -1368,18 +1363,18 @@
 		else {
 			if(lm.doing_file_operations())
 				return;
-			
+
 			Device d = welcome_screen_keys.get(index);
-			
+
 			if(d.getContentType() == "cdrom") {
 				sideTree.expandItem(sideTree.convertToFilter(sideTree.devices_iter), true);
 				sideTree.setSelectedIter(sideTree.convertToFilter(sideTree.devices_cdrom_iter));
 				sideTree.sideListSelectionChange();
-				
+
 				var to_transfer = new LinkedList<int>();
 				foreach(int i in d.get_medias())
 					to_transfer.add(i);
-				
+
 				d.transfer_to_library(to_transfer);
 			}
 			else {
@@ -1390,21 +1385,21 @@
 						if(lm.media_from_id(i).isTemporary)
 							externals.add(i);
 					}
-					
+
 					TransferFromDeviceDialog tfdd = new TransferFromDeviceDialog(this, d, externals);
 					tfdd.show();
 				}
 			}
 		}
 	}
-	
+
 	public virtual void infoPanelResized(Allocation rectangle) {
 		int height, width;
 		get_size(out width, out height);
-		
+
 		if(sourcesToMedias.get_position() > height/2)
 			return;
-		
+
 		if(mediasToInfo.get_position() < (lm.settings.getWindowWidth() - lm.settings.getSidebarWidth()) - 300) { // this is max size
 			mediasToInfo.set_position((lm.settings.getWindowWidth() - lm.settings.getSidebarWidth()) - 300);
 			return;
@@ -1413,15 +1408,15 @@
 			mediasToInfo.set_position((lm.settings.getWindowWidth() - lm.settings.getSidebarWidth()) - 150);
 			return;
 		}
-		
+
 		if(lm.settings.getMoreWidth() != rectangle.width) {
 			lm.settings.setMoreWidth(rectangle.width);
 		}
 	}
-	
+
 	public virtual void repeatChooserOptionChanged(int val) {
 		lm.settings.setRepeatMode(val);
-		
+
 		if(val == 0)
 			lm.repeat = LibraryManager.Repeat.OFF;
 		else if(val == 1)
@@ -1433,42 +1428,42 @@
 		else if(val == 4)
 			lm.repeat = LibraryManager.Repeat.ALL;
 	}
-	
+
 	public virtual void shuffleChooserOptionChanged(int val) {
 		if(val == 0)
 			lm.setShuffleMode(LibraryManager.Shuffle.OFF, true);
 		else if(val == 1)
 			lm.setShuffleMode(LibraryManager.Shuffle.ALL, true);
 	}
-	
+
 	public virtual void infoPanelChooserOptionChanged(int val) {
 		infoPanel.set_visible(val == 1);
 		lm.settings.setMoreVisible(val == 1);
 	}
-	
+
 	public void updateMillerColumns() {
 		if(viewSelector.selected != 3)
 			settings.setViewMode(viewSelector.selected);
-			
-		bool similarcheck = sideTree.getSelectedWidget() is ViewWrapper  && 
-							((ViewWrapper)sideTree.getSelectedWidget()).errorBox != null && 
+
+		bool similarcheck = sideTree.getSelectedWidget() is ViewWrapper  &&
+							((ViewWrapper)sideTree.getSelectedWidget()).errorBox != null &&
 							((ViewWrapper)sideTree.getSelectedWidget()).errorBox.visible;
 		bool isCdrom = sideTree.getSelectedObject() is Device && ((Device)sideTree.getSelectedObject()).getContentType() == "cdrom";
 		bool isDeviceView = sideTree.getSelectedWidget() is DeviceView/* && ((DeviceView)sideTree.getSelectedWidget()).currentViewIndex() == 0*/;
 		bool storecheck = (sideTree.getSelectedWidget() is Store.StoreView);
 		bool haveMedias = (lm.media_count() != 0);
-		
+
 		miller.set_visible(viewSelector.selected == 2 && !similarcheck && !storecheck && !isCdrom && !isDeviceView && haveMedias);
 		millerVisible = (viewSelector.selected == 0); // used for when an album is clicked from icon view
-		
+
 		// populate if selected == 2 (miller columns)
 		/*if(initializationFinished && viewSelector.selected == 2 && sideTree.getSelectedWidget() is ViewWrapper && miller.visible) {
 			ViewWrapper vw = (ViewWrapper)sideTree.getSelectedWidget();
-			
+
 			miller.populateColumns("", vw.medias);
 		}*/
 	}
-	
+
 	// create a thread to update ALL non-visible views
 	void searchFieldChanged() {
 		if(initializationFinished && searchField.get_text().length != 1) {
@@ -1476,7 +1471,7 @@
 				Thread.create<void*>(lm.update_views_thread, false);
 			}
 			catch(GLib.ThreadError err) {
-				
+
 			}
 		}
 	}
@@ -1487,7 +1482,7 @@
 				Thread.create<void*>(lm.update_views_thread, false);
 			}
 			catch(GLib.ThreadError err) {
-				
+
 			}
 		}
 	}
@@ -1498,50 +1493,50 @@
 				vw.doUpdate(vw.currentView, vw.medias, false, false, true);
 			}
 		});
-		
-		return null;	
+
+		return null;
 	}*/
-	
+
 	public void searchFieldActivate() {
 		Widget w = sideTree.getSelectedWidget();
-		
+
 		if(w is ViewWrapper) {
 			ViewWrapper vw = (ViewWrapper)w;
-			
+
 			vw.list.set_as_current_list(1, !vw.list.get_is_current());
 			lm.current_index = 0;
 			lm.playMedia(lm.mediaFromCurrentIndex(0), false);
-			
+
 			if(!lm.playing)
 				playClicked();
 		}
 	}
-	
+
 	public virtual void dragReceived(Gdk.DragContext context, int x, int y, Gtk.SelectionData data, uint info, uint timestamp) {
 		if(dragging_from_music)
 			return;
-		
+
 		var files_dragged = new LinkedList<string>();
 		stdout.printf("dragged\n");
 		foreach (string uri in data.get_uris ()) {
 			files_dragged.add(File.new_for_uri(uri).get_path());
 		}
-		
+
 		lm.add_files_to_library(files_dragged);
 	}
-	
+
 	public void doAlert(string title, string message) {
-		var dialog = new MessageDialog(this, DialogFlags.MODAL, MessageType.ERROR, ButtonsType.OK, 
+		var dialog = new MessageDialog(this, DialogFlags.MODAL, MessageType.ERROR, ButtonsType.OK,
 				title);
-		
+
 		dialog.title = "BeatBox";
 		dialog.secondary_text = message;
 		dialog.secondary_use_markup = true;
-				
+
 		dialog.run();
 		dialog.destroy();
 	}
-	
+
 	/* device stuff for welcome screen */
 	public void device_added(Device d) {
 		// add option to import in welcome screen
@@ -1549,7 +1544,7 @@
 		int key = welcomeScreen.append_with_image( new Image.from_gicon(d.get_icon(), Gtk.IconSize.DIALOG), d.getDisplayName(), secondary);
 		welcome_screen_keys.set(key, d);
 	}
-	
+
 	public void device_removed(Device d) {
 		// remove option to import from welcome screen
 		int key = 0;
@@ -1559,10 +1554,11 @@
 				break;
 			}
 		}
-		
+
 		if(key != 0) {
 			welcome_screen_keys.unset(key);
 			welcomeScreen.remove_with_key(key);
 		}
 	}
 }
+

=== modified file 'src/Objects/EqualizerPreset.vala'
--- src/Objects/EqualizerPreset.vala	2011-11-22 03:08:33 +0000
+++ src/Objects/EqualizerPreset.vala	2012-01-31 01:07:25 +0000
@@ -27,16 +27,7 @@
 	public string name;
 	public ArrayList<int> gains;
 
-	private bool _default_preset = false;
-
-	public bool is_default {
-		get {
-			return _default_preset;
-		}
-		set {
-			_default_preset = value;
-		}
-	}
+	public bool is_default { get; set;}
 
 	public EqualizerPreset.basic(string name) {
 		this.name = name;

=== added file 'src/Objects/Icon.vala'
--- src/Objects/Icon.vala	1970-01-01 00:00:00 +0000
+++ src/Objects/Icon.vala	2012-01-31 01:07:25 +0000
@@ -0,0 +1,222 @@
+/*-
+ * Copyright (c) 2011		Scott Ringwelski <[e-mail]>
+ *
+ * Originally Written by Scott Ringwelski and Victor Eduardo for
+ * BeatBox Music Player: http://www.launchpad.net/beat-box
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * TODO:
+ * - Add built-in icons.
+ * - Improve code in some areas
+ */
+
+using Gtk;
+
+public class BeatBox.Icon : GLib.Object {
+
+	public string name {get; private set;}
+
+	public bool has_backup {
+		get {
+			return (this.backup != null);
+		}
+	}
+
+	private string? backup;
+	private int? size;
+	private Icons.Type? type;
+	private Icons.FileType? file_type;
+
+	public Icon (string name, int? size, Icons.Type? type, Icons.FileType? file_type, bool has_backup) {
+
+		this.name = name;
+		this.size = size;
+		this.type = type;
+		this.file_type = file_type;
+
+		/**
+		 * The following code creates a backup path for the icon.
+		 * This ensures consistency in the way we store icons in the
+		 * 'images' folder.
+		 **/
+		if (has_backup && type != null && size != null) {
+			string size_folder, type_folder, actual_icon_name;
+
+			if (size != null)
+				size_folder = size.to_string() + "x" + size.to_string();
+			else
+				size_folder = "";
+
+			switch (type)
+			{
+				case Icons.Type.MIMETYPE:
+					type_folder = Icons.MIMETYPES_FOLDER;
+					break;
+				case Icons.Type.ACTION:
+					type_folder = Icons.ACTIONS_FOLDER;
+					break;
+				case Icons.Type.STATUS:
+					type_folder = Icons.STATUS_FOLDER;
+					break;
+				case Icons.Type.APP:
+					type_folder = Icons.APPS_FOLDER;
+					break;
+				default:
+					type_folder = "";
+					break;
+			}
+
+			if (file_type != null) {
+				switch (file_type)
+				{
+					case Icons.FileType.SVG:
+						actual_icon_name = this.name + Icons.SVG_EXT;
+						break;
+					case Icons.FileType.PNG:
+						actual_icon_name = this.name + Icons.PNG_EXT;
+						break;
+					default:
+						actual_icon_name = this.name + Icons.SVG_EXT;
+						break;
+				}
+			}
+			else {
+				actual_icon_name = name + Icons.SVG_EXT;
+			}
+
+			var icon_path = GLib.Path.build_path("/", Build.ICON_FOLDER, size_folder, type_folder);
+			IconTheme.get_default().append_search_path (icon_path);
+			this.backup = GLib.Path.build_filename("/", Build.ICON_FOLDER, size_folder, type_folder, actual_icon_name);
+		}
+		else {
+			this.backup = null;
+		}
+	}
+
+	public GLib.Icon get_gicon () {
+		return new GLib.ThemedIcon.with_default_fallbacks (this.name);
+	}
+
+	public Gtk.IconInfo? get_icon_info (int size) {
+		var icon_theme = IconTheme.get_default();
+		var lookup_flags = Gtk.IconLookupFlags.GENERIC_FALLBACK;
+		return icon_theme.lookup_by_gicon (get_gicon(), size, lookup_flags);
+	}
+
+	public Gdk.Pixbuf? render (Gtk.IconSize? size, StyleContext? context = null, int px_size = 0) {
+		Gdk.Pixbuf? rv = null;
+		int width = 16, height = 16;
+
+		// Don't load image as a regular icon if it's a PNG and belongs
+		// to the project's folder.
+		if (file_type == Icons.FileType.PNG && backup != null && size == null) {
+			try {
+				rv = new Gdk.Pixbuf.from_file(backup);
+			}
+			catch(Error err) {
+				warning ("Could not load PNG image: %s\n", err.message);
+			}
+
+			return rv;
+		}
+
+		// If a null size was passed, use original size
+		if (size != null) {
+			icon_size_lookup (size, out width, out height);
+		}
+		else if (px_size > 0) {
+			width = px_size;
+			height = px_size;
+		}
+		else if (this.size != null) {
+			width = this.size;
+			height = width;
+		}
+
+		// Try to load icon from theme
+		if (IconTheme.get_default().has_icon(this.name)) {
+			try {
+				var icon_info = get_icon_info (height);
+				if (icon_info != null) {
+					if (context != null)
+						rv = icon_info.load_symbolic_for_context (context);
+					else
+						rv = icon_info.load_icon ();
+				}
+			}
+			catch (Error err) {
+				warning ("%s, falling back to BeatBox default.", err.message);
+			}
+		}
+
+		// If the above failed, use available backup
+		if (rv == null && this.backup != null) {
+			try {
+				warning ("Loading backup icon for %s", this.name);
+				rv = new Gdk.Pixbuf.from_file_at_size (this.backup, width, height);
+			}
+			catch (Error err) {
+				warning ("Couldn't load backup icon: %s", err.message);
+			}
+		}
+
+		return rv;
+	}
+
+	/**
+	 * Use this method for loading symbolic icons. They will follow every state.
+	 **/
+	public Gtk.Image? render_image (Gtk.IconSize? size, Gtk.StyleContext? ctx = null, int px_size = 0) {
+		Gtk.Image? rv = null;
+		int width = 16, height = 16;
+
+		// If a null size was passed, use original size
+		if (size != null) {
+			icon_size_lookup (size, out width, out height);
+		}
+		else if (px_size > 0) {
+			width = px_size;
+			height = px_size;
+		}
+		else if (this.size != null) {
+			width = this.size;
+			height = width;
+		}
+
+		if (IconTheme.get_default().has_icon (this.name) && size != null) {
+			// Try to load icon from theme
+			rv = new Image.from_icon_name (this.name, size);
+		} else if (this.backup != null) {
+			// If the icon theme doesn't contain the icon, load backup
+			warning ("Loading %s from backup", this.name);
+			rv = new Image.from_file (this.backup);
+		} else {
+			// And if there was no backup, use the default method
+			warning ("Loading %s using default method", this.name);
+			rv = new Image.from_pixbuf (this.render (size, ctx));
+		}
+
+		// Resize image if necessary
+		if (rv.get_pixel_size () != height)
+			rv.set_pixel_size (height);
+
+		return rv;
+	}
+}
+

=== removed file 'src/Objects/Icons.vala'
--- src/Objects/Icons.vala	2012-01-28 04:23:58 +0000
+++ src/Objects/Icons.vala	1970-01-01 00:00:00 +0000
@@ -1,272 +0,0 @@
-/*-
- * Copyright (c) 2011	   Scott Ringwelski <[e-mail]>
- *
- * Originally Written by Scott Ringwelski and Victor Eduardo for
- * BeatBox Music Player: http://www.launchpad.net/beat-box
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-using Gtk;
-
-public class BeatBox.Icon : GLib.Object {
-
-	public enum IconType {
-		MIMETYPE,
-		ACTION,
-		STATUS,
-		APP
-	}
-
-	private const string MIMETYPES_FOLDER = "mimetypes";
-	private const string ACTIONS_FOLDER = "actions";
-	private const string STATUS_FOLDER = "status";
-	private const string APPS_FOLDER = "apps";
-
-	public enum IconFileType {
-		SVG,
-		PNG
-	}
-
-	public string icon_name {
-		get {
-			return this.name;
-		}
-	}
-
-	public bool has_backup {
-		get {
-			return (this.backup != null);
-		}
-	}
-
-	private string name;
-	private string? backup;
-	private int? size;
-	private IconType? type;
-	private IconFileType? file_type;
-
-	public Icon (string name, int? size, IconType? type, IconFileType? file_type, bool has_backup) {
-
-		this.name = name;
-		this.size = size;
-		this.type = type;
-		this.file_type = file_type;
-
-		/**
-		 * The following code creates a backup path for the icon.
-		 * This ensures consistency in the way we store icons in the
-		 * 'images' folder.
-		 **/
-		if (has_backup && type != null && size != null) {
-			string size_folder, type_folder, actual_icon_name;
-
-			if (size != null)
-				size_folder = size.to_string() + "x" + size.to_string();
-			else
-				size_folder = "";
-
-			switch (type)
-	 		{
-	 			case IconType.MIMETYPE:
-	 				type_folder = MIMETYPES_FOLDER;
-	 				break;
-	 			case IconType.ACTION:
-	 				type_folder = ACTIONS_FOLDER;
-	 				break;
-	 			case IconType.STATUS:
-	 				type_folder = STATUS_FOLDER;
-	 				break;
-	 			case IconType.APP:
-	 				type_folder = APPS_FOLDER;
-	 				break;
-	 			default:
-	 				type_folder = "";
-	 				break;
-	 		}
-
-			if (file_type != null) {
-				switch (file_type)
-				{
-					case IconFileType.SVG:
-						actual_icon_name = this.name + ".svg";
-						break;
-					case IconFileType.PNG:
-						actual_icon_name = this.name + ".png";
-						break;
-					default:
-						actual_icon_name = this.name + ".svg";
-						break;
-				}
-			}
-			else {
-				actual_icon_name = name + ".svg";
-			}
-
-            var icon_path = GLib.Path.build_path("/", Build.ICON_FOLDER, "hicolor", size_folder, type_folder);
-			IconTheme.get_default().append_search_path (icon_path);
-			this.backup = GLib.Path.build_filename("/", Build.ICON_FOLDER, "hicolor", size_folder, type_folder, actual_icon_name);
-		}
-		else {
-			this.backup = null;
-		}
-	}
-
-	public Gdk.Pixbuf? render (Gtk.IconSize? size, StyleContext? context) {
-		Gdk.Pixbuf? rv = null;
-		int width = 16, height = 16;
-
-        // Don't load the image as a regular icon if it's a PNG and belongs
-        // to the project's folder.
-		if (file_type == IconFileType.PNG && backup != null && size == null) {
-			try {
-				rv = new Gdk.Pixbuf.from_file(backup);
-			}
-			catch(Error err) {
-				stdout.printf("Could not load PNG image: %s\n", err.message);
-			}
-
-			return rv;
-		}
-
-        // If a null size was passed, use the original size
-		if (this.size != null) {
-			width = this.size;
-			height = this.size;
-		}
-
-		if (size != null)
-			icon_size_lookup (size, out width, out height);
-
-        // Try to load the icon from the icon theme
-		if (IconTheme.get_default().has_icon(this.name)) {
-			try {
-				var themed_icon = new GLib.ThemedIcon.with_default_fallbacks (this.name);
-				Gtk.IconInfo? icon_info = IconTheme.get_default().lookup_by_gicon (themed_icon as GLib.Icon, height, Gtk.IconLookupFlags.GENERIC_FALLBACK);
-				if (icon_info != null) {
-					if (context != null)
-						rv = icon_info.load_symbolic_for_context (context);
-					else
-						rv = icon_info.load_icon ();
-				}
-			}
-			catch (Error err) {
-				warning ("%s, falling back to BeatBox default.", err.message);
-			}
-		}
-
-		if (rv == null && this.backup != null) {
-			try {
-				rv = new Gdk.Pixbuf.from_file_at_size (this.backup, width, height);
-			}
-			catch (Error err) {
-				warning ("Couldn't load backup icon: %s", err.message);
-			}
-		}
-
-		return rv;
-	}
-}
-
-public class BeatBox.Icons : GLib.Object {
-	LibraryManager lm;
-	LibraryWindow lw;
-
-	public Icon default_album_art;
-	public Icon drop_album;
-
-	public Icon music_folder;
-
-	public Icon beatbox_icon;
-	public Icon radio_icon;
-	public Icon music_icon;
-	public Icon podcast_icon;
-	public Icon audiobook_icon;
-	public Icon history_icon;
-	public Icon playlist_icon;
-	public Icon smart_playlist_icon;
-	public Icon lastfm_love_icon;
-	public Icon lastfm_ban_icon;
-	public Icon starred_icon;
-	public Icon not_starred_icon;
-	public Icon info_icon;
-	public Icon new_podcast_icon;
-	public Icon ok_icon;
-
-	/** Symbolic icons **/
-	public Icon now_playing_icon;
-	public Icon process_stop_icon;
-	public Icon process_completed_icon;
-	public Icon process_error_icon;
-	public Icon shuffle_on_icon;
-	public Icon shuffle_off_icon;
-	public Icon repeat_on_icon;
-	public Icon repeat_once_icon;
-	public Icon repeat_off_icon;
-	public Icon view_column_icon;
-	public Icon view_details_icon;
-	public Icon view_icons_icon;
-	public Icon view_video_icon;
-
-	public Icons (LibraryManager lm, LibraryWindow lw) {
-		this.lm = lm;
-		this.lw = lw;
-	}
-
-	public void load_icons () {
-
-		// 128 x 128
-		default_album_art = new Icon ("media-audio", 128, Icon.IconType.MIMETYPE, Icon.IconFileType.PNG, true);
-		drop_album = new Icon ("drop-album", 128, Icon.IconType.MIMETYPE, null, true);
-		music_folder = new Icon ("folder-music", 128, Icon.IconType.MIMETYPE, null, true);
-
-		// 22 x 22
-		history_icon = new Icon ("document-open-recent", 22, Icon.IconType.ACTION, null, true);
-
-		// 16 x 16
-		beatbox_icon = new Icon ("beatbox", 16, Icon.IconType.APP, null, true);
-		radio_icon = new Icon ("internet-radio", 16, Icon.IconType.MIMETYPE, null, true);
-		music_icon = new Icon ("library-music", 16, Icon.IconType.MIMETYPE, null, true);
-		podcast_icon = new Icon ("library-podcast", 16, Icon.IconType.MIMETYPE, null, true);
-		//audiobook_icon = new Icon ("library-audiobook", 16, Icon.IconType.MIMETYPE, null, true);
-		playlist_icon = new Icon ("playlist", 16, Icon.IconType.MIMETYPE, null, true);
-		smart_playlist_icon = new Icon ("playlist-automatic", 16, Icon.IconType.MIMETYPE, null, true);
-		lastfm_love_icon = new Icon ("lastfm-love", 16, Icon.IconType.ACTION, null, true);
-		lastfm_ban_icon = new Icon ("lastfm-ban", 16, Icon.IconType.ACTION, null, true);
-		starred_icon = new Icon ("starred", 16, Icon.IconType.STATUS, null, true);
-		not_starred_icon = new Icon ("not-starred", 16, Icon.IconType.STATUS, null, true);
-		info_icon = new Icon ("help-info", 16, Icon.IconType.STATUS, null, true);
-		new_podcast_icon = new Icon ("podcast-new", 16, Icon.IconType.STATUS, null, true);
-
-		ok_icon = new Icon ("dialog-ok", 16, Icon.IconType.ACTION, null, false);
-
-		// SYMBOLIC ICONS
-		process_completed_icon = new Icon ("process-completed-symbolic", 16, Icon.IconType.STATUS, null, true);
-		process_error_icon = new Icon ("process-error-symbolic", 16, Icon.IconType.STATUS, null, true);
-		now_playing_icon = new Icon ("audio-volume-high-symbolic", 16, Icon.IconType.STATUS, null, true);
-		process_stop_icon = new Icon ("process-stop-symbolic", 16, Icon.IconType.ACTION, null, true);
-		shuffle_on_icon = new Icon ("media-playlist-shuffle-symbolic", 16, Icon.IconType.STATUS, null, true);
-		shuffle_off_icon = new Icon ("media-playlist-no-shuffle-symbolic", 16, Icon.IconType.STATUS, null, true);
-		repeat_on_icon = new Icon ("media-playlist-repeat-symbolic", 16, Icon.IconType.STATUS, null, true);
-		repeat_once_icon = new Icon ("media-playlist-repeat-one-symbolic", 16, Icon.IconType.STATUS, null, true);
-		repeat_off_icon = new Icon ("media-playlist-no-repeat-symbolic", 16, Icon.IconType.STATUS, null, true);
-		view_column_icon = new Icon ("view-list-column-symbolic", 16, Icon.IconType.ACTION, null, true);
-		view_details_icon =new Icon ("view-list-details-symbolic", 16, Icon.IconType.ACTION, null, true);
-		view_icons_icon = new Icon ("view-list-icons-symbolic", 16, Icon.IconType.ACTION, null, true);
-		view_video_icon = new Icon ("view-list-video-symbolic", 16, Icon.IconType.ACTION, null, true);
-	}
-}
-

=== modified file 'src/Views/AlbumView/AlbumIconView.vala'
--- src/Views/AlbumView/AlbumIconView.vala	2012-01-28 04:23:58 +0000
+++ src/Views/AlbumView/AlbumIconView.vala	2012-01-31 01:07:25 +0000
@@ -20,6 +20,9 @@
 	bool _is_current_view;
 	bool needsUpdate;
 	
+	private const int BORDER_WIDTH = 6;
+	private const int ITEM_WIDTH = Icons.ALBUM_VIEW_IMAGE_SIZE + BORDER_WIDTH;
+	
 	public signal void itemClicked(string artist, string album);
 	
 	/* medias should be mutable, as we will be sorting it */
@@ -42,9 +45,9 @@
 		_showing_medias = new HashMap<string, LinkedList<int>>();
 		last_search = "";
 		timeout_search = new LinkedList<string>();
-		
-		defaultPix = lm.icons.default_album_art.render (null, null);
-		
+
+		defaultPix = Icons.DEFAULT_ALBUM_ART_PIXBUF;
+
 		buildUI();
 		
 		lm.medias_removed.connect(medias_removed);
@@ -58,7 +61,7 @@
 		
 		icons.set_pixbuf_column(0);
 		icons.set_markup_column(1);
-		icons.set_item_width(134);
+		icons.set_item_width(ITEM_WIDTH);
 		icons.item_padding = 0;
 		icons.spacing = 2;
 		icons.margin = 20;

=== modified file 'src/Views/AlbumView/AlbumListView.vala'
--- src/Views/AlbumView/AlbumListView.vala	2012-01-28 03:27:32 +0000
+++ src/Views/AlbumView/AlbumListView.vala	2012-01-31 01:07:25 +0000
@@ -1,77 +1,101 @@
+/*-
+ * Copyright (c) 2011       Scott Ringwelski <[e-mail]>
+ *
+ * Originally Written by Scott Ringwelski for BeatBox Music Player
+ * BeatBox Music Player: http://www.launchpad.net/beat-box
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 using Gee;
 using Gtk;
 
+/* TODO: Make the entire window draggable */
+
 public class BeatBox.AlbumListView : Window {
 	LibraryManager lm;
-	
+
 	Label album_label;
 	Label artist_label;
 	RatingWidget rating;
 	MusicTreeView mtv;
 	bool setting_songs;
-	
+
 	 private const string WIDGET_STYLESHEET = """
-        .AlbumListDialogBase {
+		.AlbumListDialogBase {
 			background-color: none;
-            background-image: -gtk-gradient (radial, center center, 0,
+			background-image: -gtk-gradient (radial, center center, 0,
 											 center center, 1,
-                                             from (shade (#404040, 1.0)),
-                                             to (shade (#232323, 1.0)));
-            border-width: 0;
-            border-style: none;
-            border-radius: 0;
-            padding: 0;
-        }
-        
-        .label {
+											 from (shade (#404040, 1.0)),
+											 to (shade (#232323, 1.0)));
+			border-width: 0;
+			border-style: none;
+			border-radius: 0;
+			padding: 0;
+		}
+
+		*, .label {
 			color: #ffffff;
 		}
-        
-        GtkTreeView {
+
+		GtkTreeView {
 			color: #ffffff;
 			background-color: #3a3a3a;
 		}
-        
-        GtkTreeView row {
+
+		GtkTreeView row {
 			border-width: 0;
-            border-style: none;
-            border-radius: 0;
-            padding: 0;
+			border-style: none;
+			border-radius: 0;
+			padding: 0;
 		}
-		
+
 		GtkTreeView row:selected {
-			    background-image: -gtk-gradient (linear,
-                    left top,
-                    left bottom,
-                    from (shade (@selected_bg_color, 1.30)),
-                    to (shade (@selected_bg_color, 0.98)));
+				background-image: -gtk-gradient (linear,
+					left top,
+					left bottom,
+					from (shade (@selected_bg_color, 1.30)),
+					to (shade (@selected_bg_color, 0.98)));
 		}
-        
-        GtkTreeView row:nth-child(even) {
+
+		GtkTreeView row:nth-child(even) {
 			background-color: #3a3a3a;
-        }
-        
-        GtkTreeView row:nth-child(odd) {
-            background-color: #4D4D4D;
-        }
-        
+		}
+
+		GtkTreeView row:nth-child(odd) {
+			background-color: #4D4D4D;
+		}
+
 		.AlbumListDialogClose {
 			background-image: -gtk-gradient (linear,
 				left top,
 				left bottom,
 				from (shade (@bg_color, 1.15)),
 				to (shade (@bg_color, 1.03)));
-			
+
 			-unico-border-gradient: -gtk-gradient (linear,
 				left top, left bottom,
 				from (shade (@bg_color, 0.78)),
 				to (shade (@bg_color, 0.60)));
 		}
-     """;
-	
+	 """;
+
 	public AlbumListView(LibraryManager lm) {
 		this.lm = lm;
-		
+
 		set_transient_for(lm.lw);
 		window_position = Gtk.WindowPosition.CENTER_ON_PARENT;
 		//set_keep_above(true);
@@ -83,28 +107,28 @@
 		set_title("Album List");
 		set_size_request(350, 400);
 		set_default_size(350, 400);
-		
+
 		// apply css styling
 		var style_provider = new CssProvider();
 
-        try  {
-            style_provider.load_from_data (WIDGET_STYLESHEET, -1);
-        } catch (Error e) {
-            stderr.printf ("\nAlbumListView: Couldn't load style provider.\n");
-        }
-
-        get_style_context().add_class("AlbumListDialogBase");
-        get_style_context().add_provider(style_provider, STYLE_PROVIDER_PRIORITY_APPLICATION);
-        		
+		try  {
+			style_provider.load_from_data (WIDGET_STYLESHEET, -1);
+		} catch (Error e) {
+			stderr.printf ("\nAlbumListView: Couldn't load style provider.\n");
+		}
+
+		get_style_context().add_class("AlbumListDialogBase");
+		get_style_context().add_provider(style_provider, STYLE_PROVIDER_PRIORITY_APPLICATION);
+
 		// add close button
 		var close = new Gtk.Button ();
-        close.set_image (new Gtk.Image.from_stock ("gtk-close", Gtk.IconSize.MENU));
-        close.get_style_context().add_class("AlbumListDialogClose");
+		close.set_image (Icons.render_image ("gtk-close", Gtk.IconSize.MENU));
+		close.get_style_context().add_class("AlbumListDialogClose");
 		close.hexpand = close.vexpand = false;
 		close.halign = Gtk.Align.START;
 		close.set_relief(Gtk.ReliefStyle.NONE);
 		close.clicked.connect( () =>  { this.hide(); });
-		
+
 		// add album artist/album labels
 		album_label = new Label("Album");
 		artist_label = new Label("Artist");
@@ -118,33 +142,34 @@
 		mtv.apply_style_to_view(style_provider);
 		//mtv.get_style_context().add_class("ListView");
 		mtv.vexpand = true;
-		
+
 		// add rating
-		rating = new RatingWidget(null, true, IconSize.BUTTON);
-		
+		rating = new RatingWidget(get_style_context(), true, IconSize.BUTTON, true);
+		rating.set_transparent (true);
+
 		var all_area = new Box(Orientation.VERTICAL, 0);
 		all_area.pack_start(close, false, false, 0);
 		all_area.pack_start(album_label, false, true, 0);
 		all_area.pack_start(artist_label, false, true, 3);
-        all_area.pack_start(mtv, true, true, 6);
-        all_area.pack_start(rating, false, true, 12);
-        
-        add(all_area);
-        
-        rating.rating_changed.connect(rating_changed);
-        this.focus_out_event.connect(focus_out);
+		all_area.pack_start(mtv, true, true, 6);
+		all_area.pack_start(rating, false, true, 12);
+
+		add(all_area);
+
+		rating.rating_changed.connect(rating_changed);
+		this.focus_out_event.connect(focus_out);
 	}
-	
+
 	public void set_songs_from_media(Media m) {
 		setting_songs = true;
 		album_label.set_markup("<span size=\"large\" color=\"#ffffff\"><b>" + m.album.replace("&", "&amp;") + "</b></span>");
 		artist_label.set_markup("<span color=\"#ffffff\"><b>" + m.album_artist.replace("&", "&amp;") + "</b></span>");
-		
+
 		var songs = new LinkedList<int>();
 		var albums = new LinkedList<int>();
-        lm.do_search("", ((ViewWrapper)lm.lw.sideTree.getSelectedWidget()).hint, "All Genres", m.album_artist, m.album, ((ViewWrapper)lm.lw.sideTree.getSelectedWidget()).get_media_ids(), ref songs, ref albums);
-        
-        // decide rating. unless all are equal, show 0.
+		lm.do_search("", ((ViewWrapper)lm.lw.sideTree.getSelectedWidget()).hint, "All Genres", m.album_artist, m.album, ((ViewWrapper)lm.lw.sideTree.getSelectedWidget()).get_media_ids(), ref songs, ref albums);
+
+		// decide rating. unless all are equal, show 0.
 		int overall_rating = -1;
 		foreach(int i in songs) {
 			if(overall_rating == -1)
@@ -155,28 +180,28 @@
 			}
 		}
 		rating.set_rating(overall_rating);
-        
+
 		mtv.set_show_next(songs);
 		mtv.populate_view();
 		setting_songs = false;
 	}
-	
+
 	void rating_changed(int new_rating) {
 		if(setting_songs)
 			return;
-		
+
 		var updated = new LinkedList<Media>();
 		foreach(int i in mtv.get_medias()) {
 			lm.media_from_id(i).rating = new_rating;
 			updated.add(lm.media_from_id(i));
 		}
-		
+
 		lm.update_medias(updated, false, true);
 	}
-	
+
 	bool focus_out(Gdk.EventFocus event) {
 		//this.hide();
-		
+
 		return false;
 	}
 }

=== modified file 'src/Views/AlbumView/AlbumViewModel.vala'
--- src/Views/AlbumView/AlbumViewModel.vala	2012-01-24 20:37:29 +0000
+++ src/Views/AlbumView/AlbumViewModel.vala	2012-01-31 01:07:25 +0000
@@ -50,7 +50,7 @@
 	/** Initialize data storage, columns, etc. **/
 	public AlbumViewModel(LibraryManager lm, Gdk.Pixbuf defaultImage) {
 		this.lm = lm;
-		this.defaultImage = lm.get_cover_shadow(defaultImage);
+		this.defaultImage = Icons.get_pixbuf_shadow(defaultImage);
 		removing_medias = false;
 
 		rows = new Sequence<Media>();

=== modified file 'src/Views/CellDataFunctionHelper.vala'
--- src/Views/CellDataFunctionHelper.vala	2012-01-02 16:12:39 +0000
+++ src/Views/CellDataFunctionHelper.vala	2012-01-31 01:07:25 +0000
@@ -29,8 +29,8 @@
 	private Pixbuf starred;
 	
 	public CellDataFunctionHelper(LibraryManager lm) {
-		this.starred = lm.icons.starred_icon.render (IconSize.MENU, null);
-		this.not_starred = lm.icons.not_starred_icon.render (IconSize.MENU, null);
+		this.starred = Icons.STARRED_ICON.render (IconSize.MENU, null);
+		this.not_starred = Icons.NOT_STARRED_ICON.render (IconSize.MENU, null);
 		
 		_canvas = new Gdk.Pixbuf(Gdk.Colorspace.RGB, true, 8, starred.width * 5, starred.height);
 	}

=== modified file 'src/Views/DeviceSummaryWidget.vala'
--- src/Views/DeviceSummaryWidget.vala	2012-01-28 19:50:35 +0000
+++ src/Views/DeviceSummaryWidget.vala	2012-01-31 01:07:25 +0000
@@ -319,11 +319,11 @@
 		
 		/* add entire library options */
 		musicList.append(out iter);
-		musicList.set(iter, 0, null, 1, "All Music", 2, lm.icons.music_icon.render(IconSize.MENU, musicDropdown.get_style_context()));
+		musicList.set(iter, 0, null, 1, "All Music", 2, Icons.MUSIC_ICON.render(IconSize.MENU));
 		podcastList.append(out iter);
-		podcastList.set(iter, 0, null, 1, "All Podcasts", 2, lm.icons.podcast_icon.render(IconSize.MENU, podcastDropdown.get_style_context()));
+		podcastList.set(iter, 0, null, 1, "All Podcasts", 2, Icons.PODCAST_ICON.render(IconSize.MENU));
 		//audiobookList.append(out iter);
-		//audiobookList.set(iter, 0, null, 1, "All Audiobooks");//, 2, lm.icons.audiobook_icon.render(IconSize.MENU, audiobookDropdown.get_style_context()));
+		//audiobookList.set(iter, 0, null, 1, "All Audiobooks");//, 2, Icons.audiobook_icon.render(IconSize.MENU, audiobookDropdown.get_style_context()));
 		
 		/* add separator */
 		musicList.append(out iter);
@@ -334,8 +334,8 @@
 		//audiobookList.set(iter, 0, null, 1, "<separator_item_unique_name>");
 		
 		/* add all playlists */
-		var smart_playlist_pix = lm.icons.smart_playlist_icon.render(IconSize.MENU, musicDropdown.get_style_context());
-		var playlist_pix = lm.icons.playlist_icon.render(IconSize.MENU, musicDropdown.get_style_context());
+		var smart_playlist_pix = Icons.SMART_PLAYLIST_ICON.render(IconSize.MENU, null);
+		var playlist_pix = Icons.PLAYLIST_ICON.render(IconSize.MENU, null);
 		foreach(var p in lm.smart_playlists()) {
 			//bool music, podcasts, audiobooks;
 			//test_media_types(lm.medias_from_smart_playlist(p.rowid), out music, out podcasts, out audiobooks);

=== modified file 'src/Views/ListView/MusicTreeModel.vala'
--- src/Views/ListView/MusicTreeModel.vala	2012-01-25 02:40:53 +0000
+++ src/Views/ListView/MusicTreeModel.vala	2012-01-31 01:07:25 +0000
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2011       Scott Ringwelski <[e-mail]>
+ * Copyright (c) 2011		Scott Ringwelski <[e-mail]>
  *
  * Originally Written by Scott Ringwelski for BeatBox Music Player
  * BeatBox Music Player: http://www.launchpad.net/beat-box
@@ -26,7 +26,7 @@
 
 public class BeatBox.CompareFuncHolder : GLib.Object {
 	public unowned TreeIterCompareFunc sort_func;
-	
+
 	public CompareFuncHolder(TreeIterCompareFunc func) {
 		sort_func = func;
 	}
@@ -35,53 +35,55 @@
 public class BeatBox.MusicTreeModel : GLib.Object, TreeModel, TreeSortable {
 	LibraryManager lm;
 	int stamp; // all iters must match this
-	Gdk.Pixbuf _playing;
-	Gdk.Pixbuf _completed;
-	Gdk.Pixbuf _saved_locally;
-	Gdk.Pixbuf _new_podcast;
+	GLib.Icon _playing;
+	GLib.Icon _completed;
+	GLib.Icon _saved_locally;
+	GLib.Icon _new_podcast;
 	ViewWrapper.Hint hint;
 	public bool is_current;
-	
-    /* data storage variables */
-    Sequence<int> rows;
-    private LinkedList<string> _columns;
-    
-    /* treesortable stuff */
-    private int sort_column_id;
-    private SortType sort_direction;
-    private unowned TreeIterCompareFunc default_sort_func;
-    private HashMap<int, CompareFuncHolder> column_sorts;
-    bool removing_medias;
-    
-    /* custom signals for custom treeview. for speed */
-    public signal void rows_changed(LinkedList<TreePath> paths, LinkedList<TreeIter?> iters);
-    public signal void rows_deleted (LinkedList<TreePath> paths);
+
+	/* data storage variables */
+	Sequence<int> rows;
+	private LinkedList<string> _columns;
+
+	/* treesortable stuff */
+	private int sort_column_id;
+	private SortType sort_direction;
+	private unowned TreeIterCompareFunc default_sort_func;
+	private HashMap<int, CompareFuncHolder> column_sorts;
+	bool removing_medias;
+
+	/* custom signals for custom treeview. for speed */
+	public signal void rows_changed(LinkedList<TreePath> paths, LinkedList<TreeIter?> iters);
+	public signal void rows_deleted (LinkedList<TreePath> paths);
 	public signal void rows_inserted (LinkedList<TreePath> paths, LinkedList<TreeIter?> iters);
-	
+
 	/** Initialize data storage, columns, etc. **/
-	public MusicTreeModel(LibraryManager lm, LinkedList<string> column_types, Gdk.Pixbuf playing, ViewWrapper.Hint hint, TreeView parent) {
+	public MusicTreeModel(LibraryManager lm, LinkedList<string> column_types, ViewWrapper.Hint hint) {
 		this.lm = lm;
 		_columns = column_types;
-		_playing = playing;
-		_completed = lm.icons.process_completed_icon.render(Gtk.IconSize.MENU, parent.get_style_context());
-		_saved_locally = lm.lw.render_icon(Gtk.Stock.SAVE, IconSize.MENU, null);
-		_new_podcast = lm.icons.new_podcast_icon.render(IconSize.MENU, parent.get_style_context());
+
+		_playing = Icons.MEDIA_PLAY_SYMBOLIC.get_gicon ();
+		_completed = Icons.PROCESS_COMPLETED_ICON.get_gicon ();
+		_saved_locally = new GLib.ThemedIcon.with_default_fallbacks (Gtk.Stock.SAVE);
+		_new_podcast = Icons.NEW_PODCAST_ICON.get_gicon ();
+
 		this.hint = hint;
 		removing_medias = false;
 
 		rows = new Sequence<int>();
-       
-       sort_column_id = -2;
-       sort_direction = SortType.ASCENDING;
-       column_sorts = new HashMap<int, CompareFuncHolder>();
-       
-       stamp = (int)GLib.Random.next_int();
+
+		sort_column_id = -2;
+		sort_direction = SortType.ASCENDING;
+		column_sorts = new HashMap<int, CompareFuncHolder>();
+
+		stamp = (int)GLib.Random.next_int();
 	}
-	
+
 	/** Returns Type of column at index_ **/
 	public Type get_column_type (int col) {
 		if(_columns[col] == " ") {
-			return typeof(Gdk.Pixbuf);
+			return typeof(GLib.Icon);
 		}
 		else if(_columns[col] == "Title" || _columns[col] == "Artist" || _columns[col] == "Album" || _columns[col] == "Genre") {
 			return typeof(string);
@@ -100,20 +102,20 @@
 	public bool get_iter (out TreeIter iter, TreePath path) {
 		iter = TreeIter();
 		int path_index = path.get_indices()[0];
-		
+
 		if(rows.get_length() == 0 || path_index < 0 || path_index >= rows.get_length())
 			return false;
-		
-        var seq_iter = rows.get_iter_at_pos(path_index);
-        if(seq_iter == null)
+
+		var seq_iter = rows.get_iter_at_pos(path_index);
+		if(seq_iter == null)
 			return false;
-        
+
 		iter.stamp = this.stamp;
 		iter.user_data = seq_iter;
-        
+
 		return true;
 	}
-	
+
 	/** Returns the number of columns supported by tree_model. **/
 	public int get_n_columns () {
 		return _columns.size;
@@ -129,12 +131,12 @@
 		val = Value(get_column_type(column));
 		if(iter.stamp != this.stamp || column < 0 || column >= _columns.size || removing_medias)
 			return;
-		
+
 		if(!((SequenceIter<ValueArray>)iter.user_data).is_end()) {
 			Media s = lm.media_from_id(rows.get(((SequenceIter<int>)iter.user_data)));
 			if(s == null)
 				return;
-			
+
 			if(column == 0)
 				val = s.rowid;
 			else if(column == 1) {
@@ -149,7 +151,7 @@
 				else if(s.mediatype == 1 && !s.uri.has_prefix("http://"))
 					val = _saved_locally;
 				else
-					val = Value(typeof(Gdk.Pixbuf));
+					val = Value(typeof(GLib.Icon));
 			}
 			else if(column == 2)
 				val = ((SequenceIter<int>)iter.user_data).get_position() + 1;
@@ -194,7 +196,7 @@
 
 	/** Returns true if iter has children, false otherwise. **/
 	public bool iter_has_child (TreeIter iter) {
-		
+
 		return false;
 	}
 
@@ -202,7 +204,7 @@
 	public int iter_n_children (TreeIter? iter) {
 		if(iter == null)
 			return rows.get_length();
-		
+
 		return 0;
 	}
 
@@ -210,32 +212,32 @@
 	public bool iter_next (ref TreeIter iter) {
 		if(iter.stamp != this.stamp)
 			return false;
-		
+
 		iter.user_data = ((SequenceIter)iter.user_data).next();
-		
+
 		if(((SequenceIter)iter.user_data).is_end())
 			return false;
-		
+
 		return true;
 	}
 
 	/** Sets iter to be the child of parent, using the given index. **/
 	public bool iter_nth_child (out TreeIter iter, TreeIter? parent, int n) {
 		iter = TreeIter();
-		
+
 		if(n < 0 || n >= rows.get_length() || parent != null)
 			return false;
-		
+
 		iter.stamp = this.stamp;
 		iter.user_data = rows.get_iter_at_pos(n);
-		
+
 		return true;
 	}
 
 	/** Sets iter to be the parent of child. **/
 	public bool iter_parent (out TreeIter iter, TreeIter child) {
 		iter = TreeIter();
-		
+
 		return false;
 	}
 
@@ -244,132 +246,132 @@
 
 	/** Lets the tree unref the node. **/
 	public void unref_node (TreeIter iter) {}
-    
-    /** Some actual functions to use this model **/
-    public TreeIter? getIterFromRowid(int id) {
+
+	/** Some actual functions to use this model **/
+	public TreeIter? getIterFromRowid(int id) {
 		SequenceIter s_iter = rows.get_begin_iter();
-		
+
 		for(int index = 0; index < rows.get_length(); ++index) {
 			s_iter = rows.get_iter_at_pos(index);
-			
+
 			if(id == rows.get(s_iter)) {
 				TreeIter iter = TreeIter();
 				iter.stamp = this.stamp;
 				iter.user_data = s_iter;
-				
+
 				return iter;
 			}
 		}
-		
+
 		return null;
 	}
-	
+
 	public int getRowidFromIter(TreeIter iter) {
 		if(iter.stamp != this.stamp || ((SequenceIter)iter.user_data).is_end())
 			return 0;
-		
+
 		return rows.get(((SequenceIter<int>)iter.user_data));
 	}
-    
-    public int getRowidFromPath(string path) {
+
+	public int getRowidFromPath(string path) {
 		if(int.parse(path) < 0 || int.parse(path) >= rows.get_length())
 			return 0;
-		
+
 		SequenceIter s_iter = rows.get_iter_at_pos(int.parse(path));
-		
+
 		if(s_iter.is_end())
 			return 0;
-		
+
 		return rows.get(s_iter);
 	}
-    
-    /** simply adds iter to the model **/
-    public void append(out TreeIter iter) {
+
+	/** simply adds iter to the model **/
+	public void append(out TreeIter iter) {
 		iter = TreeIter();
-		
+
 		SequenceIter<int> added = rows.append(0);
 		iter.stamp = this.stamp;
 		iter.user_data = added;
 	}
-	
+
 	/** convenience method to insert medias into the model. No iters returned. **/
-    public void append_medias(Collection<int> medias, bool emit) {
+	public void append_medias(Collection<int> medias, bool emit) {
 		foreach(int id in medias) {
 			SequenceIter<int> added = rows.append(id);
-		
+
 			if(emit) {
 				TreePath path = new TreePath.from_string(added.get_position().to_string());
-			
+
 				TreeIter iter = TreeIter();
 				iter.stamp = this.stamp;
 				iter.user_data = added;
-				
+
 				row_inserted(path, iter);
 			}
 		}
 	}
-	
+
 	public void turnOffPixbuf(int id) {
 		SequenceIter s_iter = rows.get_begin_iter();
-		
+
 		for(int index = 0; index < rows.get_length(); ++index) {
 			s_iter = rows.get_iter_at_pos(index);
-			
+
 			if(id == rows.get(s_iter)) {
 				TreePath path = new TreePath.from_string(s_iter.get_position().to_string());
-				
+
 				TreeIter iter = TreeIter();
 				iter.stamp = this.stamp;
 				iter.user_data = s_iter;
-				
+
 				row_changed(path, iter);
 				return;
 			}
 		}
 	}
-	
+
 	// just a convenience function
 	public void updateMedia(int id, bool is_current) {
 		ArrayList<int> temp = new ArrayList<int>();
 		temp.add(id);
 		updateMedias(temp, is_current);
 	}
-	
+
 	public void updateMedias(owned Collection<int> rowids, bool is_current) {
 		SequenceIter s_iter = rows.get_begin_iter();
-		
+
 		for(int index = 0; index < rows.get_length(); ++index) {
 			s_iter = rows.get_iter_at_pos(index);
-			
+
 			if(rowids.contains(rows.get(s_iter))) {
 				TreePath path = new TreePath.from_string(s_iter.get_position().to_string());
-			
+
 				TreeIter iter = TreeIter();
 				iter.stamp = this.stamp;
 				iter.user_data = s_iter;
-				
+
 				row_changed(path, iter);
-				
+
 				// can't do this. rowids must be read only
 				//rowids.remove(rows.get(s_iter));
 			}
-			
+
 			if(rowids.size <= 0)
 				return;
 		}
 	}
-	
+
 	public new void set(TreeIter iter, ...) {
 		if(iter.stamp != this.stamp)
 			return;
-		
+
 		var args = va_list(); // now call args.arg() to poll
-		
+
 		while(true) {
 			int col = args.arg();
 			if(col < 0 || col >= _columns.size)
 				return;
-			
+
 			/*else if(_columns[col] == " ") {
 				stdout.printf("set oh hi3\n");
 				Gdk.Pixbuf val = args.arg();
@@ -387,127 +389,127 @@
 			}*/
 		}
 	}
-	
+
 	public void remove(TreeIter iter) {
 		if(iter.stamp != this.stamp)
 			return;
-			
+
 		var path = new TreePath.from_string(((SequenceIter)iter.user_data).get_position().to_string());
 		rows.remove((SequenceIter<int>)iter.user_data);
 		row_deleted(path);
 	}
-	
+
 	/*public void remove_iters(Collection<TreeIter?> iters, bool emit) {
 		foreach(TreeIter iter in iters) {
 			if(iter.stamp != this.stamp)
 				return;
-				
+
 			var path = new TreePath.from_string(((SequenceIter)iter.user_data).get_position().to_string());
 			rows.remove((SequenceIter<int>)iter.user_data);
-			
+
 			if(emit)
 				row_deleted(path);
 		}
 	}*/
-	
+
 	public void removeMedias(Collection<int> rowids) {
 		removing_medias = true;
 		SequenceIter s_iter = rows.get_begin_iter();
-		
+
 		for(int index = 0; index < rows.get_length(); ++index) {
 			s_iter = rows.get_iter_at_pos(index);
-			
+
 			if(rowids.contains(rows.get(s_iter))) {
 				int rowid = rows.get(s_iter);
 				TreePath path = new TreePath.from_string(s_iter.get_position().to_string());
-					
+
 				rows.remove(s_iter);
-					
+
 				row_deleted(path);
 				rowids.remove(rowid);
 				--index;
 			}
-			
+
 			if(rowids.size <= 0) {
 				removing_medias = false;
 				return;
 			}
 		}
-		
+
 		removing_medias = false;
 	}
-	
+
 	public LinkedList<int> getOrderedMedias() {
 		var rv = new LinkedList<int>();
 		SequenceIter s_iter = rows.get_begin_iter();
-		
+
 		for(int index = 0; index < rows.get_length(); ++index) {
 			s_iter = rows.get_iter_at_pos(index);
-			
+
 			int rowid = rows.get(s_iter);
-			
+
 			rv.add(rowid);
 		}
-		
+
 		return rv;
 	}
-	
+
 	/** Fills in sort_column_id and order with the current sort column and the order. **/
 	public bool get_sort_column_id(out int sort_column_id, out SortType order) {
 		sort_column_id = this.sort_column_id;
 		order = sort_direction;
-		
+
 		return true;
 	}
-	
+
 	/** Returns true if the model has a default sort function. **/
 	public bool has_default_sort_func() {
 		return (default_sort_func != null);
 	}
-	
+
 	/** Sets the default comparison function used when sorting to be sort_func. **/
 	public void set_default_sort_func(owned TreeIterCompareFunc sort_func) {
 		default_sort_func = sort_func;
 	}
-	
+
 	/** Sets the current sort column to be sort_column_id. **/
 	public void set_sort_column_id(int sort_column_id, SortType order) {
 		bool changed = (this.sort_column_id != sort_column_id || order != sort_direction);
-		
+
 		this.sort_column_id = sort_column_id;
 		sort_direction = order;
-		
+
 		if(changed && sort_column_id >= 0) {
 			/* do the sort for reals */
 			rows.sort_iter(sequenceIterCompareFunc);
-			
+
 			sort_column_changed();
 		}
 	}
-	
+
 	public void resort() {
 		rows.sort_iter(sequenceIterCompareFunc);
 		sort_column_changed();
 	}
-	
+
 	/** Sets the comparison function used when sorting to be sort_func. **/
 	public void set_sort_func(int sort_column_id, owned TreeIterCompareFunc sort_func) {
 		column_sorts.set(sort_column_id, new CompareFuncHolder(sort_func));
 	}
-	
+
 	/** Custom function to use built in sort in GLib.Sequence to our advantage **/
 	public int sequenceIterCompareFunc(SequenceIter<int> a, SequenceIter<int> b) {
 		int rv;
-		
+
 		if(sort_column_id < 0)
 			return 0;
-		
+
 		Media a_media = lm.media_from_id(rows.get(a));
 		Media b_media = lm.media_from_id(rows.get(b));
-		
+
 		if(a_media == null || b_media == null)
 			return 1;
-		
+
 		if(_columns.get(sort_column_id) == "Artist") {
 			if(a_media.album_artist.down() == b_media.album_artist.down()) {
 				if(a_media.album.down() == b_media.album.down()) {
@@ -528,7 +530,7 @@
 					rv = (int)((sort_direction == SortType.ASCENDING) ? (int)(a_media.track - b_media.track) : (int)(b_media.track - a_media.track));
 				else
 					rv = (int)((int)a_media.album_number - (int)b_media.album_number);
-				
+
 			}
 			else {
 				if(a_media.album == "")
@@ -579,19 +581,19 @@
 		else {
 			rv = 1;
 		}
-		
+
 		if(sort_direction == SortType.DESCENDING)
 			rv = (rv > 0) ? -1 : 1;
-		
+
 		return rv;
 	}
-	
+
 	private int advancedStringCompare(string a, string b) {
 		if(a == "" && b != "")
 			return 1;
 		else if(a != "" && b == "")
 			return -1;
-		
+
 		return (a > b) ? 1 : -1;
 	}
 }

=== modified file 'src/Views/ListView/MusicTreeView.vala'
--- src/Views/ListView/MusicTreeView.vala	2012-01-27 04:55:46 +0000
+++ src/Views/ListView/MusicTreeView.vala	2012-01-31 01:07:25 +0000
@@ -28,30 +28,30 @@
 	public BeatBox.LibraryWindow lw;
 	TreeView view;
 	MusicTreeModel music_model;
-	
+
 	Collection<int> _show_next; // these are populated if necessary when user opens this view.
 	//private Collection<int> _medias;
 	Collection<int> _showing_medias;
 	LinkedList<string> _columns;
-	
-	int relative_id;// if playlist, smart playlist, etc. 
+
+	int relative_id;// if playlist, smart playlist, etc.
 	ViewWrapper.Hint hint; // playlist, queue, smart_playlist, etc. changes how it behaves.
 	string sort_column;
 	SortType sort_direction;
 	bool removing_medias;
-	
+
 	bool _is_current_view;
 	bool _is_current;
 	bool dragging;
-	
+
 	LinkedList<string> timeout_search;//stops from doing useless search (timeout)
 	string last_search;//stops from searching same thing multiple times
 	bool showing_all; // stops from searching unnecesarilly when changing b/w 0 words and search ViewWrapper.Hint, etc.
-	
+
 	bool scrolled_recently;
-	
+
 	CellDataFunctionHelper cellHelper;
-	
+
 	//for header column chooser
 	Gtk.Menu columnChooserMenu;
 	CheckMenuItem columnNumber;
@@ -69,7 +69,7 @@
 	CheckMenuItem columnDateAdded;
 	CheckMenuItem columnLastPlayed;
 	CheckMenuItem columnBPM;
-	
+
 	//for media list right click
 	Gtk.Menu mediaMenuActionMenu;
 	Gtk.MenuItem mediaEditMedia;
@@ -82,7 +82,7 @@
 	RatingWidgetMenu rating_item;
 	Gtk.MenuItem mediaRemove;
 	Gtk.MenuItem importToLibrary;
-	
+
 	// for editing cells in-treeview
 	CellRendererText cellTrack;
 	CellRendererText cellTitle;
@@ -95,189 +95,188 @@
 	CellRendererText cellSkips;
 	CellRendererText cellPlays;
 	CellRendererText cellBitrate;
-	
+
 	/**
 	 * for sort_id use 0+ for normal, -1 for auto, -2 for none
 	 */
 	public MusicTreeView(BeatBox.LibraryManager lmm, BeatBox.LibraryWindow lww, string sort, Gtk.SortType dir, ViewWrapper.Hint the_hint, int id) {
 		lm = lmm;
 		lw = lww;
-		
+
 		//_medias = new LinkedList<int>();
 		_showing_medias = new LinkedList<int>();
 		_columns = new LinkedList<string>();
-		
+
 		last_search = "";
 		timeout_search = new LinkedList<string>();
 		showing_all = true;
 		removing_medias = false;
-		
+
 		sort_column = sort;
 		sort_direction = dir;
 		hint = the_hint;
 		relative_id = id;
-		
+
 		cellHelper = new CellDataFunctionHelper(lm);
-		
+
 		lm.medias_updated.connect(medias_updated);
 		lm.medias_removed.connect(medias_removed);
 		lm.media_played.connect(media_played);
 		lm.playback_stopped.connect(playback_stopped);
 		lm.current_cleared.connect(current_cleared);
-		
+
 		buildUI();
 	}
-	
+
 	/* interface functions */
 	public void set_is_current(bool val) {
 		_is_current = val;
 		music_model.is_current = val;
 	}
-	
+
 	public bool get_is_current() {
 		return _is_current;
 	}
-	
+
 	public void set_is_current_view(bool val) {
 		_is_current_view = val;
 	}
-	
+
 	public bool get_is_current_view() {
 		return _is_current_view;
 	}
-	
+
 	public void set_hint(ViewWrapper.Hint the_hint) {
 		hint = the_hint;
 		updateSensitivities();
 	}
-	
+
 	public ViewWrapper.Hint get_hint() {
 		return hint;
 	}
-	
+
 	public void set_relative_id(int id) {
 		relative_id = id;
 	}
-	
+
 	public int get_relative_id() {
 		return relative_id;
 	}
-	
+
 	public void set_show_next(Collection<int> medias) {
 		_show_next = medias;
 	}
-	
+
 	public Collection<int> get_medias() {
 		return music_model.getOrderedMedias();
 	}
-	
+
 	public void set_as_current_list(int media_id, bool is_initial) {
 		var ordered_songs = music_model.getOrderedMedias();
 		stdout.printf("there are %d ordered songs\n", ordered_songs.size);
-		
+
 		bool shuffle = (lm.shuffle == LibraryManager.Shuffle.ALL);
-		
+
 		lm.clearCurrent();
 		int i = 0;
 		lm.current_index = 0;
 		foreach(int id in ordered_songs) {
 			lm.addToCurrent(id);
-			
+
 			if(!shuffle && lm.media_info.media != null && lm.media_info.media.rowid == id && media_id == 0)
 				lm.current_index = i;
 			else if(!shuffle && lm.media_info.media != null && media_id == id)
 				lm.current_index = i;
-			
+
 			++i;
 		}
-		
+
 		set_is_current(true);
-		
+
 		if(lm.media_info.media != null)
 			music_model.updateMedia(lm.media_info.media.rowid, get_is_current());
 		stdout.printf("current list is %d and index %d\n", lm.current_medias().size, lm.current_index);
 		lm.setShuffleMode(lm.shuffle, shuffle && is_initial);
 	}
-	
+
 	public void append_medias(Collection<int> new_medias) {
 		var all_medias = new LinkedList<int>();
 		all_medias.add_all(_showing_medias);
 		all_medias.add_all(new_medias);
 		_showing_medias = all_medias;
-		
+
 		music_model.append_medias(new_medias, true);
 		music_model.resort();
 		if(visible)	queue_draw();
 	}
-	
+
 	public void remove_medias(Collection<int> to_remove) {
 		var all_medias = new LinkedList<int>();
 		all_medias.add_all(_showing_medias);
 		all_medias.remove_all(to_remove);
 		_showing_medias = all_medias;
-		
+
 		music_model.removeMedias(to_remove);
 		if(visible)	queue_draw();
 	}
-	
+
 	public void populate_view() {
 		/** NOTE: This could have a bad effect if user coincidentally
-		 * searches for something that has same number of results as 
+		 * searches for something that has same number of results as
 		 * a different search. However, this cuts lots of unecessary
 		 * loading of lists/icon lists */
 		/*if(lw.searchField.get_text() == "" && _showing_medias.size == medias.size && ViewWrapper.Hint != ViewWrapper.Hint.HISTORY && ViewWrapper.Hint != ViewWrapper.Hint.QUEUE && !force) {
 			return;
 		}*/
-		
+
 		if(_show_next == _showing_medias)
 			return;
-			
+
 		_showing_medias = _show_next;
-		
+
 		view.freeze_child_notify();
 		view.set_model(null);
-		
+
 		int sort_col;
 		SortType sort_dir;
 		music_model.get_sort_column_id(out sort_col, out sort_dir);
-		
-		var now_playing_icon = lm.icons.now_playing_icon.render (IconSize.MENU, view.get_style_context());
-		music_model = new MusicTreeModel(lm, get_column_strings(), now_playing_icon, get_hint(), view);
+