unroll IMG_NAVI_ENTRYBMP ImageList

Change-Id: Icb00102f064b845b33a072880c60a9aae5dc4a55

75 files changed, 145 insertions, 67 deletions

diff --git a/icon-themes/breeze/sw/imglst/nc20000.png b/icon-themes/breeze/sw/res/nc20000.png
index d7d7205a148f..d7d7205a148f 100644
--- a/icon-themes/breeze/sw/imglst/nc20000.png
+++ b/icon-themes/breeze/sw/res/nc20000.png
diff --git a/icon-themes/breeze/sw/imglst/nc20006.png b/icon-themes/breeze/sw/res/nc20006.png
index 656ddc4cdce7..656ddc4cdce7 100644
--- a/icon-themes/breeze/sw/imglst/nc20006.png
+++ b/icon-themes/breeze/sw/res/nc20006.png
diff --git a/icon-themes/breeze_dark/sw/imglst/nc20000.png b/icon-themes/breeze_dark/sw/res/nc20000.png
index 1f486b7c0590..1f486b7c0590 100644
--- a/icon-themes/breeze_dark/sw/imglst/nc20000.png
+++ b/icon-themes/breeze_dark/sw/res/nc20000.png
diff --git a/icon-themes/breeze_dark/sw/imglst/nc20006.png b/icon-themes/breeze_dark/sw/res/nc20006.png
index 94c45fa66d57..94c45fa66d57 100644
--- a/icon-themes/breeze_dark/sw/imglst/nc20006.png
+++ b/icon-themes/breeze_dark/sw/res/nc20006.png
diff --git a/icon-themes/breeze_svg/sw/imglst/nc20000.svg b/icon-themes/breeze_svg/sw/res/nc20000.svg
index bfd429956e94..bfd429956e94 100644
--- a/icon-themes/breeze_svg/sw/imglst/nc20000.svg
+++ b/icon-themes/breeze_svg/sw/res/nc20000.svg
diff --git a/icon-themes/breeze_svg/sw/imglst/nc20006.svg b/icon-themes/breeze_svg/sw/res/nc20006.svg
index 7623f42c64a4..7623f42c64a4 100644
--- a/icon-themes/breeze_svg/sw/imglst/nc20006.svg
+++ b/icon-themes/breeze_svg/sw/res/nc20006.svg
diff --git a/icon-themes/crystal/sw/imglst/nc20001.png b/icon-themes/crystal/sw/res/nc20001.png
index 6cc28c90a0ec..6cc28c90a0ec 100644
--- a/icon-themes/crystal/sw/imglst/nc20001.png
+++ b/icon-themes/crystal/sw/res/nc20001.png
diff --git a/icon-themes/crystal/sw/imglst/nc20004.png b/icon-themes/crystal/sw/res/nc20004.png
index 618bdba27ad2..618bdba27ad2 100644
--- a/icon-themes/crystal/sw/imglst/nc20004.png
+++ b/icon-themes/crystal/sw/res/nc20004.png
diff --git a/icon-themes/crystal/sw/imglst/nc20005.png b/icon-themes/crystal/sw/res/nc20005.png
index d8f21a3ca073..d8f21a3ca073 100644
--- a/icon-themes/crystal/sw/imglst/nc20005.png
+++ b/icon-themes/crystal/sw/res/nc20005.png
diff --git a/icon-themes/elementary/sw/imglst/nc20000.png b/icon-themes/elementary/sw/res/nc20000.png
index 44ec9a760043..44ec9a760043 100644
--- a/icon-themes/elementary/sw/imglst/nc20000.png
+++ b/icon-themes/elementary/sw/res/nc20000.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20000.png b/icon-themes/galaxy/sw/res/nc20000.png
index cccb11c91e85..cccb11c91e85 100644
--- a/icon-themes/galaxy/sw/imglst/nc20000.png
+++ b/icon-themes/galaxy/sw/res/nc20000.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20001.png b/icon-themes/galaxy/sw/res/nc20001.png
index 2a6928c2c2d8..2a6928c2c2d8 100644
--- a/icon-themes/galaxy/sw/imglst/nc20001.png
+++ b/icon-themes/galaxy/sw/res/nc20001.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20002.png b/icon-themes/galaxy/sw/res/nc20002.png
index fcff4c7f699c..fcff4c7f699c 100644
--- a/icon-themes/galaxy/sw/imglst/nc20002.png
+++ b/icon-themes/galaxy/sw/res/nc20002.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20003.png b/icon-themes/galaxy/sw/res/nc20003.png
index 3242bbfd2022..3242bbfd2022 100644
--- a/icon-themes/galaxy/sw/imglst/nc20003.png
+++ b/icon-themes/galaxy/sw/res/nc20003.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20004.png b/icon-themes/galaxy/sw/res/nc20004.png
index 8c8a6d446283..8c8a6d446283 100644
--- a/icon-themes/galaxy/sw/imglst/nc20004.png
+++ b/icon-themes/galaxy/sw/res/nc20004.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20005.png b/icon-themes/galaxy/sw/res/nc20005.png
index 8b399781b5c8..8b399781b5c8 100644
--- a/icon-themes/galaxy/sw/imglst/nc20005.png
+++ b/icon-themes/galaxy/sw/res/nc20005.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20006.png b/icon-themes/galaxy/sw/res/nc20006.png
index a2b7e402989d..a2b7e402989d 100644
--- a/icon-themes/galaxy/sw/imglst/nc20006.png
+++ b/icon-themes/galaxy/sw/res/nc20006.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20007.png b/icon-themes/galaxy/sw/res/nc20007.png
index 69f701f83e0b..69f701f83e0b 100644
--- a/icon-themes/galaxy/sw/imglst/nc20007.png
+++ b/icon-themes/galaxy/sw/res/nc20007.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20008.png b/icon-themes/galaxy/sw/res/nc20008.png
index a665421ec97a..a665421ec97a 100644
--- a/icon-themes/galaxy/sw/imglst/nc20008.png
+++ b/icon-themes/galaxy/sw/res/nc20008.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20009.png b/icon-themes/galaxy/sw/res/nc20009.png
index 5c45cf9002bc..5c45cf9002bc 100644
--- a/icon-themes/galaxy/sw/imglst/nc20009.png
+++ b/icon-themes/galaxy/sw/res/nc20009.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20010.png b/icon-themes/galaxy/sw/res/nc20010.png
index 2e0e1894964d..2e0e1894964d 100644
--- a/icon-themes/galaxy/sw/imglst/nc20010.png
+++ b/icon-themes/galaxy/sw/res/nc20010.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20011.png b/icon-themes/galaxy/sw/res/nc20011.png
index 3242bbfd2022..3242bbfd2022 100644
--- a/icon-themes/galaxy/sw/imglst/nc20011.png
+++ b/icon-themes/galaxy/sw/res/nc20011.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20000.png b/icon-themes/hicontrast/sw/res/nc20000.png
index af739e146bd2..af739e146bd2 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20000.png
+++ b/icon-themes/hicontrast/sw/res/nc20000.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20001.png b/icon-themes/hicontrast/sw/res/nc20001.png
index d8955c4c2341..d8955c4c2341 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20001.png
+++ b/icon-themes/hicontrast/sw/res/nc20001.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20002.png b/icon-themes/hicontrast/sw/res/nc20002.png
index c9e85f66a59a..c9e85f66a59a 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20002.png
+++ b/icon-themes/hicontrast/sw/res/nc20002.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20003.png b/icon-themes/hicontrast/sw/res/nc20003.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20003.png
+++ b/icon-themes/hicontrast/sw/res/nc20003.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20004.png b/icon-themes/hicontrast/sw/res/nc20004.png
index b8ac81223a9c..b8ac81223a9c 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20004.png
+++ b/icon-themes/hicontrast/sw/res/nc20004.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20005.png b/icon-themes/hicontrast/sw/res/nc20005.png
index bc6ad71bdb1c..bc6ad71bdb1c 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20005.png
+++ b/icon-themes/hicontrast/sw/res/nc20005.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20006.png b/icon-themes/hicontrast/sw/res/nc20006.png
index 95d694fb9305..95d694fb9305 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20006.png
+++ b/icon-themes/hicontrast/sw/res/nc20006.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20007.png b/icon-themes/hicontrast/sw/res/nc20007.png
index 40c1aa326c80..40c1aa326c80 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20007.png
+++ b/icon-themes/hicontrast/sw/res/nc20007.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20008.png b/icon-themes/hicontrast/sw/res/nc20008.png
index 168902609742..168902609742 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20008.png
+++ b/icon-themes/hicontrast/sw/res/nc20008.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20009.png b/icon-themes/hicontrast/sw/res/nc20009.png
index 100c623d8c5c..100c623d8c5c 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20009.png
+++ b/icon-themes/hicontrast/sw/res/nc20009.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20010.png b/icon-themes/hicontrast/sw/res/nc20010.png
index 7909511db015..7909511db015 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20010.png
+++ b/icon-themes/hicontrast/sw/res/nc20010.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20011.png b/icon-themes/hicontrast/sw/res/nc20011.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/icon-themes/hicontrast/sw/imglst/nc20011.png
+++ b/icon-themes/hicontrast/sw/res/nc20011.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20000.png b/icon-themes/oxygen/sw/res/nc20000.png
index 44ec9a760043..44ec9a760043 100644
--- a/icon-themes/oxygen/sw/imglst/nc20000.png
+++ b/icon-themes/oxygen/sw/res/nc20000.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20001.png b/icon-themes/oxygen/sw/res/nc20001.png
index 6cc28c90a0ec..6cc28c90a0ec 100644
--- a/icon-themes/oxygen/sw/imglst/nc20001.png
+++ b/icon-themes/oxygen/sw/res/nc20001.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20002.png b/icon-themes/oxygen/sw/res/nc20002.png
index 2e0f2a95e715..2e0f2a95e715 100644
--- a/icon-themes/oxygen/sw/imglst/nc20002.png
+++ b/icon-themes/oxygen/sw/res/nc20002.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20003.png b/icon-themes/oxygen/sw/res/nc20003.png
index 1b1214426500..1b1214426500 100644
--- a/icon-themes/oxygen/sw/imglst/nc20003.png
+++ b/icon-themes/oxygen/sw/res/nc20003.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20004.png b/icon-themes/oxygen/sw/res/nc20004.png
index 618bdba27ad2..618bdba27ad2 100644
--- a/icon-themes/oxygen/sw/imglst/nc20004.png
+++ b/icon-themes/oxygen/sw/res/nc20004.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20005.png b/icon-themes/oxygen/sw/res/nc20005.png
index d8f21a3ca073..d8f21a3ca073 100644
--- a/icon-themes/oxygen/sw/imglst/nc20005.png
+++ b/icon-themes/oxygen/sw/res/nc20005.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20006.png b/icon-themes/oxygen/sw/res/nc20006.png
index 091b69c5b65c..091b69c5b65c 100644
--- a/icon-themes/oxygen/sw/imglst/nc20006.png
+++ b/icon-themes/oxygen/sw/res/nc20006.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20007.png b/icon-themes/oxygen/sw/res/nc20007.png
index 13eb4b9d8318..13eb4b9d8318 100644
--- a/icon-themes/oxygen/sw/imglst/nc20007.png
+++ b/icon-themes/oxygen/sw/res/nc20007.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20008.png b/icon-themes/oxygen/sw/res/nc20008.png
index bc09e504fa52..bc09e504fa52 100644
--- a/icon-themes/oxygen/sw/imglst/nc20008.png
+++ b/icon-themes/oxygen/sw/res/nc20008.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20009.png b/icon-themes/oxygen/sw/res/nc20009.png
index d41d81a5e6c9..d41d81a5e6c9 100644
--- a/icon-themes/oxygen/sw/imglst/nc20009.png
+++ b/icon-themes/oxygen/sw/res/nc20009.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20010.png b/icon-themes/oxygen/sw/res/nc20010.png
index 5007dcda4af1..5007dcda4af1 100644
--- a/icon-themes/oxygen/sw/imglst/nc20010.png
+++ b/icon-themes/oxygen/sw/res/nc20010.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20011.png b/icon-themes/oxygen/sw/res/nc20011.png
index b221fb8f0366..b221fb8f0366 100644
--- a/icon-themes/oxygen/sw/imglst/nc20011.png
+++ b/icon-themes/oxygen/sw/res/nc20011.png
diff --git a/icon-themes/sifr/sw/imglst/nc20007.png b/icon-themes/sifr/sw/res/nc20007.png
index e21620384109..e21620384109 100644
--- a/icon-themes/sifr/sw/imglst/nc20007.png
+++ b/icon-themes/sifr/sw/res/nc20007.png
diff --git a/icon-themes/tango/sw/imglst/nc20000.png b/icon-themes/tango/sw/res/nc20000.png
index ec3d98372e2f..ec3d98372e2f 100644
--- a/icon-themes/tango/sw/imglst/nc20000.png
+++ b/icon-themes/tango/sw/res/nc20000.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20000.png b/icon-themes/tango_testing/sw/res/nc20000.png
index d9b47e1f6249..d9b47e1f6249 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20000.png
+++ b/icon-themes/tango_testing/sw/res/nc20000.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20000.svg b/icon-themes/tango_testing/sw/res/nc20000.svg
index c0c3e0f01f1e..c0c3e0f01f1e 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20000.svg
+++ b/icon-themes/tango_testing/sw/res/nc20000.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20001.png b/icon-themes/tango_testing/sw/res/nc20001.png
index 3d23c2763b86..3d23c2763b86 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20001.png
+++ b/icon-themes/tango_testing/sw/res/nc20001.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20001.svg b/icon-themes/tango_testing/sw/res/nc20001.svg
index 19f9ecab9f3d..19f9ecab9f3d 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20001.svg
+++ b/icon-themes/tango_testing/sw/res/nc20001.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20002.png b/icon-themes/tango_testing/sw/res/nc20002.png
index 8cdcb52db762..8cdcb52db762 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20002.png
+++ b/icon-themes/tango_testing/sw/res/nc20002.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20002.svg b/icon-themes/tango_testing/sw/res/nc20002.svg
index 22b006952a25..22b006952a25 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20002.svg
+++ b/icon-themes/tango_testing/sw/res/nc20002.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20003.png b/icon-themes/tango_testing/sw/res/nc20003.png
index d72f4475fccd..d72f4475fccd 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20003.png
+++ b/icon-themes/tango_testing/sw/res/nc20003.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20004-sr20010.svg b/icon-themes/tango_testing/sw/res/nc20004-sr20010.svg
index 3a6675353e13..3a6675353e13 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20004-sr20010.svg
+++ b/icon-themes/tango_testing/sw/res/nc20004-sr20010.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20004.png b/icon-themes/tango_testing/sw/res/nc20004.png
index 76d461825d31..76d461825d31 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20004.png
+++ b/icon-themes/tango_testing/sw/res/nc20004.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20005.png b/icon-themes/tango_testing/sw/res/nc20005.png
index f96933840285..f96933840285 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20005.png
+++ b/icon-themes/tango_testing/sw/res/nc20005.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20006.png b/icon-themes/tango_testing/sw/res/nc20006.png
index 82a3af7c9b1c..82a3af7c9b1c 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20006.png
+++ b/icon-themes/tango_testing/sw/res/nc20006.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20006.svg b/icon-themes/tango_testing/sw/res/nc20006.svg
index 0d3f17b64d1c..0d3f17b64d1c 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20006.svg
+++ b/icon-themes/tango_testing/sw/res/nc20006.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20007.png b/icon-themes/tango_testing/sw/res/nc20007.png
index 803e68ff1d06..803e68ff1d06 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20007.png
+++ b/icon-themes/tango_testing/sw/res/nc20007.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20007.svg b/icon-themes/tango_testing/sw/res/nc20007.svg
index 16b352481248..16b352481248 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20007.svg
+++ b/icon-themes/tango_testing/sw/res/nc20007.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20008.png b/icon-themes/tango_testing/sw/res/nc20008.png
index b6eb19a05293..b6eb19a05293 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20008.png
+++ b/icon-themes/tango_testing/sw/res/nc20008.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20008.svg b/icon-themes/tango_testing/sw/res/nc20008.svg
index 73b94ddd6be9..73b94ddd6be9 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20008.svg
+++ b/icon-themes/tango_testing/sw/res/nc20008.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20009.png b/icon-themes/tango_testing/sw/res/nc20009.png
index 3968a48eba18..3968a48eba18 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20009.png
+++ b/icon-themes/tango_testing/sw/res/nc20009.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20009.svg b/icon-themes/tango_testing/sw/res/nc20009.svg
index bbff2382d14f..bbff2382d14f 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20009.svg
+++ b/icon-themes/tango_testing/sw/res/nc20009.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20010.png b/icon-themes/tango_testing/sw/res/nc20010.png
index efc65188a248..efc65188a248 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20010.png
+++ b/icon-themes/tango_testing/sw/res/nc20010.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20011.png b/icon-themes/tango_testing/sw/res/nc20011.png
index 6914c516dcee..6914c516dcee 100644
--- a/icon-themes/tango_testing/sw/imglst/nc20011.png
+++ b/icon-themes/tango_testing/sw/res/nc20011.png
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 86068a1d60f7..f641f9b5cb14 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -73,7 +73,6 @@ class SwContentTree
     , public SfxListener
 {
     VclPtr<SwNavigationPI> m_xDialog;
-    ImageList           m_aEntryImages;
     OUString            m_sSpace;
     AutoTimer           m_aUpdTimer;
 
@@ -111,7 +110,6 @@ class SwContentTree
     bool                m_bIsLastReadOnly     :1;
     bool                m_bIsOutlineMoveable  :1;
     bool                m_bViewHasChanged     :1;
-    bool                m_bIsImageListInitialized : 1;
 
     static bool         bIsInDrag;
 
@@ -265,8 +263,6 @@ private:
     AutoTimer               aUpdateTimer;
     OUString                aContextStrings[GLOBAL_CONTEXT_COUNT];
 
-    ImageList               aEntryImages;
-
     SwWrtShell*             pActiveShell;
     SvTreeListEntry*        pEmphasisEntry; // Drag'n Drop emphasis
     SvTreeListEntry*        pDDSource;      // source for Drag'n Drop
@@ -277,7 +273,6 @@ private:
 
     bool                bIsInternalDrag     :1;
     bool                bLastEntryEmphasis  :1; // Drag'n Drop
-    bool                bIsImageListInitialized : 1;
 
     static const SfxObjectShell* pShowShell;
 
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index 29179d789a8b..078304a59f37 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -25,7 +25,6 @@
 
 class SwContentType;
 
-// synchronize order and number with ResIds!!
 enum class ContentTypeId
 {
     OUTLINE        = 0,
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc
index f6d288033aa5..843eba476644 100644
--- a/sw/source/uibase/inc/utlui.hrc
+++ b/sw/source/uibase/inc/utlui.hrc
@@ -145,7 +145,6 @@
 
 #define RES_FRMEX_MENU                  (STR_AUTH_FIELD_END + 1)
 
-#define IMG_NAVI_ENTRYBMP           (RC_UTLUI_BEGIN + 4)
 #define ILIST_DB_DLG                (RC_UTLUI_BEGIN + 6)
 
 #define IMG_VIEWLAYOUT_AUTOMATIC                 (RC_UTLUI_BEGIN + 12)
@@ -155,9 +154,21 @@
 #define IMG_VIEWLAYOUT_SINGLECOLUMN              (RC_UTLUI_BEGIN + 16)
 #define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE       (RC_UTLUI_BEGIN + 17)
 #define IMG_PAGE_BREAK                           (RC_UTLUI_BEGIN + 18)
-#define RID_BMP_DROP_REGION                      (RC_UTLUI_BEGIN + 19)
-#define RID_BMP_DROP_LINK                        (RC_UTLUI_BEGIN + 20)
-#define RID_BMP_DROP_COPY                        (RC_UTLUI_BEGIN + 21)
+#define RID_BMP_NAVI_OUTLINE                     (RC_UTLUI_BEGIN + 19)
+#define RID_BMP_NAVI_TABLE                       (RC_UTLUI_BEGIN + 20)
+#define RID_BMP_NAVI_FRAME                       (RC_UTLUI_BEGIN + 21)
+#define RID_BMP_NAVI_GRAPHIC                     (RC_UTLUI_BEGIN + 22)
+#define RID_BMP_NAVI_OLE                         (RC_UTLUI_BEGIN + 23)
+#define RID_BMP_NAVI_BOOKMARK                    (RC_UTLUI_BEGIN + 24)
+#define RID_BMP_NAVI_REGION                      (RC_UTLUI_BEGIN + 25)
+#define RID_BMP_NAVI_URLFIELD                    (RC_UTLUI_BEGIN + 26)
+#define RID_BMP_NAVI_REFERENCE                   (RC_UTLUI_BEGIN + 27)
+#define RID_BMP_NAVI_INDEX                       (RC_UTLUI_BEGIN + 28)
+#define RID_BMP_NAVI_POSTIT                      (RC_UTLUI_BEGIN + 29)
+#define RID_BMP_NAVI_DRAWOBJECT                  (RC_UTLUI_BEGIN + 30)
+#define RID_BMP_DROP_REGION                      (RC_UTLUI_BEGIN + 31)
+#define RID_BMP_DROP_LINK                        (RC_UTLUI_BEGIN + 32)
+#define RID_BMP_DROP_COPY                        (RC_UTLUI_BEGIN + 33)
 
 //local ids of the Database ImageLists
 #define IMG_COLLAPSE        18002  /*RID_SVXIMG_COLLAPSEDNODE*/
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 3aa6ec2c597e..531bec7d7a7b 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -4033,31 +4033,26 @@ static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix)
     OUString sLinkSuffix = _sLinkSuffix;
     if(!sLinkSuffix.isEmpty())
         sLinkSuffix = sLinkSuffix.copy(1);
-    ContentTypeId nImgId(ContentTypeId::UNKNOWN);
-    bool bNotFound = false;
+    sal_uInt16 nImgId(0);
 
     if(sLinkSuffix == "outline")
-        nImgId = ContentTypeId::OUTLINE;
+        nImgId = RID_BMP_NAVI_OUTLINE;
     else if(sLinkSuffix == "table")
-        nImgId = ContentTypeId::TABLE;
+        nImgId = RID_BMP_NAVI_TABLE;
     else if(sLinkSuffix == "frame")
-        nImgId = ContentTypeId::FRAME;
+        nImgId = RID_BMP_NAVI_FRAME;
     else if(sLinkSuffix == "graphic")
-        nImgId = ContentTypeId::GRAPHIC;
-    else if(sLinkSuffix == "region")
-        nImgId = ContentTypeId::REGION;
+        nImgId = RID_BMP_NAVI_GRAPHIC;
     else if(sLinkSuffix == "ole")
-        nImgId = ContentTypeId::OLE;
+        nImgId = RID_BMP_NAVI_OLE;
     else if(sLinkSuffix.isEmpty())
-        nImgId = ContentTypeId::BOOKMARK;
-    else
-        bNotFound = true;
-    if(!bNotFound)
+        nImgId = RID_BMP_NAVI_BOOKMARK;
+    else if(sLinkSuffix == "region")
+        nImgId = RID_BMP_NAVI_REGION;
+
+    if (nImgId)
     {
-        ImageList aEntryImages( SW_RES(IMG_NAVI_ENTRYBMP) );
-        const Image& rImage = aEntryImages.GetImage( (int)nImgId + 2000 );
-        Bitmap aBitmap( rImage.GetBitmapEx().GetBitmap() );
-        aRet <<= VCLUnoHelper::CreateBitmap( aBitmap );
+        aRet <<= VCLUnoHelper::CreateBitmap(BitmapEx(SW_RES(nImgId)).GetBitmap());
     }
     return aRet;
 }
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 512248bb3161..56cd41514024 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -797,7 +797,6 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
     , m_bIsLastReadOnly(false)
     , m_bIsOutlineMoveable(true)
     , m_bViewHasChanged(false)
