diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp
index 922a9f16..2bf9dbe4 100644
--- a/arts/builder/portposdlg.cpp
+++ b/arts/builder/portposdlg.cpp
@@ -116,11 +116,11 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent,
 
 	TDEIconLoader iconloader;
 	TQButton *raise = bbox->addButton(i18n("&Raise"));
-	raise->setPixmap(iconloader.loadIcon("up", TDEIcon::Small));
+	raise->setPixmap(iconloader.loadIcon("go-up", TDEIcon::Small));
 	connect( raise, TQT_SIGNAL( clicked() ), TQT_SLOT( raise() ));
 
 	TQButton *lower = bbox->addButton(i18n("&Lower"));
-	lower->setPixmap(iconloader.loadIcon("down", TDEIcon::Small));
+	lower->setPixmap(iconloader.loadIcon("go-down", TDEIcon::Small));
 	connect( lower, TQT_SIGNAL( clicked() ), TQT_SLOT( lower() ));
 
 	TQButton *rename = bbox->addButton(i18n("R&ename..."));
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index d970ed6e..d5c5f071 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -125,11 +125,11 @@ TDEPopupMenu* ArtsActions::stylemenu() {
 }
 
 TDEAction* ArtsActions::actionMoreBars( const TQObject* receiver, const char* slot, TDEActionCollection *actioncollection ) {
-	static TDEAction *_a_morebars = new TDEAction( i18n( "More Bars in VU-Meters" ), "up", TDEShortcut(), receiver, slot, actioncollection, "artssupport_morebars" );
+	static TDEAction *_a_morebars = new TDEAction( i18n( "More Bars in VU-Meters" ), "go-up", TDEShortcut(), receiver, slot, actioncollection, "artssupport_morebars" );
 	return _a_morebars;
 }
 TDEAction* ArtsActions::actionLessBars( const TQObject* receiver, const char* slot, TDEActionCollection *actioncollection ) {
-	static TDEAction *_a_lessbars = new TDEAction( i18n( "Less Bars in VU-Meters" ), "down", TDEShortcut(), receiver, slot, actioncollection, "artssupport_lessbars" );
+	static TDEAction *_a_lessbars = new TDEAction( i18n( "Less Bars in VU-Meters" ), "go-down", TDEShortcut(), receiver, slot, actioncollection, "artssupport_lessbars" );
 	return _a_lessbars;
 }
 
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 42c44c84..ffe5b179 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -310,8 +310,8 @@ FileRenamerWidget::~FileRenamerWidget()
 
 unsigned FileRenamerWidget::addRowCategory(TagType category)
 {
-    static TQPixmap up   = SmallIcon("up");
-    static TQPixmap down = SmallIcon("down");
+    static TQPixmap up   = SmallIcon("go-up");
+    static TQPixmap down = SmallIcon("go-down");
 
     // Find number of categories already of this type.
     unsigned categoryCount = 0;
diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp
index 618668b4..4dcf5163 100644
--- a/juk/statuslabel.cpp
+++ b/juk/statuslabel.cpp
@@ -81,7 +81,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
     jumpBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
 
     TQPushButton *jumpButton = new TQPushButton(jumpBox);
-    jumpButton->setPixmap(SmallIcon("up"));
+    jumpButton->setPixmap(SmallIcon("go-up"));
     jumpButton->setFlat(true);
 
     TQToolTip::add(jumpButton, i18n("Jump to the currently playing item"));
diff --git a/noatun/library/effectview.cpp b/noatun/library/effectview.cpp
index f312d8fb..72391b8d 100644
--- a/noatun/library/effectview.cpp
+++ b/noatun/library/effectview.cpp
@@ -116,7 +116,7 @@ void EffectView::init(void)
 	TQHBoxLayout *topTopLayout = new TQHBoxLayout(topTopFrame, 0, KDialog::spacingHint());
 	topTopLayout->setAutoAdd(true);
 	available = new KComboBox(false, topTopFrame);
-	TQToolButton *add = newButton(BarIconSet("down", TDEIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame);
+	TQToolButton *add = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Add"), TQT_TQOBJECT(this), TQT_SLOT(addEffect()), topTopFrame);
 
 	// Active
 	TQHGroupBox *bottomBox = new TQHGroupBox(i18n("Active Effects"), box);
@@ -153,8 +153,8 @@ void EffectView::init(void)
 	// the buttons
 	TQFrame *bottomLeftFrame = new TQFrame(bottomBox);
 	TQVBoxLayout *bottomLeftLayout = new TQVBoxLayout(bottomLeftFrame, 0, KDialog::spacingHint());
-	up = newButton(BarIconSet("up", TDEIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame);
-	down = newButton(BarIconSet("down", TDEIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame);
+	up = newButton(BarIconSet("go-up", TDEIcon::SizeSmall), i18n("Up"), TQT_TQOBJECT(this), TQT_SLOT(moveUp()), bottomLeftFrame);
+	down = newButton(BarIconSet("go-down", TDEIcon::SizeSmall), i18n("Down"), TQT_TQOBJECT(this), TQT_SLOT(moveDown()), bottomLeftFrame);
 	configure = newButton(BarIconSet("configure", TDEIcon::SizeSmall), i18n("Configure"), TQT_TQOBJECT(this), TQT_SLOT(configureEffect()), bottomLeftFrame);
 	remove = newButton(BarIconSet("remove", TDEIcon::SizeSmall), i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(removeEffect()), bottomLeftFrame);
 	bottomLeftLayout->addWidget(up);
diff --git a/noatun/modules/systray/cmodule.cpp b/noatun/modules/systray/cmodule.cpp
index 0ed5e232..189d1539 100644
--- a/noatun/modules/systray/cmodule.cpp
+++ b/noatun/modules/systray/cmodule.cpp
@@ -46,7 +46,7 @@
 
 YHModule::YHModule(TQObject *_parent)
 	: CModule(i18n("System Tray Icon"), i18n("Configure System Tray Icon"),
-		"bottom", _parent)
+		"go-bottom", _parent)
 {
 	TQVBoxLayout *top = new TQVBoxLayout(this);
 	mWidget = new YHConfigWidget(this);