diff --git a/pics/crystalsvg/cr16-action-start.png b/pics/crystalsvg/cr16-action-go-first.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-start.png
rename to pics/crystalsvg/cr16-action-go-first.png
diff --git a/pics/crystalsvg/cr16-action-finish.png b/pics/crystalsvg/cr16-action-go-last.png
similarity index 100%
rename from pics/crystalsvg/cr16-action-finish.png
rename to pics/crystalsvg/cr16-action-go-last.png
diff --git a/pics/crystalsvg/cr22-action-start.png b/pics/crystalsvg/cr22-action-go-first.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-start.png
rename to pics/crystalsvg/cr22-action-go-first.png
diff --git a/pics/crystalsvg/cr22-action-finish.png b/pics/crystalsvg/cr22-action-go-last.png
similarity index 100%
rename from pics/crystalsvg/cr22-action-finish.png
rename to pics/crystalsvg/cr22-action-go-last.png
diff --git a/pics/crystalsvg/cr32-action-start.png b/pics/crystalsvg/cr32-action-go-first.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-start.png
rename to pics/crystalsvg/cr32-action-go-first.png
diff --git a/pics/crystalsvg/cr32-action-finish.png b/pics/crystalsvg/cr32-action-go-last.png
similarity index 100%
rename from pics/crystalsvg/cr32-action-finish.png
rename to pics/crystalsvg/cr32-action-go-last.png
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index 652534601..e0bcca2eb 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -82,8 +82,8 @@ TDEAction* create( StdAction id, const char *name, const TQObject *recvr, const
 		if (TQApplication::reverseLayout()){
 			if (id == Prior) iconName = "forward";
 			if (id == Next ) iconName = "back";
-			if (id == FirstPage) iconName = "finish";
-			if (id == LastPage) iconName = "start";
+			if (id == FirstPage) iconName = "go-last";
+			if (id == LastPage) iconName = "go-first";
 		}
 
 		TDEShortcut cut = TDEStdAccel::shortcut(pInfo->idAccel);
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index 4a8fee92e..eb205339e 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -59,9 +59,9 @@ static const KStdActionInfo g_rgActionInfo[] =
 	{ SelectAll,     TDEStdAccel::SelectAll, "edit_select_all", I18N_NOOP("Select &All"), 0, 0 },
 	{ Deselect,      TDEStdAccel::Deselect, "edit_deselect", I18N_NOOP("Dese&lect"), 0, 0 },
 	{ Find,          TDEStdAccel::Find, "edit_find", I18N_NOOP("&Find..."), 0, "find" },
-	{ FindNext,      TDEStdAccel::FindNext, "edit_find_next", I18N_NOOP("Find &Next"), 0, "next" },
+	{ FindNext,      TDEStdAccel::FindNext, "edit_find_next", I18N_NOOP("Find &Next"), 0, "go-next" },
 	// FIXME: rename edit_find_last to edit_find_prev for KDE 4
-	{ FindPrev,      TDEStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "previous" },
+	{ FindPrev,      TDEStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "go-previous" },
 	{ Replace,       TDEStdAccel::Replace, "edit_replace", I18N_NOOP("&Replace..."), 0, 0 },
 
 	{ ActualSize,    TDEStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, "viewmag1" },
@@ -84,8 +84,8 @@ static const KStdActionInfo g_rgActionInfo[] =
 	{ Goto,          TDEStdAccel::AccelNone, "go_goto", I18N_NOOP("&Go To..."), 0, 0 },
 	{ GotoPage,      TDEStdAccel::AccelNone, "go_goto_page", I18N_NOOP("&Go to Page..."), 0, "goto" },
 	{ GotoLine,      TDEStdAccel::GotoLine, "go_goto_line", I18N_NOOP("&Go to Line..."), 0, 0 },
-	{ FirstPage,     TDEStdAccel::Home, "go_first", I18N_NOOP("&First Page"), 0, "start" },
-	{ LastPage,      TDEStdAccel::End, "go_last", I18N_NOOP("&Last Page"), 0, "finish" },
+	{ FirstPage,     TDEStdAccel::Home, "go_first", I18N_NOOP("&First Page"), 0, "go-first" },
+	{ LastPage,      TDEStdAccel::End, "go_last", I18N_NOOP("&Last Page"), 0, "go-last" },
 
 	{ AddBookmark,   TDEStdAccel::AddBookmark, "bookmark_add", I18N_NOOP("&Add Bookmark"), 0, "bookmark_add" },
 	{ EditBookmarks, TDEStdAccel::AccelNone, "bookmark_edit", I18N_NOOP("&Edit Bookmarks"), 0, "bookmark" },