-    , m_bIsImageListInitialized(false)
     , m_bIsKeySpace(false)
 {
     SetHelpId(HID_NAVIGATOR_TREELIST);
@@ -1531,13 +1530,61 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool)
     return false;
 }
 
-void SwContentTree::Display( bool bActive )
+namespace
 {
-    if(!m_bIsImageListInitialized)
+    BitmapEx GetBitmapForContentTypeId(ContentTypeId eType)
     {
-        m_aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
-        m_bIsImageListInitialized = true;
-    }
+        sal_uInt16 nResId(0);
+
+        switch (eType)
+        {
+            case ContentTypeId::OUTLINE:
+                nResId = RID_BMP_NAVI_OUTLINE;
+                break;
+            case ContentTypeId::TABLE:
+                nResId = RID_BMP_NAVI_TABLE;
+                break;
+            case ContentTypeId::FRAME:
+                nResId = RID_BMP_NAVI_FRAME;
+                break;
+            case ContentTypeId::GRAPHIC:
+                nResId = RID_BMP_NAVI_GRAPHIC;
+                break;
+            case ContentTypeId::OLE:
+                nResId = RID_BMP_NAVI_OLE;
+                break;
+            case ContentTypeId::BOOKMARK:
+                nResId = RID_BMP_NAVI_BOOKMARK;
+                break;
+            case ContentTypeId::REGION:
+                nResId = RID_BMP_NAVI_REGION;
+                break;
+            case ContentTypeId::URLFIELD:
+                nResId = RID_BMP_NAVI_URLFIELD;
+                break;
+            case ContentTypeId::REFERENCE:
+                nResId = RID_BMP_NAVI_REFERENCE;
+                break;
+            case ContentTypeId::INDEX:
+                nResId = RID_BMP_NAVI_INDEX;
+                break;
+            case ContentTypeId::POSTIT:
+                nResId = RID_BMP_NAVI_POSTIT;
+                break;
+            case ContentTypeId::DRAWOBJECT:
+                nResId = RID_BMP_NAVI_DRAWOBJECT;
+                break;
+            case ContentTypeId::UNKNOWN:
+                SAL_WARN("sw.ui", "ContentTypeId::UNKNOWN has no bitmap preview");
+                break;
+        }
+
+        return BitmapEx(SW_RES(nResId));
+    };
+}
+
+void SwContentTree::Display( bool bActive )
+{
     // First read the selected entry to select it later again if necessary
     // -> the user data here are no longer valid!
     SvTreeListEntry* pOldSelEntry = FirstSelected();
@@ -1596,9 +1643,9 @@ void SwContentTree::Display( bool bActive )
 
                 OUString sEntry = (*ppContentT)->GetName();
                 SvTreeListEntry* pEntry;
-                const Image& rImage = m_aEntryImages.GetImage(SID_SW_START + (int)nCntType);
+                Image aImage(GetBitmapForContentTypeId(nCntType));
                 bool bChOnDemand = 0 != (*ppContentT)->GetMemberCount();
-                pEntry = InsertEntry(sEntry, rImage, rImage,
+                pEntry = InsertEntry(sEntry, aImage, aImage,
                                 nullptr, bChOnDemand, TREELIST_APPEND, (*ppContentT));
                 if(nCntType == m_nLastSelType)
                     pSelEntry = pEntry;
@@ -1647,9 +1694,9 @@ void SwContentTree::Display( bool bActive )
                                     &m_aHiddenContentArr[m_nRootType];
             if(!(*ppRootContentT))
                 (*ppRootContentT) = new SwContentType(pShell, m_nRootType, m_nOutlineLevel );
-            const Image& rImage = m_aEntryImages.GetImage(20000 + (int)m_nRootType);
+            Image aImage(GetBitmapForContentTypeId(m_nRootType));
             SvTreeListEntry* pParent = InsertEntry(
-                    (*ppRootContentT)->GetName(), rImage, rImage,
+                    (*ppRootContentT)->GetName(), aImage, aImage,
                         nullptr, false, TREELIST_APPEND, *ppRootContentT);
 
             if(m_nRootType != ContentTypeId::OUTLINE)
@@ -3521,7 +3568,6 @@ void SwContentTree::DataChanged(const DataChangedEvent& rDCEvt)
     {
         FindActiveTypeAndRemoveUserData();
 
-        m_bIsImageListInitialized = false;
         Display(true);
     }
 
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 038cf7d765f0..cee4def454f0 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -145,7 +145,6 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog)
     , pDocInserter(nullptr)
     , bIsInternalDrag(false)
     , bLastEntryEmphasis(false)
-    , bIsImageListInitialized(false)
 {
     SetDragDropMode(DragDropMode::APP_COPY  |
                     DragDropMode::CTRL_MOVE |
@@ -622,13 +621,8 @@ void SwGlobalTree::Clear()
     SvTreeListBox::Clear();
 }
 
-void    SwGlobalTree::Display(bool bOnlyUpdateUserData)
+void SwGlobalTree::Display(bool bOnlyUpdateUserData)
 {
-    if(!bIsImageListInitialized)
-    {
-        aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
-        bIsImageListInitialized = true;
-    }
     size_t nCount = pSwGlblDocContents->size();
     if(bOnlyUpdateUserData && GetEntryCount() == pSwGlblDocContents->size())
     {
@@ -673,14 +667,14 @@ void    SwGlobalTree::Display(bool bOnlyUpdateUserData)
                 {
                     const SwTOXBase* pBase = pCont->GetTOX();
                     sEntry = pBase->GetTitle();
-                    aImage = aEntryImages.GetImage(SID_SW_START + (int)ContentTypeId::INDEX);
+                    aImage = Image(Bitmap(SW_RES(RID_BMP_NAVI_INDEX)));
                 }
                 break;
                 case GLBLDOC_SECTION:
                 {
                     const SwSection* pSect = pCont->GetSection();
                     sEntry = pSect->GetSectionName();
-                    aImage = aEntryImages.GetImage(SID_SW_START + (int)ContentTypeId::REGION);
+                    aImage = Image(Bitmap(SW_RES(RID_BMP_DROP_REGION)));
                 }
                 break;
             }
@@ -1244,7 +1238,6 @@ void    SwGlobalTree::DataChanged( const DataChangedEvent& rDCEvt )
     if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
          (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
     {
-        aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
         Update(true);
     }
     SvTreeListBox::DataChanged( rDCEvt );
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index e3cb27a59708..e1e5bc94bfa4 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -24,25 +24,64 @@
 #include "helpid.h"
 #include "access.hrc"
 
-ImageList IMG_NAVI_ENTRYBMP
-{
-    Prefix = "nc";
-    IdList =
-    {
-        20000 ;
-        20001 ;
-        20002 ;
-        20003 ;
-        20004 ;
-        20005 ;
-        20006 ;
-        20007 ;
-        20008 ;
-        20009 ;
-        20010 ;
-        20011 ;
-    };
-    IdCount = { 12 ; };
+Bitmap RID_BMP_NAVI_OUTLINE
+{
+    File = "nc20000.png" ;
+};
+
+Bitmap RID_BMP_NAVI_TABLE
+{
+    File = "nc20001.png" ;
+};
+
+Bitmap RID_BMP_NAVI_FRAME
+{
+    File = "nc20002.png" ;
+};
+
+Bitmap RID_BMP_NAVI_GRAPHIC
+{
+    File = "nc20003.png" ;
+};
+
+Bitmap RID_BMP_NAVI_OLE
+{
+    File = "nc20004.png" ;
+};
+
+Bitmap RID_BMP_NAVI_BOOKMARK
+{
+    File = "nc20005.png" ;
+};
+
+Bitmap RID_BMP_NAVI_REGION
+{
+    File = "nc20006.png" ;
+};
+
+Bitmap RID_BMP_NAVI_URLFIELD
+{
+    File = "nc20007.png" ;
+};
+
+Bitmap RID_BMP_NAVI_REFERENCE
+{
+    File = "nc20008.png" ;
+};
+
+Bitmap RID_BMP_NAVI_INDEX
+{
+    File = "nc20009.png" ;
+};
+
+Bitmap RID_BMP_NAVI_POSTIT
+{
+    File = "nc20010.png" ;
+};
+
+Bitmap RID_BMP_NAVI_DRAWOBJECT
+{
+    File = "nc20011.png" ;
 };
 
 Bitmap RID_BMP_DROP_REGION