@@ -, +, @@ 
 displays as "visual material"
 - Apply the patch and locate records with "type of record" specified in
   the leader as 'g', 'k', and 'r'.
   A sample MARC file will be attached to the bug report with one of
   each type of record. Import the records and search your catalog for
   "Bug_21518."
 - View the records in search results and their detail pages, both in
   the OPAC and the staff client. In all cases the correct material type
   icon should be displayed.
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl            |  13 +++++++++----
 .../prog/en/xslt/MARC21slim2intranetResults.xsl           |   4 +++-
 koha-tmpl/intranet-tmpl/prog/img/famfamfam/OB.png         | Bin 0 -> 825 bytes
 koha-tmpl/intranet-tmpl/prog/img/famfamfam/PK.png         | Bin 0 -> 606 bytes
 .../intranet-tmpl/prog/img/famfamfam/silk/object.png      | Bin 0 -> 825 bytes
 .../intranet-tmpl/prog/img/famfamfam/silk/picture.png     | Bin 0 -> 606 bytes
 koha-tmpl/opac-tmpl/lib/famfamfam/PK.png                  | Bin 0 -> 606 bytes
 7 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/OB.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/PK.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/object.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/picture.png
 create mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/PK.png
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl	
+++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl	
@@ -61,8 +61,11 @@ 
                 <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
                 <xsl:when test="$leader6='m'">CF</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
-                <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
+                <xsl:when test="$leader6='g'">VM</xsl:when>
+                <xsl:when test="$leader6='k'">PK</xsl:when>
+                <xsl:when test="$leader6='r'">OB</xsl:when>
+                <xsl:when test="$leader6='i'">SO</xsl:when>
+                <xsl:when test="$leader6='j'">MU</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
             </xsl:choose>
         </xsl:variable>
@@ -82,11 +85,13 @@ 
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'">Book</xsl:when>
-                <xsl:when test="$leader6='o'">Kit</xsl:when>				
+                <xsl:when test="$leader6='o'">Kit</xsl:when>
                 <xsl:when test="$leader6='p'">Mixed materials</xsl:when>
                 <xsl:when test="$leader6='m'">Computer file</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'">Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">Visual material</xsl:when>
+                <xsl:when test="$leader6='g'">Film</xsl:when>
+                <xsl:when test="$leader6='k'">Picture</xsl:when>
+                <xsl:when test="$leader6='r'">Object</xsl:when>
                 <xsl:when test="$leader6='j'">Music</xsl:when>
                 <xsl:when test="$leader6='i'">Sound</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">Score</xsl:when>
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl	
+++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl	
@@ -503,7 +503,9 @@ 
                 <xsl:when test="$leader6='p'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype mt_icon_MX"/>Mixed materials</xsl:when>
                 <xsl:when test="$leader6='m'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype mt_icon_CF"/> Computer file</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/map.png" alt="map" title="map" class="materialtype mt_icon_MP"/> Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype mt_icon_VM"/> Visual material</xsl:when>
+                <xsl:when test="$leader6='g'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/film.png" alt="Film" class="materialtype mt_icon_VM"/> Film</xsl:when>
+                <xsl:when test="$leader6='k'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/picture.png" alt="Picture" class="materialtype mt_icon_GR"/> Picture</xsl:when>
+                <xsl:when test="$leader6='r'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/object.png" alt="Object" title="Object" class="materialtype mt_icon_OB"/> Object</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/music.png" alt="score" title="score" class="materialtype mt_icon_PR"/> Score</xsl:when>
                 <xsl:when test="$leader6='i'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype mt_icon_MU"/> Sound</xsl:when>
                 <xsl:when test="$leader6='j'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype mt_icon_MU"/> Music</xsl:when>