diff --git a/IconThemes/ikons/16x16/actions/down.png b/IconThemes/ikons/16x16/actions/go-down.png
similarity index 100%
rename from IconThemes/ikons/16x16/actions/down.png
rename to IconThemes/ikons/16x16/actions/go-down.png
diff --git a/IconThemes/ikons/16x16/actions/up.png b/IconThemes/ikons/16x16/actions/go-up.png
similarity index 100%
rename from IconThemes/ikons/16x16/actions/up.png
rename to IconThemes/ikons/16x16/actions/go-up.png
diff --git a/IconThemes/ikons/22x22/actions/down.png b/IconThemes/ikons/22x22/actions/go-down.png
similarity index 100%
rename from IconThemes/ikons/22x22/actions/down.png
rename to IconThemes/ikons/22x22/actions/go-down.png
diff --git a/IconThemes/ikons/22x22/actions/up.png b/IconThemes/ikons/22x22/actions/go-up.png
similarity index 100%
rename from IconThemes/ikons/22x22/actions/up.png
rename to IconThemes/ikons/22x22/actions/go-up.png
diff --git a/IconThemes/kdeclassic/16x16/actions/bottom.png b/IconThemes/kdeclassic/16x16/actions/go-bottom.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/actions/bottom.png
rename to IconThemes/kdeclassic/16x16/actions/go-bottom.png
diff --git a/IconThemes/kdeclassic/16x16/actions/down.png b/IconThemes/kdeclassic/16x16/actions/go-down.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/actions/down.png
rename to IconThemes/kdeclassic/16x16/actions/go-down.png
diff --git a/IconThemes/kdeclassic/16x16/actions/top.png b/IconThemes/kdeclassic/16x16/actions/go-top.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/actions/top.png
rename to IconThemes/kdeclassic/16x16/actions/go-top.png
diff --git a/IconThemes/kdeclassic/16x16/actions/up.png b/IconThemes/kdeclassic/16x16/actions/go-up.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/actions/up.png
rename to IconThemes/kdeclassic/16x16/actions/go-up.png
diff --git a/IconThemes/kdeclassic/22x22/actions/bottom.png b/IconThemes/kdeclassic/22x22/actions/go-bottom.png
similarity index 100%
rename from IconThemes/kdeclassic/22x22/actions/bottom.png
rename to IconThemes/kdeclassic/22x22/actions/go-bottom.png
diff --git a/IconThemes/kdeclassic/22x22/actions/down.png b/IconThemes/kdeclassic/22x22/actions/go-down.png
similarity index 100%
rename from IconThemes/kdeclassic/22x22/actions/down.png
rename to IconThemes/kdeclassic/22x22/actions/go-down.png
diff --git a/IconThemes/kdeclassic/22x22/actions/top.png b/IconThemes/kdeclassic/22x22/actions/go-top.png
similarity index 100%
rename from IconThemes/kdeclassic/22x22/actions/top.png
rename to IconThemes/kdeclassic/22x22/actions/go-top.png
diff --git a/IconThemes/kdeclassic/22x22/actions/up.png b/IconThemes/kdeclassic/22x22/actions/go-up.png
similarity index 100%
rename from IconThemes/kdeclassic/22x22/actions/up.png
rename to IconThemes/kdeclassic/22x22/actions/go-up.png
diff --git a/IconThemes/kdeclassic/32x32/actions/bottom.png b/IconThemes/kdeclassic/32x32/actions/go-bottom.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/actions/bottom.png
rename to IconThemes/kdeclassic/32x32/actions/go-bottom.png
diff --git a/IconThemes/kdeclassic/32x32/actions/down.png b/IconThemes/kdeclassic/32x32/actions/go-down.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/actions/down.png
rename to IconThemes/kdeclassic/32x32/actions/go-down.png
diff --git a/IconThemes/kdeclassic/32x32/actions/top.png b/IconThemes/kdeclassic/32x32/actions/go-top.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/actions/top.png
rename to IconThemes/kdeclassic/32x32/actions/go-top.png
diff --git a/IconThemes/kdeclassic/32x32/actions/up.png b/IconThemes/kdeclassic/32x32/actions/go-up.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/actions/up.png
rename to IconThemes/kdeclassic/32x32/actions/go-up.png
diff --git a/IconThemes/kids/16x16/actions/down.png b/IconThemes/kids/16x16/actions/go-down.png
similarity index 100%
rename from IconThemes/kids/16x16/actions/down.png
rename to IconThemes/kids/16x16/actions/go-down.png
diff --git a/IconThemes/kids/16x16/actions/up.png b/IconThemes/kids/16x16/actions/go-up.png
similarity index 100%
rename from IconThemes/kids/16x16/actions/up.png
rename to IconThemes/kids/16x16/actions/go-up.png
diff --git a/IconThemes/kids/22x22/actions/down.png b/IconThemes/kids/22x22/actions/go-down.png
similarity index 100%
rename from IconThemes/kids/22x22/actions/down.png
rename to IconThemes/kids/22x22/actions/go-down.png
diff --git a/IconThemes/kids/22x22/actions/up.png b/IconThemes/kids/22x22/actions/go-up.png
similarity index 100%
rename from IconThemes/kids/22x22/actions/up.png
rename to IconThemes/kids/22x22/actions/go-up.png
diff --git a/IconThemes/kids/32x32/actions/down.png b/IconThemes/kids/32x32/actions/go-down.png
similarity index 100%
rename from IconThemes/kids/32x32/actions/down.png
rename to IconThemes/kids/32x32/actions/go-down.png
diff --git a/IconThemes/kids/32x32/actions/up.png b/IconThemes/kids/32x32/actions/go-up.png
similarity index 100%
rename from IconThemes/kids/32x32/actions/up.png
rename to IconThemes/kids/32x32/actions/go-up.png
diff --git a/IconThemes/kids/48x48/actions/down.png b/IconThemes/kids/48x48/actions/go-down.png
similarity index 100%
rename from IconThemes/kids/48x48/actions/down.png
rename to IconThemes/kids/48x48/actions/go-down.png
diff --git a/IconThemes/kids/48x48/actions/up.png b/IconThemes/kids/48x48/actions/go-up.png
similarity index 100%
rename from IconThemes/kids/48x48/actions/up.png
rename to IconThemes/kids/48x48/actions/go-up.png
diff --git a/IconThemes/kids/64x64/actions/down.png b/IconThemes/kids/64x64/actions/go-down.png
similarity index 100%
rename from IconThemes/kids/64x64/actions/down.png
rename to IconThemes/kids/64x64/actions/go-down.png
diff --git a/IconThemes/kids/64x64/actions/up.png b/IconThemes/kids/64x64/actions/go-up.png
similarity index 100%
rename from IconThemes/kids/64x64/actions/up.png
rename to IconThemes/kids/64x64/actions/go-up.png
diff --git a/IconThemes/locolor/16x16/actions/bottom.png b/IconThemes/locolor/16x16/actions/go-bottom.png
similarity index 100%
rename from IconThemes/locolor/16x16/actions/bottom.png
rename to IconThemes/locolor/16x16/actions/go-bottom.png
diff --git a/IconThemes/locolor/16x16/actions/down.png b/IconThemes/locolor/16x16/actions/go-down.png
similarity index 100%
rename from IconThemes/locolor/16x16/actions/down.png
rename to IconThemes/locolor/16x16/actions/go-down.png
diff --git a/IconThemes/locolor/16x16/actions/top.png b/IconThemes/locolor/16x16/actions/go-top.png
similarity index 100%
rename from IconThemes/locolor/16x16/actions/top.png
rename to IconThemes/locolor/16x16/actions/go-top.png
diff --git a/IconThemes/locolor/16x16/actions/up.png b/IconThemes/locolor/16x16/actions/go-up.png
similarity index 100%
rename from IconThemes/locolor/16x16/actions/up.png
rename to IconThemes/locolor/16x16/actions/go-up.png
diff --git a/IconThemes/slick/16x16/actions/bottom.png b/IconThemes/slick/16x16/actions/go-bottom.png
similarity index 100%
rename from IconThemes/slick/16x16/actions/bottom.png
rename to IconThemes/slick/16x16/actions/go-bottom.png
diff --git a/IconThemes/slick/16x16/actions/down.png b/IconThemes/slick/16x16/actions/go-down.png
similarity index 100%
rename from IconThemes/slick/16x16/actions/down.png
rename to IconThemes/slick/16x16/actions/go-down.png
diff --git a/IconThemes/slick/16x16/actions/top.png b/IconThemes/slick/16x16/actions/go-top.png
similarity index 100%
rename from IconThemes/slick/16x16/actions/top.png
rename to IconThemes/slick/16x16/actions/go-top.png
diff --git a/IconThemes/slick/16x16/actions/up.png b/IconThemes/slick/16x16/actions/go-up.png
similarity index 100%
rename from IconThemes/slick/16x16/actions/up.png
rename to IconThemes/slick/16x16/actions/go-up.png
diff --git a/IconThemes/slick/22x22/actions/bottom.png b/IconThemes/slick/22x22/actions/go-bottom.png
similarity index 100%
rename from IconThemes/slick/22x22/actions/bottom.png
rename to IconThemes/slick/22x22/actions/go-bottom.png
diff --git a/IconThemes/slick/22x22/actions/down.png b/IconThemes/slick/22x22/actions/go-down.png
similarity index 100%
rename from IconThemes/slick/22x22/actions/down.png
rename to IconThemes/slick/22x22/actions/go-down.png
diff --git a/IconThemes/slick/22x22/actions/top.png b/IconThemes/slick/22x22/actions/go-top.png
similarity index 100%
rename from IconThemes/slick/22x22/actions/top.png
rename to IconThemes/slick/22x22/actions/go-top.png
diff --git a/IconThemes/slick/22x22/actions/up.png b/IconThemes/slick/22x22/actions/go-up.png
similarity index 100%
rename from IconThemes/slick/22x22/actions/up.png
rename to IconThemes/slick/22x22/actions/go-up.png
diff --git a/IconThemes/slick/32x32/actions/bottom.png b/IconThemes/slick/32x32/actions/go-bottom.png
similarity index 100%
rename from IconThemes/slick/32x32/actions/bottom.png
rename to IconThemes/slick/32x32/actions/go-bottom.png
diff --git a/IconThemes/slick/32x32/actions/down.png b/IconThemes/slick/32x32/actions/go-down.png
similarity index 100%
rename from IconThemes/slick/32x32/actions/down.png
rename to IconThemes/slick/32x32/actions/go-down.png
diff --git a/IconThemes/slick/32x32/actions/top.png b/IconThemes/slick/32x32/actions/go-top.png
similarity index 100%
rename from IconThemes/slick/32x32/actions/top.png
rename to IconThemes/slick/32x32/actions/go-top.png
diff --git a/IconThemes/slick/32x32/actions/up.png b/IconThemes/slick/32x32/actions/go-up.png
similarity index 100%
rename from IconThemes/slick/32x32/actions/up.png
rename to IconThemes/slick/32x32/actions/go-up.png
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
index 69628e66..92517d8f 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
@@ -287,8 +287,8 @@ SaverConfig::SaverConfig( TQWidget* parent, const char* name )
     connect( m_up, TQT_SIGNAL(clicked()), TQT_SLOT(up()) );
     connect( m_down, TQT_SIGNAL(clicked()), TQT_SLOT(down()) );
 
-    m_up->setIconSet( SmallIconSet("up") );
-    m_down->setIconSet( SmallIconSet("down") );
+    m_up->setIconSet( SmallIconSet("go-up") );
+    m_down->setIconSet( SmallIconSet("go-down") );
 
     // load config
     TDEConfig *cfg = kapp->config();