diff --git a/actions/22x22-light/Info-amarok.svg b/actions/22/Info-amarok.svg similarity index 100% rename from actions/22x22-light/Info-amarok.svg rename to actions/22/Info-amarok.svg diff --git a/actions/22x22-light/TeX_logo.svg b/actions/22/TeX_logo.svg similarity index 100% rename from actions/22x22-light/TeX_logo.svg rename to actions/22/TeX_logo.svg diff --git a/actions/22x22-light/acrobat.svg b/actions/22/acrobat.svg similarity index 100% rename from actions/22x22-light/acrobat.svg rename to actions/22/acrobat.svg diff --git a/actions/22x22-light/action-albumfolder-importdir2.svg b/actions/22/action-albumfolder-importdir2.svg similarity index 100% rename from actions/22x22-light/action-albumfolder-importdir2.svg rename to actions/22/action-albumfolder-importdir2.svg diff --git a/actions/22x22-light/action-rss_tag.svg b/actions/22/action-rss_tag.svg similarity index 100% rename from actions/22x22-light/action-rss_tag.svg rename to actions/22/action-rss_tag.svg diff --git a/actions/22x22-light/add-files-to-archive.svg b/actions/22/add-files-to-archive.svg similarity index 100% rename from actions/22x22-light/add-files-to-archive.svg rename to actions/22/add-files-to-archive.svg diff --git a/actions/22x22-light/add-folder-to-archive.svg b/actions/22/add-folder-to-archive.svg similarity index 100% rename from actions/22x22-light/add-folder-to-archive.svg rename to actions/22/add-folder-to-archive.svg diff --git a/actions/22x22-light/add.svg b/actions/22/add.svg similarity index 100% rename from actions/22x22-light/add.svg rename to actions/22/add.svg diff --git a/actions/22x22-light/address-book-insert.svg b/actions/22/address-book-insert.svg similarity index 100% rename from actions/22x22-light/address-book-insert.svg rename to actions/22/address-book-insert.svg diff --git a/actions/22x22-light/address-book-new.svg b/actions/22/address-book-new.svg similarity index 100% rename from actions/22x22-light/address-book-new.svg rename to actions/22/address-book-new.svg diff --git a/actions/22x22-light/addressbook.svg b/actions/22/addressbook.svg similarity index 100% rename from actions/22x22-light/addressbook.svg rename to actions/22/addressbook.svg diff --git a/actions/22x22-light/adjustcurves.svg b/actions/22/adjustcurves.svg similarity index 100% rename from actions/22x22-light/adjustcurves.svg rename to actions/22/adjustcurves.svg diff --git a/actions/22x22-light/adjusthsl.svg b/actions/22/adjusthsl.svg similarity index 100% rename from actions/22x22-light/adjusthsl.svg rename to actions/22/adjusthsl.svg diff --git a/actions/22x22-light/adjustlevels.svg b/actions/22/adjustlevels.svg similarity index 100% rename from actions/22x22-light/adjustlevels.svg rename to actions/22/adjustlevels.svg diff --git a/actions/22x22-light/adjustrgb.svg b/actions/22/adjustrgb.svg similarity index 100% rename from actions/22x22-light/adjustrgb.svg rename to actions/22/adjustrgb.svg diff --git a/actions/22x22-light/adress-book-new.svg b/actions/22/adress-book-new.svg similarity index 100% rename from actions/22x22-light/adress-book-new.svg rename to actions/22/adress-book-new.svg diff --git a/actions/22x22-light/akonadi-phone-home.svg b/actions/22/akonadi-phone-home.svg similarity index 100% rename from actions/22x22-light/akonadi-phone-home.svg rename to actions/22/akonadi-phone-home.svg diff --git a/actions/22x22-light/akonadiconsole.svg b/actions/22/akonadiconsole.svg similarity index 100% rename from actions/22x22-light/akonadiconsole.svg rename to actions/22/akonadiconsole.svg diff --git a/actions/22x22-light/albumfolder-importdir.svg b/actions/22/albumfolder-importdir.svg similarity index 100% rename from actions/22x22-light/albumfolder-importdir.svg rename to actions/22/albumfolder-importdir.svg diff --git a/actions/22x22-light/albumfolder-importimages.svg b/actions/22/albumfolder-importimages.svg similarity index 100% rename from actions/22x22-light/albumfolder-importimages.svg rename to actions/22/albumfolder-importimages.svg diff --git a/actions/22x22-light/albumfolder-new.svg b/actions/22/albumfolder-new.svg similarity index 100% rename from actions/22x22-light/albumfolder-new.svg rename to actions/22/albumfolder-new.svg diff --git a/actions/22x22-light/albumfolder-properties.svg b/actions/22/albumfolder-properties.svg similarity index 100% rename from actions/22x22-light/albumfolder-properties.svg rename to actions/22/albumfolder-properties.svg diff --git a/actions/22x22-light/albumfolder-user-trash.svg b/actions/22/albumfolder-user-trash.svg similarity index 100% rename from actions/22x22-light/albumfolder-user-trash.svg rename to actions/22/albumfolder-user-trash.svg diff --git a/actions/22x22-light/align-horizontal-baseline.svg b/actions/22/align-horizontal-baseline.svg similarity index 100% rename from actions/22x22-light/align-horizontal-baseline.svg rename to actions/22/align-horizontal-baseline.svg diff --git a/actions/22x22-light/align-horizontal-bottom-out.svg b/actions/22/align-horizontal-bottom-out.svg similarity index 100% rename from actions/22x22-light/align-horizontal-bottom-out.svg rename to actions/22/align-horizontal-bottom-out.svg diff --git a/actions/22x22-light/align-horizontal-center.svg b/actions/22/align-horizontal-center.svg similarity index 100% rename from actions/22x22-light/align-horizontal-center.svg rename to actions/22/align-horizontal-center.svg diff --git a/actions/22x22-light/align-horizontal-left-out.svg b/actions/22/align-horizontal-left-out.svg similarity index 100% rename from actions/22x22-light/align-horizontal-left-out.svg rename to actions/22/align-horizontal-left-out.svg diff --git a/actions/22x22-light/align-horizontal-left-to-anchor.svg b/actions/22/align-horizontal-left-to-anchor.svg similarity index 100% rename from actions/22x22-light/align-horizontal-left-to-anchor.svg rename to actions/22/align-horizontal-left-to-anchor.svg diff --git a/actions/22x22-light/align-horizontal-left.svg b/actions/22/align-horizontal-left.svg similarity index 100% rename from actions/22x22-light/align-horizontal-left.svg rename to actions/22/align-horizontal-left.svg diff --git a/actions/22x22-light/align-horizontal-right-out.svg b/actions/22/align-horizontal-right-out.svg similarity index 100% rename from actions/22x22-light/align-horizontal-right-out.svg rename to actions/22/align-horizontal-right-out.svg diff --git a/actions/22x22-light/align-horizontal-right-to-anchor.svg b/actions/22/align-horizontal-right-to-anchor.svg similarity index 100% rename from actions/22x22-light/align-horizontal-right-to-anchor.svg rename to actions/22/align-horizontal-right-to-anchor.svg diff --git a/actions/22x22-light/align-horizontal-right.svg b/actions/22/align-horizontal-right.svg similarity index 100% rename from actions/22x22-light/align-horizontal-right.svg rename to actions/22/align-horizontal-right.svg diff --git a/actions/22x22-light/align-horizontal-top-out.svg b/actions/22/align-horizontal-top-out.svg similarity index 100% rename from actions/22x22-light/align-horizontal-top-out.svg rename to actions/22/align-horizontal-top-out.svg diff --git a/actions/22x22-light/align-vertical-baseline.svg b/actions/22/align-vertical-baseline.svg similarity index 100% rename from actions/22x22-light/align-vertical-baseline.svg rename to actions/22/align-vertical-baseline.svg diff --git a/actions/22x22-light/align-vertical-bottom-out.svg b/actions/22/align-vertical-bottom-out.svg similarity index 100% rename from actions/22x22-light/align-vertical-bottom-out.svg rename to actions/22/align-vertical-bottom-out.svg diff --git a/actions/22x22-light/align-vertical-bottom-to-anchor.svg b/actions/22/align-vertical-bottom-to-anchor.svg similarity index 100% rename from actions/22x22-light/align-vertical-bottom-to-anchor.svg rename to actions/22/align-vertical-bottom-to-anchor.svg diff --git a/actions/22x22-light/align-vertical-bottom.svg b/actions/22/align-vertical-bottom.svg similarity index 100% rename from actions/22x22-light/align-vertical-bottom.svg rename to actions/22/align-vertical-bottom.svg diff --git a/actions/22x22-light/align-vertical-center.svg b/actions/22/align-vertical-center.svg similarity index 100% rename from actions/22x22-light/align-vertical-center.svg rename to actions/22/align-vertical-center.svg diff --git a/actions/22x22-light/align-vertical-top-out.svg b/actions/22/align-vertical-top-out.svg similarity index 100% rename from actions/22x22-light/align-vertical-top-out.svg rename to actions/22/align-vertical-top-out.svg diff --git a/actions/22x22-light/align-vertical-top-to-anchor.svg b/actions/22/align-vertical-top-to-anchor.svg similarity index 100% rename from actions/22x22-light/align-vertical-top-to-anchor.svg rename to actions/22/align-vertical-top-to-anchor.svg diff --git a/actions/22x22-light/align-vertical-top.svg b/actions/22/align-vertical-top.svg similarity index 100% rename from actions/22x22-light/align-vertical-top.svg rename to actions/22/align-vertical-top.svg diff --git a/actions/22x22-light/amarok_artist.svg b/actions/22/amarok_artist.svg similarity index 100% rename from actions/22x22-light/amarok_artist.svg rename to actions/22/amarok_artist.svg diff --git a/actions/22x22-light/amarok_cart_add.svg b/actions/22/amarok_cart_add.svg similarity index 100% rename from actions/22x22-light/amarok_cart_add.svg rename to actions/22/amarok_cart_add.svg diff --git a/actions/22x22-light/amarok_cart_remove.svg b/actions/22/amarok_cart_remove.svg similarity index 100% rename from actions/22x22-light/amarok_cart_remove.svg rename to actions/22/amarok_cart_remove.svg diff --git a/actions/22x22-light/amarok_cart_view.svg b/actions/22/amarok_cart_view.svg similarity index 100% rename from actions/22x22-light/amarok_cart_view.svg rename to actions/22/amarok_cart_view.svg diff --git a/actions/22x22-light/amarok_change_language.svg b/actions/22/amarok_change_language.svg similarity index 100% rename from actions/22x22-light/amarok_change_language.svg rename to actions/22/amarok_change_language.svg diff --git a/actions/22x22-light/amarok_clock.svg b/actions/22/amarok_clock.svg similarity index 100% rename from actions/22x22-light/amarok_clock.svg rename to actions/22/amarok_clock.svg diff --git a/actions/22x22-light/amarok_lyrics.svg b/actions/22/amarok_lyrics.svg similarity index 100% rename from actions/22x22-light/amarok_lyrics.svg rename to actions/22/amarok_lyrics.svg diff --git a/actions/22x22-light/amarok_playcount.svg b/actions/22/amarok_playcount.svg similarity index 100% rename from actions/22x22-light/amarok_playcount.svg rename to actions/22/amarok_playcount.svg diff --git a/actions/22x22-light/amarok_playlist.svg b/actions/22/amarok_playlist.svg similarity index 100% rename from actions/22x22-light/amarok_playlist.svg rename to actions/22/amarok_playlist.svg diff --git a/actions/22x22-light/amarok_playlist_refresh.svg b/actions/22/amarok_playlist_refresh.svg similarity index 100% rename from actions/22x22-light/amarok_playlist_refresh.svg rename to actions/22/amarok_playlist_refresh.svg diff --git a/actions/22x22-light/amarok_scripts.svg b/actions/22/amarok_scripts.svg similarity index 100% rename from actions/22x22-light/amarok_scripts.svg rename to actions/22/amarok_scripts.svg diff --git a/actions/22x22-light/antivignetting.svg b/actions/22/antivignetting.svg similarity index 100% rename from actions/22x22-light/antivignetting.svg rename to actions/22/antivignetting.svg diff --git a/actions/22x22-light/application-exit.svg b/actions/22/application-exit.svg similarity index 100% rename from actions/22x22-light/application-exit.svg rename to actions/22/application-exit.svg diff --git a/actions/22x22-light/application-menu.svg b/actions/22/application-menu.svg similarity index 100% rename from actions/22x22-light/application-menu.svg rename to actions/22/application-menu.svg diff --git a/actions/22x22-light/applications-internet.svg b/actions/22/applications-internet.svg similarity index 100% rename from actions/22x22-light/applications-internet.svg rename to actions/22/applications-internet.svg diff --git a/actions/22x22-light/applications-other.svg b/actions/22/applications-other.svg similarity index 100% rename from actions/22x22-light/applications-other.svg rename to actions/22/applications-other.svg diff --git a/actions/22x22-light/applications-system.svg b/actions/22/applications-system.svg similarity index 100% rename from actions/22x22-light/applications-system.svg rename to actions/22/applications-system.svg diff --git a/actions/22x22-light/appointment-new.svg b/actions/22/appointment-new.svg similarity index 100% rename from actions/22x22-light/appointment-new.svg rename to actions/22/appointment-new.svg diff --git a/actions/22x22-light/appointment.svg b/actions/22/appointment.svg similarity index 100% rename from actions/22x22-light/appointment.svg rename to actions/22/appointment.svg diff --git a/actions/22x22-light/appointment_new.svg b/actions/22/appointment_new.svg similarity index 100% rename from actions/22x22-light/appointment_new.svg rename to actions/22/appointment_new.svg diff --git a/actions/22x22-light/archive-extract.svg b/actions/22/archive-extract.svg similarity index 100% rename from actions/22x22-light/archive-extract.svg rename to actions/22/archive-extract.svg diff --git a/actions/22x22-light/archive-insert-directory.svg b/actions/22/archive-insert-directory.svg similarity index 100% rename from actions/22x22-light/archive-insert-directory.svg rename to actions/22/archive-insert-directory.svg diff --git a/actions/22x22-light/archive-insert.svg b/actions/22/archive-insert.svg similarity index 100% rename from actions/22x22-light/archive-insert.svg rename to actions/22/archive-insert.svg diff --git a/actions/22x22-light/archive-remove.svg b/actions/22/archive-remove.svg similarity index 100% rename from actions/22x22-light/archive-remove.svg rename to actions/22/archive-remove.svg diff --git a/actions/22x22-light/arrow-down-double.svg b/actions/22/arrow-down-double.svg similarity index 100% rename from actions/22x22-light/arrow-down-double.svg rename to actions/22/arrow-down-double.svg diff --git a/actions/22x22-light/arrow-down.svg b/actions/22/arrow-down.svg similarity index 100% rename from actions/22x22-light/arrow-down.svg rename to actions/22/arrow-down.svg diff --git a/actions/22x22-light/arrow-left-double.svg b/actions/22/arrow-left-double.svg similarity index 100% rename from actions/22x22-light/arrow-left-double.svg rename to actions/22/arrow-left-double.svg diff --git a/actions/22x22-light/arrow-left.svg b/actions/22/arrow-left.svg similarity index 100% rename from actions/22x22-light/arrow-left.svg rename to actions/22/arrow-left.svg diff --git a/actions/22x22-light/arrow-right-double.svg b/actions/22/arrow-right-double.svg similarity index 100% rename from actions/22x22-light/arrow-right-double.svg rename to actions/22/arrow-right-double.svg diff --git a/actions/22x22-light/arrow-right.svg b/actions/22/arrow-right.svg similarity index 100% rename from actions/22x22-light/arrow-right.svg rename to actions/22/arrow-right.svg diff --git a/actions/22x22-light/arrow-top-double.svg b/actions/22/arrow-top-double.svg similarity index 100% rename from actions/22x22-light/arrow-top-double.svg rename to actions/22/arrow-top-double.svg diff --git a/actions/22x22-light/arrow-up-double.svg b/actions/22/arrow-up-double.svg similarity index 100% rename from actions/22x22-light/arrow-up-double.svg rename to actions/22/arrow-up-double.svg diff --git a/actions/22x22-light/arrow-up.svg b/actions/22/arrow-up.svg similarity index 100% rename from actions/22x22-light/arrow-up.svg rename to actions/22/arrow-up.svg diff --git a/actions/22x22-light/audio-cd-duplicate.svg b/actions/22/audio-cd-duplicate.svg similarity index 100% rename from actions/22x22-light/audio-cd-duplicate.svg rename to actions/22/audio-cd-duplicate.svg diff --git a/actions/22x22-light/audio-cd-new.svg b/actions/22/audio-cd-new.svg similarity index 100% rename from actions/22x22-light/audio-cd-new.svg rename to actions/22/audio-cd-new.svg diff --git a/actions/22x22-light/audio-off.svg b/actions/22/audio-off.svg similarity index 100% rename from actions/22x22-light/audio-off.svg rename to actions/22/audio-off.svg diff --git a/actions/22x22-light/audio-on.svg b/actions/22/audio-on.svg similarity index 100% rename from actions/22x22-light/audio-on.svg rename to actions/22/audio-on.svg diff --git a/actions/22x22-light/audio-ready.svg b/actions/22/audio-ready.svg similarity index 100% rename from actions/22x22-light/audio-ready.svg rename to actions/22/audio-ready.svg diff --git a/actions/22x22-light/auto-scale-all.svg b/actions/22/auto-scale-all.svg similarity index 100% rename from actions/22x22-light/auto-scale-all.svg rename to actions/22/auto-scale-all.svg diff --git a/actions/22x22-light/auto-scale-x.svg b/actions/22/auto-scale-x.svg similarity index 100% rename from actions/22x22-light/auto-scale-x.svg rename to actions/22/auto-scale-x.svg diff --git a/actions/22x22-light/auto-scale-y.svg b/actions/22/auto-scale-y.svg similarity index 100% rename from actions/22x22-light/auto-scale-y.svg rename to actions/22/auto-scale-y.svg diff --git a/actions/22x22-light/auto-type.svg b/actions/22/auto-type.svg similarity index 100% rename from actions/22x22-light/auto-type.svg rename to actions/22/auto-type.svg diff --git a/actions/22x22-light/autocorrection.svg b/actions/22/autocorrection.svg similarity index 100% rename from actions/22x22-light/autocorrection.svg rename to actions/22/autocorrection.svg diff --git a/actions/22x22-light/automated-tasks.svg b/actions/22/automated-tasks.svg similarity index 100% rename from actions/22x22-light/automated-tasks.svg rename to actions/22/automated-tasks.svg diff --git a/actions/22x22-light/back.svg b/actions/22/back.svg similarity index 100% rename from actions/22x22-light/back.svg rename to actions/22/back.svg diff --git a/actions/22x22-light/bitmap-trace.svg b/actions/22/bitmap-trace.svg similarity index 100% rename from actions/22x22-light/bitmap-trace.svg rename to actions/22/bitmap-trace.svg diff --git a/actions/22x22-light/blurfx.svg b/actions/22/blurfx.svg similarity index 100% rename from actions/22x22-light/blurfx.svg rename to actions/22/blurfx.svg diff --git a/actions/22x22-light/blurimage.svg b/actions/22/blurimage.svg similarity index 100% rename from actions/22x22-light/blurimage.svg rename to actions/22/blurimage.svg diff --git a/actions/22x22-light/bonobo-component-browser.svg b/actions/22/bonobo-component-browser.svg similarity index 100% rename from actions/22x22-light/bonobo-component-browser.svg rename to actions/22/bonobo-component-browser.svg diff --git a/actions/22x22-light/bookmark-add.svg b/actions/22/bookmark-add.svg similarity index 100% rename from actions/22x22-light/bookmark-add.svg rename to actions/22/bookmark-add.svg diff --git a/actions/22x22-light/bookmark-list-add.svg b/actions/22/bookmark-list-add.svg similarity index 100% rename from actions/22x22-light/bookmark-list-add.svg rename to actions/22/bookmark-list-add.svg diff --git a/actions/22x22-light/bookmark-new-list.svg b/actions/22/bookmark-new-list.svg similarity index 100% rename from actions/22x22-light/bookmark-new-list.svg rename to actions/22/bookmark-new-list.svg diff --git a/actions/22x22-light/bookmark-new.svg b/actions/22/bookmark-new.svg similarity index 100% rename from actions/22x22-light/bookmark-new.svg rename to actions/22/bookmark-new.svg diff --git a/actions/22x22-light/bookmark-toolbar.svg b/actions/22/bookmark-toolbar.svg similarity index 100% rename from actions/22x22-light/bookmark-toolbar.svg rename to actions/22/bookmark-toolbar.svg diff --git a/actions/22x22-light/bookmark-view.svg b/actions/22/bookmark-view.svg similarity index 100% rename from actions/22x22-light/bookmark-view.svg rename to actions/22/bookmark-view.svg diff --git a/actions/22x22-light/bookmark_add.svg b/actions/22/bookmark_add.svg similarity index 100% rename from actions/22x22-light/bookmark_add.svg rename to actions/22/bookmark_add.svg diff --git a/actions/22x22-light/bookmark_list-add.svg b/actions/22/bookmark_list-add.svg similarity index 100% rename from actions/22x22-light/bookmark_list-add.svg rename to actions/22/bookmark_list-add.svg diff --git a/actions/22x22-light/bookmark_list_add.svg b/actions/22/bookmark_list_add.svg similarity index 100% rename from actions/22x22-light/bookmark_list_add.svg rename to actions/22/bookmark_list_add.svg diff --git a/actions/22x22-light/bookmarks-list-add.svg b/actions/22/bookmarks-list-add.svg similarity index 100% rename from actions/22x22-light/bookmarks-list-add.svg rename to actions/22/bookmarks-list-add.svg diff --git a/actions/22x22-light/bookmarks-organize.svg b/actions/22/bookmarks-organize.svg similarity index 100% rename from actions/22x22-light/bookmarks-organize.svg rename to actions/22/bookmarks-organize.svg diff --git a/actions/22x22-light/bookmarks.svg b/actions/22/bookmarks.svg similarity index 100% rename from actions/22x22-light/bookmarks.svg rename to actions/22/bookmarks.svg diff --git a/actions/22x22-light/bookmarks_list-add.svg b/actions/22/bookmarks_list-add.svg similarity index 100% rename from actions/22x22-light/bookmarks_list-add.svg rename to actions/22/bookmarks_list-add.svg diff --git a/actions/22x22-light/bookmarks_list_add.svg b/actions/22/bookmarks_list_add.svg similarity index 100% rename from actions/22x22-light/bookmarks_list_add.svg rename to actions/22/bookmarks_list_add.svg diff --git a/actions/22x22-light/bordertool.svg b/actions/22/bordertool.svg similarity index 100% rename from actions/22x22-light/bordertool.svg rename to actions/22/bordertool.svg diff --git a/actions/22x22-light/bottom.svg b/actions/22/bottom.svg similarity index 100% rename from actions/22x22-light/bottom.svg rename to actions/22/bottom.svg diff --git a/actions/22x22-light/bqm-add.svg b/actions/22/bqm-add.svg similarity index 100% rename from actions/22x22-light/bqm-add.svg rename to actions/22/bqm-add.svg diff --git a/actions/22x22-light/bqm-addqueue.svg b/actions/22/bqm-addqueue.svg similarity index 100% rename from actions/22x22-light/bqm-addqueue.svg rename to actions/22/bqm-addqueue.svg diff --git a/actions/22x22-light/bqm-commit.svg b/actions/22/bqm-commit.svg similarity index 100% rename from actions/22x22-light/bqm-commit.svg rename to actions/22/bqm-commit.svg diff --git a/actions/22x22-light/bqm-diff.svg b/actions/22/bqm-diff.svg similarity index 100% rename from actions/22x22-light/bqm-diff.svg rename to actions/22/bqm-diff.svg diff --git a/actions/22x22-light/bqm-remove.svg b/actions/22/bqm-remove.svg similarity index 100% rename from actions/22x22-light/bqm-remove.svg rename to actions/22/bqm-remove.svg diff --git a/actions/22x22-light/bqm-rmqueue.svg b/actions/22/bqm-rmqueue.svg similarity index 100% rename from actions/22x22-light/bqm-rmqueue.svg rename to actions/22/bqm-rmqueue.svg diff --git a/actions/22x22-light/bqm-update.svg b/actions/22/bqm-update.svg similarity index 100% rename from actions/22x22-light/bqm-update.svg rename to actions/22/bqm-update.svg diff --git a/actions/22x22-light/browser-download.svg b/actions/22/browser-download.svg similarity index 100% rename from actions/22x22-light/browser-download.svg rename to actions/22/browser-download.svg diff --git a/actions/22x22-light/button-cancel.svg b/actions/22/button-cancel.svg similarity index 100% rename from actions/22x22-light/button-cancel.svg rename to actions/22/button-cancel.svg diff --git a/actions/22x22-light/button_cancel.svg b/actions/22/button_cancel.svg similarity index 100% rename from actions/22x22-light/button_cancel.svg rename to actions/22/button_cancel.svg diff --git a/actions/22x22-light/bwtonal.svg b/actions/22/bwtonal.svg similarity index 100% rename from actions/22x22-light/bwtonal.svg rename to actions/22/bwtonal.svg diff --git a/actions/22x22-light/cab_extract.svg b/actions/22/cab_extract.svg similarity index 100% rename from actions/22x22-light/cab_extract.svg rename to actions/22/cab_extract.svg diff --git a/actions/22x22-light/call-start.svg b/actions/22/call-start.svg similarity index 100% rename from actions/22x22-light/call-start.svg rename to actions/22/call-start.svg diff --git a/actions/22x22-light/call-stop.svg b/actions/22/call-stop.svg similarity index 100% rename from actions/22x22-light/call-stop.svg rename to actions/22/call-stop.svg diff --git a/actions/22x22-light/camera-off.svg b/actions/22/camera-off.svg similarity index 100% rename from actions/22x22-light/camera-off.svg rename to actions/22/camera-off.svg diff --git a/actions/22x22-light/camera-on.svg b/actions/22/camera-on.svg similarity index 100% rename from actions/22x22-light/camera-on.svg rename to actions/22/camera-on.svg diff --git a/actions/22x22-light/camera-ready.svg b/actions/22/camera-ready.svg similarity index 100% rename from actions/22x22-light/camera-ready.svg rename to actions/22/camera-ready.svg diff --git a/actions/22x22-light/cancel.svg b/actions/22/cancel.svg similarity index 100% rename from actions/22x22-light/cancel.svg rename to actions/22/cancel.svg diff --git a/actions/22x22-light/catfish.svg b/actions/22/catfish.svg similarity index 100% rename from actions/22x22-light/catfish.svg rename to actions/22/catfish.svg diff --git a/actions/22x22-light/cdplayer-eject.svg b/actions/22/cdplayer-eject.svg similarity index 100% rename from actions/22x22-light/cdplayer-eject.svg rename to actions/22/cdplayer-eject.svg diff --git a/actions/22x22-light/channelmixer.svg b/actions/22/channelmixer.svg similarity index 100% rename from actions/22x22-light/channelmixer.svg rename to actions/22/channelmixer.svg diff --git a/actions/22x22-light/character-set.svg b/actions/22/character-set.svg similarity index 100% rename from actions/22x22-light/character-set.svg rename to actions/22/character-set.svg diff --git a/actions/22x22-light/charcoaltool.svg b/actions/22/charcoaltool.svg similarity index 100% rename from actions/22x22-light/charcoaltool.svg rename to actions/22/charcoaltool.svg diff --git a/actions/22x22-light/checkbox.svg b/actions/22/checkbox.svg similarity index 100% rename from actions/22x22-light/checkbox.svg rename to actions/22/checkbox.svg diff --git a/actions/22x22-light/checkmark.svg b/actions/22/checkmark.svg similarity index 100% rename from actions/22x22-light/checkmark.svg rename to actions/22/checkmark.svg diff --git a/actions/22x22-light/chronometer-lap.svg b/actions/22/chronometer-lap.svg similarity index 100% rename from actions/22x22-light/chronometer-lap.svg rename to actions/22/chronometer-lap.svg diff --git a/actions/22x22-light/chronometer-pause.svg b/actions/22/chronometer-pause.svg similarity index 100% rename from actions/22x22-light/chronometer-pause.svg rename to actions/22/chronometer-pause.svg diff --git a/actions/22x22-light/chronometer-reset.svg b/actions/22/chronometer-reset.svg similarity index 100% rename from actions/22x22-light/chronometer-reset.svg rename to actions/22/chronometer-reset.svg diff --git a/actions/22x22-light/chronometer-start.svg b/actions/22/chronometer-start.svg similarity index 100% rename from actions/22x22-light/chronometer-start.svg rename to actions/22/chronometer-start.svg diff --git a/actions/22x22-light/chronometer.svg b/actions/22/chronometer.svg similarity index 100% rename from actions/22x22-light/chronometer.svg rename to actions/22/chronometer.svg diff --git a/actions/22x22-light/code-block.svg b/actions/22/code-block.svg similarity index 100% rename from actions/22x22-light/code-block.svg rename to actions/22/code-block.svg diff --git a/actions/22x22-light/code-class.svg b/actions/22/code-class.svg similarity index 100% rename from actions/22x22-light/code-class.svg rename to actions/22/code-class.svg diff --git a/actions/22x22-light/code-context.svg b/actions/22/code-context.svg similarity index 100% rename from actions/22x22-light/code-context.svg rename to actions/22/code-context.svg diff --git a/actions/22x22-light/code-function.svg b/actions/22/code-function.svg similarity index 100% rename from actions/22x22-light/code-function.svg rename to actions/22/code-function.svg diff --git a/actions/22x22-light/code-typedef.svg b/actions/22/code-typedef.svg similarity index 100% rename from actions/22x22-light/code-typedef.svg rename to actions/22/code-typedef.svg diff --git a/actions/22x22-light/code-variable.svg b/actions/22/code-variable.svg similarity index 100% rename from actions/22x22-light/code-variable.svg rename to actions/22/code-variable.svg diff --git a/actions/22x22-light/collection-refresh-amarok.svg b/actions/22/collection-refresh-amarok.svg similarity index 100% rename from actions/22x22-light/collection-refresh-amarok.svg rename to actions/22/collection-refresh-amarok.svg diff --git a/actions/22x22-light/collection-rescan-amarok.svg b/actions/22/collection-rescan-amarok.svg similarity index 100% rename from actions/22x22-light/collection-rescan-amarok.svg rename to actions/22/collection-rescan-amarok.svg diff --git a/actions/22x22-light/color-fill.svg b/actions/22/color-fill.svg similarity index 100% rename from actions/22x22-light/color-fill.svg rename to actions/22/color-fill.svg diff --git a/actions/22x22-light/color-gradient.svg b/actions/22/color-gradient.svg similarity index 100% rename from actions/22x22-light/color-gradient.svg rename to actions/22/color-gradient.svg diff --git a/actions/22x22-light/color-management.svg b/actions/22/color-management.svg similarity index 100% rename from actions/22x22-light/color-management.svg rename to actions/22/color-management.svg diff --git a/actions/22x22-light/color-picker-black.svg b/actions/22/color-picker-black.svg similarity index 100% rename from actions/22x22-light/color-picker-black.svg rename to actions/22/color-picker-black.svg diff --git a/actions/22x22-light/color-picker-grey.svg b/actions/22/color-picker-grey.svg similarity index 100% rename from actions/22x22-light/color-picker-grey.svg rename to actions/22/color-picker-grey.svg diff --git a/actions/22x22-light/color-picker-white.svg b/actions/22/color-picker-white.svg similarity index 100% rename from actions/22x22-light/color-picker-white.svg rename to actions/22/color-picker-white.svg diff --git a/actions/22x22-light/color-picker.svg b/actions/22/color-picker.svg similarity index 100% rename from actions/22x22-light/color-picker.svg rename to actions/22/color-picker.svg diff --git a/actions/22x22-light/colorfx.svg b/actions/22/colorfx.svg similarity index 100% rename from actions/22x22-light/colorfx.svg rename to actions/22/colorfx.svg diff --git a/actions/22x22-light/colormanagement.svg b/actions/22/colormanagement.svg similarity index 100% rename from actions/22x22-light/colormanagement.svg rename to actions/22/colormanagement.svg diff --git a/actions/22x22-light/colorneg.svg b/actions/22/colorneg.svg similarity index 100% rename from actions/22x22-light/colorneg.svg rename to actions/22/colorneg.svg diff --git a/actions/22x22-light/colors-chromablue.svg b/actions/22/colors-chromablue.svg similarity index 100% rename from actions/22x22-light/colors-chromablue.svg rename to actions/22/colors-chromablue.svg diff --git a/actions/22x22-light/colors-chromagreen.svg b/actions/22/colors-chromagreen.svg similarity index 100% rename from actions/22x22-light/colors-chromagreen.svg rename to actions/22/colors-chromagreen.svg diff --git a/actions/22x22-light/colors-chromared.svg b/actions/22/colors-chromared.svg similarity index 100% rename from actions/22x22-light/colors-chromared.svg rename to actions/22/colors-chromared.svg diff --git a/actions/22x22-light/colors-luma.svg b/actions/22/colors-luma.svg similarity index 100% rename from actions/22x22-light/colors-luma.svg rename to actions/22/colors-luma.svg diff --git a/actions/22x22-light/configure-shortcuts.svg b/actions/22/configure-shortcuts.svg similarity index 100% rename from actions/22x22-light/configure-shortcuts.svg rename to actions/22/configure-shortcuts.svg diff --git a/actions/22x22-light/configure-toolbars.svg b/actions/22/configure-toolbars.svg similarity index 100% rename from actions/22x22-light/configure-toolbars.svg rename to actions/22/configure-toolbars.svg diff --git a/actions/22x22-light/configure.svg b/actions/22/configure.svg similarity index 100% rename from actions/22x22-light/configure.svg rename to actions/22/configure.svg diff --git a/actions/22x22-light/contact-new.svg b/actions/22/contact-new.svg similarity index 100% rename from actions/22x22-light/contact-new.svg rename to actions/22/contact-new.svg diff --git a/actions/22x22-light/contrast.svg b/actions/22/contrast.svg similarity index 100% rename from actions/22x22-light/contrast.svg rename to actions/22/contrast.svg diff --git a/actions/22x22-light/cursor-arrow.svg b/actions/22/cursor-arrow.svg similarity index 100% rename from actions/22x22-light/cursor-arrow.svg rename to actions/22/cursor-arrow.svg diff --git a/actions/22x22-light/curve-connector.svg b/actions/22/curve-connector.svg similarity index 100% rename from actions/22x22-light/curve-connector.svg rename to actions/22/curve-connector.svg diff --git a/actions/22x22-light/dashboard-show.svg b/actions/22/dashboard-show.svg similarity index 100% rename from actions/22x22-light/dashboard-show.svg rename to actions/22/dashboard-show.svg diff --git a/actions/22x22-light/database-change-key.svg b/actions/22/database-change-key.svg similarity index 100% rename from actions/22x22-light/database-change-key.svg rename to actions/22/database-change-key.svg diff --git a/actions/22x22-light/database-index.svg b/actions/22/database-index.svg similarity index 100% rename from actions/22x22-light/database-index.svg rename to actions/22/database-index.svg diff --git a/actions/22x22-light/debug-execute-from-cursor.svg b/actions/22/debug-execute-from-cursor.svg similarity index 100% rename from actions/22x22-light/debug-execute-from-cursor.svg rename to actions/22/debug-execute-from-cursor.svg diff --git a/actions/22x22-light/debug-execute-to-cursor.svg b/actions/22/debug-execute-to-cursor.svg similarity index 100% rename from actions/22x22-light/debug-execute-to-cursor.svg rename to actions/22/debug-execute-to-cursor.svg diff --git a/actions/22x22-light/debug-run-cursor.svg b/actions/22/debug-run-cursor.svg similarity index 100% rename from actions/22x22-light/debug-run-cursor.svg rename to actions/22/debug-run-cursor.svg diff --git a/actions/22x22-light/debug-run.svg b/actions/22/debug-run.svg similarity index 100% rename from actions/22x22-light/debug-run.svg rename to actions/22/debug-run.svg diff --git a/actions/22x22-light/debug-step-instruction.svg b/actions/22/debug-step-instruction.svg similarity index 100% rename from actions/22x22-light/debug-step-instruction.svg rename to actions/22/debug-step-instruction.svg diff --git a/actions/22x22-light/debug-step-into-instruction.svg b/actions/22/debug-step-into-instruction.svg similarity index 100% rename from actions/22x22-light/debug-step-into-instruction.svg rename to actions/22/debug-step-into-instruction.svg diff --git a/actions/22x22-light/debug-step-into.svg b/actions/22/debug-step-into.svg similarity index 100% rename from actions/22x22-light/debug-step-into.svg rename to actions/22/debug-step-into.svg diff --git a/actions/22x22-light/debug-step-out.svg b/actions/22/debug-step-out.svg similarity index 100% rename from actions/22x22-light/debug-step-out.svg rename to actions/22/debug-step-out.svg diff --git a/actions/22x22-light/debug-step-over.svg b/actions/22/debug-step-over.svg similarity index 100% rename from actions/22x22-light/debug-step-over.svg rename to actions/22/debug-step-over.svg diff --git a/actions/22x22-light/delete-table-row.svg b/actions/22/delete-table-row.svg similarity index 100% rename from actions/22x22-light/delete-table-row.svg rename to actions/22/delete-table-row.svg diff --git a/actions/22x22-light/depth16to8.svg b/actions/22/depth16to8.svg similarity index 100% rename from actions/22x22-light/depth16to8.svg rename to actions/22/depth16to8.svg diff --git a/actions/22x22-light/depth8to16.svg b/actions/22/depth8to16.svg similarity index 100% rename from actions/22x22-light/depth8to16.svg rename to actions/22/depth8to16.svg diff --git a/actions/22x22-light/dialog-align-and-distribute.svg b/actions/22/dialog-align-and-distribute.svg similarity index 100% rename from actions/22x22-light/dialog-align-and-distribute.svg rename to actions/22/dialog-align-and-distribute.svg diff --git a/actions/22x22-light/dialog-apply.svg b/actions/22/dialog-apply.svg similarity index 100% rename from actions/22x22-light/dialog-apply.svg rename to actions/22/dialog-apply.svg diff --git a/actions/22x22-light/dialog-cancel.svg b/actions/22/dialog-cancel.svg similarity index 100% rename from actions/22x22-light/dialog-cancel.svg rename to actions/22/dialog-cancel.svg diff --git a/actions/22x22-light/dialog-close.svg b/actions/22/dialog-close.svg similarity index 100% rename from actions/22x22-light/dialog-close.svg rename to actions/22/dialog-close.svg diff --git a/actions/22x22-light/dialog-fill-and-stroke.svg b/actions/22/dialog-fill-and-stroke.svg similarity index 100% rename from actions/22x22-light/dialog-fill-and-stroke.svg rename to actions/22/dialog-fill-and-stroke.svg diff --git a/actions/22x22-light/dialog-filters.svg b/actions/22/dialog-filters.svg similarity index 100% rename from actions/22x22-light/dialog-filters.svg rename to actions/22/dialog-filters.svg diff --git a/actions/22x22-light/dialog-icon-preview.svg b/actions/22/dialog-icon-preview.svg similarity index 100% rename from actions/22x22-light/dialog-icon-preview.svg rename to actions/22/dialog-icon-preview.svg diff --git a/actions/22x22-light/dialog-input-devices.svg b/actions/22/dialog-input-devices.svg similarity index 100% rename from actions/22x22-light/dialog-input-devices.svg rename to actions/22/dialog-input-devices.svg diff --git a/actions/22x22-light/dialog-layers.svg b/actions/22/dialog-layers.svg similarity index 100% rename from actions/22x22-light/dialog-layers.svg rename to actions/22/dialog-layers.svg diff --git a/actions/22x22-light/dialog-memory.svg b/actions/22/dialog-memory.svg similarity index 100% rename from actions/22x22-light/dialog-memory.svg rename to actions/22/dialog-memory.svg diff --git a/actions/22x22-light/dialog-messages.svg b/actions/22/dialog-messages.svg similarity index 100% rename from actions/22x22-light/dialog-messages.svg rename to actions/22/dialog-messages.svg diff --git a/actions/22x22-light/dialog-no.svg b/actions/22/dialog-no.svg similarity index 100% rename from actions/22x22-light/dialog-no.svg rename to actions/22/dialog-no.svg diff --git a/actions/22x22-light/dialog-object-properties.svg b/actions/22/dialog-object-properties.svg similarity index 100% rename from actions/22x22-light/dialog-object-properties.svg rename to actions/22/dialog-object-properties.svg diff --git a/actions/22x22-light/dialog-ok-apply.svg b/actions/22/dialog-ok-apply.svg similarity index 100% rename from actions/22x22-light/dialog-ok-apply.svg rename to actions/22/dialog-ok-apply.svg diff --git a/actions/22x22-light/dialog-ok.svg b/actions/22/dialog-ok.svg similarity index 100% rename from actions/22x22-light/dialog-ok.svg rename to actions/22/dialog-ok.svg diff --git a/actions/22x22-light/dialog-rows-and-columns.svg b/actions/22/dialog-rows-and-columns.svg similarity index 100% rename from actions/22x22-light/dialog-rows-and-columns.svg rename to actions/22/dialog-rows-and-columns.svg diff --git a/actions/22x22-light/dialog-scripts.svg b/actions/22/dialog-scripts.svg similarity index 100% rename from actions/22x22-light/dialog-scripts.svg rename to actions/22/dialog-scripts.svg diff --git a/actions/22x22-light/dialog-text-and-font.svg b/actions/22/dialog-text-and-font.svg similarity index 100% rename from actions/22x22-light/dialog-text-and-font.svg rename to actions/22/dialog-text-and-font.svg diff --git a/actions/22x22-light/dialog-tile-clones.svg b/actions/22/dialog-tile-clones.svg similarity index 100% rename from actions/22x22-light/dialog-tile-clones.svg rename to actions/22/dialog-tile-clones.svg diff --git a/actions/22x22-light/dialog-transform.svg b/actions/22/dialog-transform.svg similarity index 100% rename from actions/22x22-light/dialog-transform.svg rename to actions/22/dialog-transform.svg diff --git a/actions/22x22-light/dialog-xml-editor.svg b/actions/22/dialog-xml-editor.svg similarity index 100% rename from actions/22x22-light/dialog-xml-editor.svg rename to actions/22/dialog-xml-editor.svg diff --git a/actions/22x22-light/dialog-yes.svg b/actions/22/dialog-yes.svg similarity index 100% rename from actions/22x22-light/dialog-yes.svg rename to actions/22/dialog-yes.svg diff --git a/actions/22x22-light/dirsync.svg b/actions/22/dirsync.svg similarity index 100% rename from actions/22x22-light/dirsync.svg rename to actions/22/dirsync.svg diff --git a/actions/22x22-light/distortionfx.svg b/actions/22/distortionfx.svg similarity index 100% rename from actions/22x22-light/distortionfx.svg rename to actions/22/distortionfx.svg diff --git a/actions/22x22-light/distribute-graph-directed.svg b/actions/22/distribute-graph-directed.svg similarity index 100% rename from actions/22x22-light/distribute-graph-directed.svg rename to actions/22/distribute-graph-directed.svg diff --git a/actions/22x22-light/distribute-graph.svg b/actions/22/distribute-graph.svg similarity index 100% rename from actions/22x22-light/distribute-graph.svg rename to actions/22/distribute-graph.svg diff --git a/actions/22x22-light/distribute-horizontal-baseline.svg b/actions/22/distribute-horizontal-baseline.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-baseline.svg rename to actions/22/distribute-horizontal-baseline.svg diff --git a/actions/22x22-light/distribute-horizontal-center.svg b/actions/22/distribute-horizontal-center.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-center.svg rename to actions/22/distribute-horizontal-center.svg diff --git a/actions/22x22-light/distribute-horizontal-equal.svg b/actions/22/distribute-horizontal-equal.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-equal.svg rename to actions/22/distribute-horizontal-equal.svg diff --git a/actions/22x22-light/distribute-horizontal-gaps.svg b/actions/22/distribute-horizontal-gaps.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-gaps.svg rename to actions/22/distribute-horizontal-gaps.svg diff --git a/actions/22x22-light/distribute-horizontal-left.svg b/actions/22/distribute-horizontal-left.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-left.svg rename to actions/22/distribute-horizontal-left.svg diff --git a/actions/22x22-light/distribute-horizontal-margin.svg b/actions/22/distribute-horizontal-margin.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-margin.svg rename to actions/22/distribute-horizontal-margin.svg diff --git a/actions/22x22-light/distribute-horizontal-page.svg b/actions/22/distribute-horizontal-page.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-page.svg rename to actions/22/distribute-horizontal-page.svg diff --git a/actions/22x22-light/distribute-horizontal-right.svg b/actions/22/distribute-horizontal-right.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-right.svg rename to actions/22/distribute-horizontal-right.svg diff --git a/actions/22x22-light/distribute-horizontal-x.svg b/actions/22/distribute-horizontal-x.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal-x.svg rename to actions/22/distribute-horizontal-x.svg diff --git a/actions/22x22-light/distribute-horizontal.svg b/actions/22/distribute-horizontal.svg similarity index 100% rename from actions/22x22-light/distribute-horizontal.svg rename to actions/22/distribute-horizontal.svg diff --git a/actions/22x22-light/distribute-randomize.svg b/actions/22/distribute-randomize.svg similarity index 100% rename from actions/22x22-light/distribute-randomize.svg rename to actions/22/distribute-randomize.svg diff --git a/actions/22x22-light/distribute-remove-overlaps.svg b/actions/22/distribute-remove-overlaps.svg similarity index 100% rename from actions/22x22-light/distribute-remove-overlaps.svg rename to actions/22/distribute-remove-overlaps.svg diff --git a/actions/22x22-light/distribute-unclump.svg b/actions/22/distribute-unclump.svg similarity index 100% rename from actions/22x22-light/distribute-unclump.svg rename to actions/22/distribute-unclump.svg diff --git a/actions/22x22-light/distribute-vertical-baseline.svg b/actions/22/distribute-vertical-baseline.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-baseline.svg rename to actions/22/distribute-vertical-baseline.svg diff --git a/actions/22x22-light/distribute-vertical-bottom.svg b/actions/22/distribute-vertical-bottom.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-bottom.svg rename to actions/22/distribute-vertical-bottom.svg diff --git a/actions/22x22-light/distribute-vertical-center.svg b/actions/22/distribute-vertical-center.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-center.svg rename to actions/22/distribute-vertical-center.svg diff --git a/actions/22x22-light/distribute-vertical-equal.svg b/actions/22/distribute-vertical-equal.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-equal.svg rename to actions/22/distribute-vertical-equal.svg diff --git a/actions/22x22-light/distribute-vertical-gaps.svg b/actions/22/distribute-vertical-gaps.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-gaps.svg rename to actions/22/distribute-vertical-gaps.svg diff --git a/actions/22x22-light/distribute-vertical-margin.svg b/actions/22/distribute-vertical-margin.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-margin.svg rename to actions/22/distribute-vertical-margin.svg diff --git a/actions/22x22-light/distribute-vertical-page.svg b/actions/22/distribute-vertical-page.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-page.svg rename to actions/22/distribute-vertical-page.svg diff --git a/actions/22x22-light/distribute-vertical-top.svg b/actions/22/distribute-vertical-top.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-top.svg rename to actions/22/distribute-vertical-top.svg diff --git a/actions/22x22-light/distribute-vertical-y.svg b/actions/22/distribute-vertical-y.svg similarity index 100% rename from actions/22x22-light/distribute-vertical-y.svg rename to actions/22/distribute-vertical-y.svg diff --git a/actions/22x22-light/distribute-vertical.svg b/actions/22/distribute-vertical.svg similarity index 100% rename from actions/22x22-light/distribute-vertical.svg rename to actions/22/distribute-vertical.svg diff --git a/actions/22x22-light/document-cleanup.svg b/actions/22/document-cleanup.svg similarity index 100% rename from actions/22x22-light/document-cleanup.svg rename to actions/22/document-cleanup.svg diff --git a/actions/22x22-light/document-close.svg b/actions/22/document-close.svg similarity index 100% rename from actions/22x22-light/document-close.svg rename to actions/22/document-close.svg diff --git a/actions/22x22-light/document-decrypt.svg b/actions/22/document-decrypt.svg similarity index 100% rename from actions/22x22-light/document-decrypt.svg rename to actions/22/document-decrypt.svg diff --git a/actions/22x22-light/document-edit-decrypt-verify.svg b/actions/22/document-edit-decrypt-verify.svg similarity index 100% rename from actions/22x22-light/document-edit-decrypt-verify.svg rename to actions/22/document-edit-decrypt-verify.svg diff --git a/actions/22x22-light/document-edit-decrypt.svg b/actions/22/document-edit-decrypt.svg similarity index 100% rename from actions/22x22-light/document-edit-decrypt.svg rename to actions/22/document-edit-decrypt.svg diff --git a/actions/22x22-light/document-edit-encrypt.svg b/actions/22/document-edit-encrypt.svg similarity index 100% rename from actions/22x22-light/document-edit-encrypt.svg rename to actions/22/document-edit-encrypt.svg diff --git a/actions/22x22-light/document-edit-sign-encrypt.svg b/actions/22/document-edit-sign-encrypt.svg similarity index 100% rename from actions/22x22-light/document-edit-sign-encrypt.svg rename to actions/22/document-edit-sign-encrypt.svg diff --git a/actions/22x22-light/document-edit-sign.svg b/actions/22/document-edit-sign.svg similarity index 100% rename from actions/22x22-light/document-edit-sign.svg rename to actions/22/document-edit-sign.svg diff --git a/actions/22x22-light/document-edit-verify.svg b/actions/22/document-edit-verify.svg similarity index 100% rename from actions/22x22-light/document-edit-verify.svg rename to actions/22/document-edit-verify.svg diff --git a/actions/22x22-light/document-edit.svg b/actions/22/document-edit.svg similarity index 100% rename from actions/22x22-light/document-edit.svg rename to actions/22/document-edit.svg diff --git a/actions/22x22-light/document-encrypt.svg b/actions/22/document-encrypt.svg similarity index 100% rename from actions/22x22-light/document-encrypt.svg rename to actions/22/document-encrypt.svg diff --git a/actions/22x22-light/document-encrypted.svg b/actions/22/document-encrypted.svg similarity index 100% rename from actions/22x22-light/document-encrypted.svg rename to actions/22/document-encrypted.svg diff --git a/actions/22x22-light/document-export-local.svg b/actions/22/document-export-local.svg similarity index 100% rename from actions/22x22-light/document-export-local.svg rename to actions/22/document-export-local.svg diff --git a/actions/22x22-light/document-export-ocal.svg b/actions/22/document-export-ocal.svg similarity index 100% rename from actions/22x22-light/document-export-ocal.svg rename to actions/22/document-export-ocal.svg diff --git a/actions/22x22-light/document-export-table.svg b/actions/22/document-export-table.svg similarity index 100% rename from actions/22x22-light/document-export-table.svg rename to actions/22/document-export-table.svg diff --git a/actions/22x22-light/document-export.svg b/actions/22/document-export.svg similarity index 100% rename from actions/22x22-light/document-export.svg rename to actions/22/document-export.svg diff --git a/actions/22x22-light/document-import-local.svg b/actions/22/document-import-local.svg similarity index 100% rename from actions/22x22-light/document-import-local.svg rename to actions/22/document-import-local.svg diff --git a/actions/22x22-light/document-import-ocal.svg b/actions/22/document-import-ocal.svg similarity index 100% rename from actions/22x22-light/document-import-ocal.svg rename to actions/22/document-import-ocal.svg diff --git a/actions/22x22-light/document-import-table.svg b/actions/22/document-import-table.svg similarity index 100% rename from actions/22x22-light/document-import-table.svg rename to actions/22/document-import-table.svg diff --git a/actions/22x22-light/document-import.svg b/actions/22/document-import.svg similarity index 100% rename from actions/22x22-light/document-import.svg rename to actions/22/document-import.svg diff --git a/actions/22x22-light/document-info.svg b/actions/22/document-info.svg similarity index 100% rename from actions/22x22-light/document-info.svg rename to actions/22/document-info.svg diff --git a/actions/22x22-light/document-multiple.svg b/actions/22/document-multiple.svg similarity index 100% rename from actions/22x22-light/document-multiple.svg rename to actions/22/document-multiple.svg diff --git a/actions/22x22-light/document-new-from-template.svg b/actions/22/document-new-from-template.svg similarity index 100% rename from actions/22x22-light/document-new-from-template.svg rename to actions/22/document-new-from-template.svg diff --git a/actions/22x22-light/document-new.svg b/actions/22/document-new.svg similarity index 100% rename from actions/22x22-light/document-new.svg rename to actions/22/document-new.svg diff --git a/actions/22x22-light/document-open-data.svg b/actions/22/document-open-data.svg similarity index 100% rename from actions/22x22-light/document-open-data.svg rename to actions/22/document-open-data.svg diff --git a/actions/22x22-light/document-open-folder.svg b/actions/22/document-open-folder.svg similarity index 100% rename from actions/22x22-light/document-open-folder.svg rename to actions/22/document-open-folder.svg diff --git a/actions/22x22-light/document-open-recent.svg b/actions/22/document-open-recent.svg similarity index 100% rename from actions/22x22-light/document-open-recent.svg rename to actions/22/document-open-recent.svg diff --git a/actions/22x22-light/document-open-recent2.svg b/actions/22/document-open-recent2.svg similarity index 100% rename from actions/22x22-light/document-open-recent2.svg rename to actions/22/document-open-recent2.svg diff --git a/actions/22x22-light/document-open-remote.svg b/actions/22/document-open-remote.svg similarity index 100% rename from actions/22x22-light/document-open-remote.svg rename to actions/22/document-open-remote.svg diff --git a/actions/22x22-light/document-open.svg b/actions/22/document-open.svg similarity index 100% rename from actions/22x22-light/document-open.svg rename to actions/22/document-open.svg diff --git a/actions/22x22-light/document-page-setup.svg b/actions/22/document-page-setup.svg similarity index 100% rename from actions/22x22-light/document-page-setup.svg rename to actions/22/document-page-setup.svg diff --git a/actions/22x22-light/document-preview-archive.svg b/actions/22/document-preview-archive.svg similarity index 100% rename from actions/22x22-light/document-preview-archive.svg rename to actions/22/document-preview-archive.svg diff --git a/actions/22x22-light/document-preview.svg b/actions/22/document-preview.svg similarity index 100% rename from actions/22x22-light/document-preview.svg rename to actions/22/document-preview.svg diff --git a/actions/22x22-light/document-print-direct.svg b/actions/22/document-print-direct.svg similarity index 100% rename from actions/22x22-light/document-print-direct.svg rename to actions/22/document-print-direct.svg diff --git a/actions/22x22-light/document-print-frame.svg b/actions/22/document-print-frame.svg similarity index 100% rename from actions/22x22-light/document-print-frame.svg rename to actions/22/document-print-frame.svg diff --git a/actions/22x22-light/document-print-preview.svg b/actions/22/document-print-preview.svg similarity index 100% rename from actions/22x22-light/document-print-preview.svg rename to actions/22/document-print-preview.svg diff --git a/actions/22x22-light/document-print.svg b/actions/22/document-print.svg similarity index 100% rename from actions/22x22-light/document-print.svg rename to actions/22/document-print.svg diff --git a/actions/22x22-light/document-properties.svg b/actions/22/document-properties.svg similarity index 100% rename from actions/22x22-light/document-properties.svg rename to actions/22/document-properties.svg diff --git a/actions/22x22-light/document-revert-rtl.svg b/actions/22/document-revert-rtl.svg similarity index 100% rename from actions/22x22-light/document-revert-rtl.svg rename to actions/22/document-revert-rtl.svg diff --git a/actions/22x22-light/document-revert.svg b/actions/22/document-revert.svg similarity index 100% rename from actions/22x22-light/document-revert.svg rename to actions/22/document-revert.svg diff --git a/actions/22x22-light/document-save-all.svg b/actions/22/document-save-all.svg similarity index 100% rename from actions/22x22-light/document-save-all.svg rename to actions/22/document-save-all.svg diff --git a/actions/22x22-light/document-save-as.svg b/actions/22/document-save-as.svg similarity index 100% rename from actions/22x22-light/document-save-as.svg rename to actions/22/document-save-as.svg diff --git a/actions/22x22-light/document-save.svg b/actions/22/document-save.svg similarity index 100% rename from actions/22x22-light/document-save.svg rename to actions/22/document-save.svg diff --git a/actions/22x22-light/document-send.svg b/actions/22/document-send.svg similarity index 100% rename from actions/22x22-light/document-send.svg rename to actions/22/document-send.svg diff --git a/actions/22x22-light/document-share.svg b/actions/22/document-share.svg similarity index 100% rename from actions/22x22-light/document-share.svg rename to actions/22/document-share.svg diff --git a/actions/22x22-light/document-sign.svg b/actions/22/document-sign.svg similarity index 100% rename from actions/22x22-light/document-sign.svg rename to actions/22/document-sign.svg diff --git a/actions/22x22-light/document-swap.svg b/actions/22/document-swap.svg similarity index 100% rename from actions/22x22-light/document-swap.svg rename to actions/22/document-swap.svg diff --git a/actions/22x22-light/documentation.svg b/actions/22/documentation.svg similarity index 100% rename from actions/22x22-light/documentation.svg rename to actions/22/documentation.svg diff --git a/actions/22x22-light/documentinfo.svg b/actions/22/documentinfo.svg similarity index 100% rename from actions/22x22-light/documentinfo.svg rename to actions/22/documentinfo.svg diff --git a/actions/22x22-light/down.svg b/actions/22/down.svg similarity index 100% rename from actions/22x22-light/down.svg rename to actions/22/down.svg diff --git a/actions/22x22-light/download-amarok.svg b/actions/22/download-amarok.svg similarity index 100% rename from actions/22x22-light/download-amarok.svg rename to actions/22/download-amarok.svg diff --git a/actions/22x22-light/download-later.svg b/actions/22/download-later.svg similarity index 100% rename from actions/22x22-light/download-later.svg rename to actions/22/download-later.svg diff --git a/actions/22x22-light/download.svg b/actions/22/download.svg similarity index 100% rename from actions/22x22-light/download.svg rename to actions/22/download.svg diff --git a/actions/22x22-light/draw-arrow-back.svg b/actions/22/draw-arrow-back.svg similarity index 100% rename from actions/22x22-light/draw-arrow-back.svg rename to actions/22/draw-arrow-back.svg diff --git a/actions/22x22-light/draw-arrow-down.svg b/actions/22/draw-arrow-down.svg similarity index 100% rename from actions/22x22-light/draw-arrow-down.svg rename to actions/22/draw-arrow-down.svg diff --git a/actions/22x22-light/draw-arrow-forward.svg b/actions/22/draw-arrow-forward.svg similarity index 100% rename from actions/22x22-light/draw-arrow-forward.svg rename to actions/22/draw-arrow-forward.svg diff --git a/actions/22x22-light/draw-arrow-up.svg b/actions/22/draw-arrow-up.svg similarity index 100% rename from actions/22x22-light/draw-arrow-up.svg rename to actions/22/draw-arrow-up.svg diff --git a/actions/22x22-light/draw-bezier-curves.svg b/actions/22/draw-bezier-curves.svg similarity index 100% rename from actions/22x22-light/draw-bezier-curves.svg rename to actions/22/draw-bezier-curves.svg diff --git a/actions/22x22-light/draw-brush.svg b/actions/22/draw-brush.svg similarity index 100% rename from actions/22x22-light/draw-brush.svg rename to actions/22/draw-brush.svg diff --git a/actions/22x22-light/draw-calligraphic.svg b/actions/22/draw-calligraphic.svg similarity index 100% rename from actions/22x22-light/draw-calligraphic.svg rename to actions/22/draw-calligraphic.svg diff --git a/actions/22x22-light/draw-circle.svg b/actions/22/draw-circle.svg similarity index 100% rename from actions/22x22-light/draw-circle.svg rename to actions/22/draw-circle.svg diff --git a/actions/22x22-light/draw-connector.svg b/actions/22/draw-connector.svg similarity index 100% rename from actions/22x22-light/draw-connector.svg rename to actions/22/draw-connector.svg diff --git a/actions/22x22-light/draw-cross.svg b/actions/22/draw-cross.svg similarity index 100% rename from actions/22x22-light/draw-cross.svg rename to actions/22/draw-cross.svg diff --git a/actions/22x22-light/draw-cuboid.svg b/actions/22/draw-cuboid.svg similarity index 100% rename from actions/22x22-light/draw-cuboid.svg rename to actions/22/draw-cuboid.svg diff --git a/actions/22x22-light/draw-donut.svg b/actions/22/draw-donut.svg similarity index 100% rename from actions/22x22-light/draw-donut.svg rename to actions/22/draw-donut.svg diff --git a/actions/22x22-light/draw-ellipse.svg b/actions/22/draw-ellipse.svg similarity index 100% rename from actions/22x22-light/draw-ellipse.svg rename to actions/22/draw-ellipse.svg diff --git a/actions/22x22-light/draw-eraser.svg b/actions/22/draw-eraser.svg similarity index 100% rename from actions/22x22-light/draw-eraser.svg rename to actions/22/draw-eraser.svg diff --git a/actions/22x22-light/draw-freehand.svg b/actions/22/draw-freehand.svg similarity index 100% rename from actions/22x22-light/draw-freehand.svg rename to actions/22/draw-freehand.svg diff --git a/actions/22x22-light/draw-halfcircle1.svg b/actions/22/draw-halfcircle1.svg similarity index 100% rename from actions/22x22-light/draw-halfcircle1.svg rename to actions/22/draw-halfcircle1.svg diff --git a/actions/22x22-light/draw-halfcircle2.svg b/actions/22/draw-halfcircle2.svg similarity index 100% rename from actions/22x22-light/draw-halfcircle2.svg rename to actions/22/draw-halfcircle2.svg diff --git a/actions/22x22-light/draw-halfcircle3.svg b/actions/22/draw-halfcircle3.svg similarity index 100% rename from actions/22x22-light/draw-halfcircle3.svg rename to actions/22/draw-halfcircle3.svg diff --git a/actions/22x22-light/draw-halfcircle4.svg b/actions/22/draw-halfcircle4.svg similarity index 100% rename from actions/22x22-light/draw-halfcircle4.svg rename to actions/22/draw-halfcircle4.svg diff --git a/actions/22x22-light/draw-line.svg b/actions/22/draw-line.svg similarity index 100% rename from actions/22x22-light/draw-line.svg rename to actions/22/draw-line.svg diff --git a/actions/22x22-light/draw-path.svg b/actions/22/draw-path.svg similarity index 100% rename from actions/22x22-light/draw-path.svg rename to actions/22/draw-path.svg diff --git a/actions/22x22-light/draw-polygon-star.svg b/actions/22/draw-polygon-star.svg similarity index 100% rename from actions/22x22-light/draw-polygon-star.svg rename to actions/22/draw-polygon-star.svg diff --git a/actions/22x22-light/draw-polygon.svg b/actions/22/draw-polygon.svg similarity index 100% rename from actions/22x22-light/draw-polygon.svg rename to actions/22/draw-polygon.svg diff --git a/actions/22x22-light/draw-polyline.svg b/actions/22/draw-polyline.svg similarity index 100% rename from actions/22x22-light/draw-polyline.svg rename to actions/22/draw-polyline.svg diff --git a/actions/22x22-light/draw-rectangle.svg b/actions/22/draw-rectangle.svg similarity index 100% rename from actions/22x22-light/draw-rectangle.svg rename to actions/22/draw-rectangle.svg diff --git a/actions/22x22-light/draw-spiral.svg b/actions/22/draw-spiral.svg similarity index 100% rename from actions/22x22-light/draw-spiral.svg rename to actions/22/draw-spiral.svg diff --git a/actions/22x22-light/draw-square-inverted-corners.svg b/actions/22/draw-square-inverted-corners.svg similarity index 100% rename from actions/22x22-light/draw-square-inverted-corners.svg rename to actions/22/draw-square-inverted-corners.svg diff --git a/actions/22x22-light/draw-star.svg b/actions/22/draw-star.svg similarity index 100% rename from actions/22x22-light/draw-star.svg rename to actions/22/draw-star.svg diff --git a/actions/22x22-light/draw-text.svg b/actions/22/draw-text.svg similarity index 100% rename from actions/22x22-light/draw-text.svg rename to actions/22/draw-text.svg diff --git a/actions/22x22-light/draw-triangle.svg b/actions/22/draw-triangle.svg similarity index 100% rename from actions/22x22-light/draw-triangle.svg rename to actions/22/draw-triangle.svg diff --git a/actions/22x22-light/draw-triangle1.svg b/actions/22/draw-triangle1.svg similarity index 100% rename from actions/22x22-light/draw-triangle1.svg rename to actions/22/draw-triangle1.svg diff --git a/actions/22x22-light/draw-triangle2.svg b/actions/22/draw-triangle2.svg similarity index 100% rename from actions/22x22-light/draw-triangle2.svg rename to actions/22/draw-triangle2.svg diff --git a/actions/22x22-light/draw-triangle3.svg b/actions/22/draw-triangle3.svg similarity index 100% rename from actions/22x22-light/draw-triangle3.svg rename to actions/22/draw-triangle3.svg diff --git a/actions/22x22-light/draw-triangle4.svg b/actions/22/draw-triangle4.svg similarity index 100% rename from actions/22x22-light/draw-triangle4.svg rename to actions/22/draw-triangle4.svg diff --git a/actions/22x22-light/draw-watercolor.svg b/actions/22/draw-watercolor.svg similarity index 100% rename from actions/22x22-light/draw-watercolor.svg rename to actions/22/draw-watercolor.svg diff --git a/actions/22x22-light/dynamic-amarok.svg b/actions/22/dynamic-amarok.svg similarity index 100% rename from actions/22x22-light/dynamic-amarok.svg rename to actions/22/dynamic-amarok.svg diff --git a/actions/22x22-light/edit-add.svg b/actions/22/edit-add.svg similarity index 100% rename from actions/22x22-light/edit-add.svg rename to actions/22/edit-add.svg diff --git a/actions/22x22-light/edit-bomb.svg b/actions/22/edit-bomb.svg similarity index 100% rename from actions/22x22-light/edit-bomb.svg rename to actions/22/edit-bomb.svg diff --git a/actions/22x22-light/edit-clear-all.svg b/actions/22/edit-clear-all.svg similarity index 100% rename from actions/22x22-light/edit-clear-all.svg rename to actions/22/edit-clear-all.svg diff --git a/actions/22x22-light/edit-clear-history.svg b/actions/22/edit-clear-history.svg similarity index 100% rename from actions/22x22-light/edit-clear-history.svg rename to actions/22/edit-clear-history.svg diff --git a/actions/22x22-light/edit-clear-list.svg b/actions/22/edit-clear-list.svg similarity index 100% rename from actions/22x22-light/edit-clear-list.svg rename to actions/22/edit-clear-list.svg diff --git a/actions/22x22-light/edit-clear-locationbar-ltr.svg b/actions/22/edit-clear-locationbar-ltr.svg similarity index 100% rename from actions/22x22-light/edit-clear-locationbar-ltr.svg rename to actions/22/edit-clear-locationbar-ltr.svg diff --git a/actions/22x22-light/edit-clear-locationbar-rtl.svg b/actions/22/edit-clear-locationbar-rtl.svg similarity index 100% rename from actions/22x22-light/edit-clear-locationbar-rtl.svg rename to actions/22/edit-clear-locationbar-rtl.svg diff --git a/actions/22x22-light/edit-clear.svg b/actions/22/edit-clear.svg similarity index 100% rename from actions/22x22-light/edit-clear.svg rename to actions/22/edit-clear.svg diff --git a/actions/22x22-light/edit-clone-unlink.svg b/actions/22/edit-clone-unlink.svg similarity index 100% rename from actions/22x22-light/edit-clone-unlink.svg rename to actions/22/edit-clone-unlink.svg diff --git a/actions/22x22-light/edit-clone.svg b/actions/22/edit-clone.svg similarity index 100% rename from actions/22x22-light/edit-clone.svg rename to actions/22/edit-clone.svg diff --git a/actions/22x22-light/edit-copy.svg b/actions/22/edit-copy.svg similarity index 100% rename from actions/22x22-light/edit-copy.svg rename to actions/22/edit-copy.svg diff --git a/actions/22x22-light/edit-cut.svg b/actions/22/edit-cut.svg similarity index 100% rename from actions/22x22-light/edit-cut.svg rename to actions/22/edit-cut.svg diff --git a/actions/22x22-light/edit-delete-shred.svg b/actions/22/edit-delete-shred.svg similarity index 100% rename from actions/22x22-light/edit-delete-shred.svg rename to actions/22/edit-delete-shred.svg diff --git a/actions/22x22-light/edit-delete.svg b/actions/22/edit-delete.svg similarity index 100% rename from actions/22x22-light/edit-delete.svg rename to actions/22/edit-delete.svg diff --git a/actions/22x22-light/edit-download.svg b/actions/22/edit-download.svg similarity index 100% rename from actions/22x22-light/edit-download.svg rename to actions/22/edit-download.svg diff --git a/actions/22x22-light/edit-duplicate.svg b/actions/22/edit-duplicate.svg similarity index 100% rename from actions/22x22-light/edit-duplicate.svg rename to actions/22/edit-duplicate.svg diff --git a/actions/22x22-light/edit-entry.svg b/actions/22/edit-entry.svg similarity index 100% rename from actions/22x22-light/edit-entry.svg rename to actions/22/edit-entry.svg diff --git a/actions/22x22-light/edit-find-email.svg b/actions/22/edit-find-email.svg similarity index 100% rename from actions/22x22-light/edit-find-email.svg rename to actions/22/edit-find-email.svg diff --git a/actions/22x22-light/edit-find-mail.svg b/actions/22/edit-find-mail.svg similarity index 100% rename from actions/22x22-light/edit-find-mail.svg rename to actions/22/edit-find-mail.svg diff --git a/actions/22x22-light/edit-find-project.svg b/actions/22/edit-find-project.svg similarity index 100% rename from actions/22x22-light/edit-find-project.svg rename to actions/22/edit-find-project.svg diff --git a/actions/22x22-light/edit-find-replace.svg b/actions/22/edit-find-replace.svg similarity index 100% rename from actions/22x22-light/edit-find-replace.svg rename to actions/22/edit-find-replace.svg diff --git a/actions/22x22-light/edit-find-user.svg b/actions/22/edit-find-user.svg similarity index 100% rename from actions/22x22-light/edit-find-user.svg rename to actions/22/edit-find-user.svg diff --git a/actions/22x22-light/edit-find.svg b/actions/22/edit-find.svg similarity index 100% rename from actions/22x22-light/edit-find.svg rename to actions/22/edit-find.svg diff --git a/actions/22x22-light/edit-guides.svg b/actions/22/edit-guides.svg similarity index 100% rename from actions/22x22-light/edit-guides.svg rename to actions/22/edit-guides.svg diff --git a/actions/22x22-light/edit-image-face-add.svg b/actions/22/edit-image-face-add.svg similarity index 100% rename from actions/22x22-light/edit-image-face-add.svg rename to actions/22/edit-image-face-add.svg diff --git a/actions/22x22-light/edit-image-face-detect.svg b/actions/22/edit-image-face-detect.svg similarity index 100% rename from actions/22x22-light/edit-image-face-detect.svg rename to actions/22/edit-image-face-detect.svg diff --git a/actions/22x22-light/edit-image-face-recognize.svg b/actions/22/edit-image-face-recognize.svg similarity index 100% rename from actions/22x22-light/edit-image-face-recognize.svg rename to actions/22/edit-image-face-recognize.svg diff --git a/actions/22x22-light/edit-image-face-show.svg b/actions/22/edit-image-face-show.svg similarity index 100% rename from actions/22x22-light/edit-image-face-show.svg rename to actions/22/edit-image-face-show.svg diff --git a/actions/22x22-light/edit-link.svg b/actions/22/edit-link.svg similarity index 100% rename from actions/22x22-light/edit-link.svg rename to actions/22/edit-link.svg diff --git a/actions/22x22-light/edit-node.svg b/actions/22/edit-node.svg similarity index 100% rename from actions/22x22-light/edit-node.svg rename to actions/22/edit-node.svg diff --git a/actions/22x22-light/edit-paste-in-place.svg b/actions/22/edit-paste-in-place.svg similarity index 100% rename from actions/22x22-light/edit-paste-in-place.svg rename to actions/22/edit-paste-in-place.svg diff --git a/actions/22x22-light/edit-paste-style.svg b/actions/22/edit-paste-style.svg similarity index 100% rename from actions/22x22-light/edit-paste-style.svg rename to actions/22/edit-paste-style.svg diff --git a/actions/22x22-light/edit-paste.svg b/actions/22/edit-paste.svg similarity index 100% rename from actions/22x22-light/edit-paste.svg rename to actions/22/edit-paste.svg diff --git a/actions/22x22-light/edit-redo-amarok.svg b/actions/22/edit-redo-amarok.svg similarity index 100% rename from actions/22x22-light/edit-redo-amarok.svg rename to actions/22/edit-redo-amarok.svg diff --git a/actions/22x22-light/edit-redo.svg b/actions/22/edit-redo.svg similarity index 100% rename from actions/22x22-light/edit-redo.svg rename to actions/22/edit-redo.svg diff --git a/actions/22x22-light/edit-rename.svg b/actions/22/edit-rename.svg similarity index 100% rename from actions/22x22-light/edit-rename.svg rename to actions/22/edit-rename.svg diff --git a/actions/22x22-light/edit-select-all-layers.svg b/actions/22/edit-select-all-layers.svg similarity index 100% rename from actions/22x22-light/edit-select-all-layers.svg rename to actions/22/edit-select-all-layers.svg diff --git a/actions/22x22-light/edit-select-all.svg b/actions/22/edit-select-all.svg similarity index 100% rename from actions/22x22-light/edit-select-all.svg rename to actions/22/edit-select-all.svg diff --git a/actions/22x22-light/edit-select-invert.svg b/actions/22/edit-select-invert.svg similarity index 100% rename from actions/22x22-light/edit-select-invert.svg rename to actions/22/edit-select-invert.svg diff --git a/actions/22x22-light/edit-select-lasso.svg b/actions/22/edit-select-lasso.svg similarity index 100% rename from actions/22x22-light/edit-select-lasso.svg rename to actions/22/edit-select-lasso.svg diff --git a/actions/22x22-light/edit-select-none.svg b/actions/22/edit-select-none.svg similarity index 100% rename from actions/22x22-light/edit-select-none.svg rename to actions/22/edit-select-none.svg diff --git a/actions/22x22-light/edit-select-original.svg b/actions/22/edit-select-original.svg similarity index 100% rename from actions/22x22-light/edit-select-original.svg rename to actions/22/edit-select-original.svg diff --git a/actions/22x22-light/edit-select.svg b/actions/22/edit-select.svg similarity index 100% rename from actions/22x22-light/edit-select.svg rename to actions/22/edit-select.svg diff --git a/actions/22x22-light/edit-table-cell-merge.svg b/actions/22/edit-table-cell-merge.svg similarity index 100% rename from actions/22x22-light/edit-table-cell-merge.svg rename to actions/22/edit-table-cell-merge.svg diff --git a/actions/22x22-light/edit-table-cell-split.svg b/actions/22/edit-table-cell-split.svg similarity index 100% rename from actions/22x22-light/edit-table-cell-split.svg rename to actions/22/edit-table-cell-split.svg diff --git a/actions/22x22-light/edit-table-delete-column.svg b/actions/22/edit-table-delete-column.svg similarity index 100% rename from actions/22x22-light/edit-table-delete-column.svg rename to actions/22/edit-table-delete-column.svg diff --git a/actions/22x22-light/edit-table-delete-row.svg b/actions/22/edit-table-delete-row.svg similarity index 100% rename from actions/22x22-light/edit-table-delete-row.svg rename to actions/22/edit-table-delete-row.svg diff --git a/actions/22x22-light/edit-table-insert-column-left.svg b/actions/22/edit-table-insert-column-left.svg similarity index 100% rename from actions/22x22-light/edit-table-insert-column-left.svg rename to actions/22/edit-table-insert-column-left.svg diff --git a/actions/22x22-light/edit-table-insert-column-right.svg b/actions/22/edit-table-insert-column-right.svg similarity index 100% rename from actions/22x22-light/edit-table-insert-column-right.svg rename to actions/22/edit-table-insert-column-right.svg diff --git a/actions/22x22-light/edit-table-insert-row-above.svg b/actions/22/edit-table-insert-row-above.svg similarity index 100% rename from actions/22x22-light/edit-table-insert-row-above.svg rename to actions/22/edit-table-insert-row-above.svg diff --git a/actions/22x22-light/edit-table-insert-row-below.svg b/actions/22/edit-table-insert-row-below.svg similarity index 100% rename from actions/22x22-light/edit-table-insert-row-below.svg rename to actions/22/edit-table-insert-row-below.svg diff --git a/actions/22x22-light/edit-table-insert-row-under.svg b/actions/22/edit-table-insert-row-under.svg similarity index 100% rename from actions/22x22-light/edit-table-insert-row-under.svg rename to actions/22/edit-table-insert-row-under.svg diff --git a/actions/22x22-light/edit-text-frame-update.svg b/actions/22/edit-text-frame-update.svg similarity index 100% rename from actions/22x22-light/edit-text-frame-update.svg rename to actions/22/edit-text-frame-update.svg diff --git a/actions/22x22-light/edit-undo-amarok.svg b/actions/22/edit-undo-amarok.svg similarity index 100% rename from actions/22x22-light/edit-undo-amarok.svg rename to actions/22/edit-undo-amarok.svg diff --git a/actions/22x22-light/edit-undo-history.svg b/actions/22/edit-undo-history.svg similarity index 100% rename from actions/22x22-light/edit-undo-history.svg rename to actions/22/edit-undo-history.svg diff --git a/actions/22x22-light/edit-undo.svg b/actions/22/edit-undo.svg similarity index 100% rename from actions/22x22-light/edit-undo.svg rename to actions/22/edit-undo.svg diff --git a/actions/22x22-light/edit.svg b/actions/22/edit.svg similarity index 100% rename from actions/22x22-light/edit.svg rename to actions/22/edit.svg diff --git a/actions/22x22-light/editclear.svg b/actions/22/editclear.svg similarity index 100% rename from actions/22x22-light/editclear.svg rename to actions/22/editclear.svg diff --git a/actions/22x22-light/editcopy.svg b/actions/22/editcopy.svg similarity index 100% rename from actions/22x22-light/editcopy.svg rename to actions/22/editcopy.svg diff --git a/actions/22x22-light/editcut.svg b/actions/22/editcut.svg similarity index 100% rename from actions/22x22-light/editcut.svg rename to actions/22/editcut.svg diff --git a/actions/22x22-light/editdelete.svg b/actions/22/editdelete.svg similarity index 100% rename from actions/22x22-light/editdelete.svg rename to actions/22/editdelete.svg diff --git a/actions/22x22-light/editimage.svg b/actions/22/editimage.svg similarity index 100% rename from actions/22x22-light/editimage.svg rename to actions/22/editimage.svg diff --git a/actions/22x22-light/editpaste.svg b/actions/22/editpaste.svg similarity index 100% rename from actions/22x22-light/editpaste.svg rename to actions/22/editpaste.svg diff --git a/actions/22x22-light/embosstool.svg b/actions/22/embosstool.svg similarity index 100% rename from actions/22x22-light/embosstool.svg rename to actions/22/embosstool.svg diff --git a/actions/22x22-light/entry-clone.svg b/actions/22/entry-clone.svg similarity index 100% rename from actions/22x22-light/entry-clone.svg rename to actions/22/entry-clone.svg diff --git a/actions/22x22-light/entry-delete.svg b/actions/22/entry-delete.svg similarity index 100% rename from actions/22x22-light/entry-delete.svg rename to actions/22/entry-delete.svg diff --git a/actions/22x22-light/entry-new.svg b/actions/22/entry-new.svg similarity index 100% rename from actions/22x22-light/entry-new.svg rename to actions/22/entry-new.svg diff --git a/actions/22x22-light/epiphany-bookmarks.svg b/actions/22/epiphany-bookmarks.svg similarity index 100% rename from actions/22x22-light/epiphany-bookmarks.svg rename to actions/22/epiphany-bookmarks.svg diff --git a/actions/22x22-light/epiphany-download.svg b/actions/22/epiphany-download.svg similarity index 100% rename from actions/22x22-light/epiphany-download.svg rename to actions/22/epiphany-download.svg diff --git a/actions/22x22-light/epiphany-secure.svg b/actions/22/epiphany-secure.svg similarity index 100% rename from actions/22x22-light/epiphany-secure.svg rename to actions/22/epiphany-secure.svg diff --git a/actions/22x22-light/epiphany-unsecure.svg b/actions/22/epiphany-unsecure.svg similarity index 100% rename from actions/22x22-light/epiphany-unsecure.svg rename to actions/22/epiphany-unsecure.svg diff --git a/actions/22x22-light/exchange-positions-clockwise.svg b/actions/22/exchange-positions-clockwise.svg similarity index 100% rename from actions/22x22-light/exchange-positions-clockwise.svg rename to actions/22/exchange-positions-clockwise.svg diff --git a/actions/22x22-light/exchange-positions-zorder.svg b/actions/22/exchange-positions-zorder.svg similarity index 100% rename from actions/22x22-light/exchange-positions-zorder.svg rename to actions/22/exchange-positions-zorder.svg diff --git a/actions/22x22-light/exchange-positions.svg b/actions/22/exchange-positions.svg similarity index 100% rename from actions/22x22-light/exchange-positions.svg rename to actions/22/exchange-positions.svg diff --git a/actions/22x22-light/exifinfo.svg b/actions/22/exifinfo.svg similarity index 100% rename from actions/22x22-light/exifinfo.svg rename to actions/22/exifinfo.svg diff --git a/actions/22x22-light/exit.svg b/actions/22/exit.svg similarity index 100% rename from actions/22x22-light/exit.svg rename to actions/22/exit.svg diff --git a/actions/22x22-light/extract-archive.svg b/actions/22/extract-archive.svg similarity index 100% rename from actions/22x22-light/extract-archive.svg rename to actions/22/extract-archive.svg diff --git a/actions/22x22-light/favorite-genres-amarok.svg b/actions/22/favorite-genres-amarok.svg similarity index 100% rename from actions/22x22-light/favorite-genres-amarok.svg rename to actions/22/favorite-genres-amarok.svg diff --git a/actions/22x22-light/feed-subscribe.svg b/actions/22/feed-subscribe.svg similarity index 100% rename from actions/22x22-light/feed-subscribe.svg rename to actions/22/feed-subscribe.svg diff --git a/actions/22x22-light/file-find.svg b/actions/22/file-find.svg similarity index 100% rename from actions/22x22-light/file-find.svg rename to actions/22/file-find.svg diff --git a/actions/22x22-light/file-zoom-in.svg b/actions/22/file-zoom-in.svg similarity index 100% rename from actions/22x22-light/file-zoom-in.svg rename to actions/22/file-zoom-in.svg diff --git a/actions/22x22-light/file-zoom-out.svg b/actions/22/file-zoom-out.svg similarity index 100% rename from actions/22x22-light/file-zoom-out.svg rename to actions/22/file-zoom-out.svg diff --git a/actions/22x22-light/file_new.svg b/actions/22/file_new.svg similarity index 100% rename from actions/22x22-light/file_new.svg rename to actions/22/file_new.svg diff --git a/actions/22x22-light/filefind.svg b/actions/22/filefind.svg similarity index 100% rename from actions/22x22-light/filefind.svg rename to actions/22/filefind.svg diff --git a/actions/22x22-light/filename-album-amarok.svg b/actions/22/filename-album-amarok.svg similarity index 100% rename from actions/22x22-light/filename-album-amarok.svg rename to actions/22/filename-album-amarok.svg diff --git a/actions/22x22-light/filename-and-amarok.svg b/actions/22/filename-and-amarok.svg similarity index 100% rename from actions/22x22-light/filename-and-amarok.svg rename to actions/22/filename-and-amarok.svg diff --git a/actions/22x22-light/filename-artist-amarok.svg b/actions/22/filename-artist-amarok.svg similarity index 100% rename from actions/22x22-light/filename-artist-amarok.svg rename to actions/22/filename-artist-amarok.svg diff --git a/actions/22x22-light/filename-bpm-amarok.svg b/actions/22/filename-bpm-amarok.svg similarity index 100% rename from actions/22x22-light/filename-bpm-amarok.svg rename to actions/22/filename-bpm-amarok.svg diff --git a/actions/22x22-light/filename-comment-amarok.svg b/actions/22/filename-comment-amarok.svg similarity index 100% rename from actions/22x22-light/filename-comment-amarok.svg rename to actions/22/filename-comment-amarok.svg diff --git a/actions/22x22-light/filename-composer-amarok.svg b/actions/22/filename-composer-amarok.svg similarity index 100% rename from actions/22x22-light/filename-composer-amarok.svg rename to actions/22/filename-composer-amarok.svg diff --git a/actions/22x22-light/filename-dash-amarok.svg b/actions/22/filename-dash-amarok.svg similarity index 100% rename from actions/22x22-light/filename-dash-amarok.svg rename to actions/22/filename-dash-amarok.svg diff --git a/actions/22x22-light/filename-discnumber-amarok.svg b/actions/22/filename-discnumber-amarok.svg similarity index 100% rename from actions/22x22-light/filename-discnumber-amarok.svg rename to actions/22/filename-discnumber-amarok.svg diff --git a/actions/22x22-light/filename-divider.svg b/actions/22/filename-divider.svg similarity index 100% rename from actions/22x22-light/filename-divider.svg rename to actions/22/filename-divider.svg diff --git a/actions/22x22-light/filename-dot-amarok.svg b/actions/22/filename-dot-amarok.svg similarity index 100% rename from actions/22x22-light/filename-dot-amarok.svg rename to actions/22/filename-dot-amarok.svg diff --git a/actions/22x22-light/filename-filetype-amarok.svg b/actions/22/filename-filetype-amarok.svg similarity index 100% rename from actions/22x22-light/filename-filetype-amarok.svg rename to actions/22/filename-filetype-amarok.svg diff --git a/actions/22x22-light/filename-genre-amarok.svg b/actions/22/filename-genre-amarok.svg similarity index 100% rename from actions/22x22-light/filename-genre-amarok.svg rename to actions/22/filename-genre-amarok.svg diff --git a/actions/22x22-light/filename-group-length.svg b/actions/22/filename-group-length.svg similarity index 100% rename from actions/22x22-light/filename-group-length.svg rename to actions/22/filename-group-length.svg diff --git a/actions/22x22-light/filename-group-tracks.svg b/actions/22/filename-group-tracks.svg similarity index 100% rename from actions/22x22-light/filename-group-tracks.svg rename to actions/22/filename-group-tracks.svg diff --git a/actions/22x22-light/filename-ignore-amarok.svg b/actions/22/filename-ignore-amarok.svg similarity index 100% rename from actions/22x22-light/filename-ignore-amarok.svg rename to actions/22/filename-ignore-amarok.svg diff --git a/actions/22x22-light/filename-initial-amarok.svg b/actions/22/filename-initial-amarok.svg similarity index 100% rename from actions/22x22-light/filename-initial-amarok.svg rename to actions/22/filename-initial-amarok.svg diff --git a/actions/22x22-light/filename-last-played.svg b/actions/22/filename-last-played.svg similarity index 100% rename from actions/22x22-light/filename-last-played.svg rename to actions/22/filename-last-played.svg diff --git a/actions/22x22-light/filename-moodbar.svg b/actions/22/filename-moodbar.svg similarity index 100% rename from actions/22x22-light/filename-moodbar.svg rename to actions/22/filename-moodbar.svg diff --git a/actions/22x22-light/filename-sample-rate.svg b/actions/22/filename-sample-rate.svg similarity index 100% rename from actions/22x22-light/filename-sample-rate.svg rename to actions/22/filename-sample-rate.svg diff --git a/actions/22x22-light/filename-slash-amarok.svg b/actions/22/filename-slash-amarok.svg similarity index 100% rename from actions/22x22-light/filename-slash-amarok.svg rename to actions/22/filename-slash-amarok.svg diff --git a/actions/22x22-light/filename-space-amarok.svg b/actions/22/filename-space-amarok.svg similarity index 100% rename from actions/22x22-light/filename-space-amarok.svg rename to actions/22/filename-space-amarok.svg diff --git a/actions/22x22-light/filename-title-amarok.svg b/actions/22/filename-title-amarok.svg similarity index 100% rename from actions/22x22-light/filename-title-amarok.svg rename to actions/22/filename-title-amarok.svg diff --git a/actions/22x22-light/filename-track-amarok.svg b/actions/22/filename-track-amarok.svg similarity index 100% rename from actions/22x22-light/filename-track-amarok.svg rename to actions/22/filename-track-amarok.svg diff --git a/actions/22x22-light/filename-underscore-amarok.svg b/actions/22/filename-underscore-amarok.svg similarity index 100% rename from actions/22x22-light/filename-underscore-amarok.svg rename to actions/22/filename-underscore-amarok.svg diff --git a/actions/22x22-light/filename-year-amarok.svg b/actions/22/filename-year-amarok.svg similarity index 100% rename from actions/22x22-light/filename-year-amarok.svg rename to actions/22/filename-year-amarok.svg diff --git a/actions/22x22-light/filenew.svg b/actions/22/filenew.svg similarity index 100% rename from actions/22x22-light/filenew.svg rename to actions/22/filenew.svg diff --git a/actions/22x22-light/fileopen.svg b/actions/22/fileopen.svg similarity index 100% rename from actions/22x22-light/fileopen.svg rename to actions/22/fileopen.svg diff --git a/actions/22x22-light/fileprint.svg b/actions/22/fileprint.svg similarity index 100% rename from actions/22x22-light/fileprint.svg rename to actions/22/fileprint.svg diff --git a/actions/22x22-light/filequickprint.svg b/actions/22/filequickprint.svg similarity index 100% rename from actions/22x22-light/filequickprint.svg rename to actions/22/filequickprint.svg diff --git a/actions/22x22-light/filesave.svg b/actions/22/filesave.svg similarity index 100% rename from actions/22x22-light/filesave.svg rename to actions/22/filesave.svg diff --git a/actions/22x22-light/filesaveas.svg b/actions/22/filesaveas.svg similarity index 100% rename from actions/22x22-light/filesaveas.svg rename to actions/22/filesaveas.svg diff --git a/actions/22x22-light/fileview-preview.svg b/actions/22/fileview-preview.svg similarity index 100% rename from actions/22x22-light/fileview-preview.svg rename to actions/22/fileview-preview.svg diff --git a/actions/22x22-light/fill-color.svg b/actions/22/fill-color.svg similarity index 100% rename from actions/22x22-light/fill-color.svg rename to actions/22/fill-color.svg diff --git a/actions/22x22-light/filmgrain.svg b/actions/22/filmgrain.svg similarity index 100% rename from actions/22x22-light/filmgrain.svg rename to actions/22/filmgrain.svg diff --git a/actions/22x22-light/find.svg b/actions/22/find.svg similarity index 100% rename from actions/22x22-light/find.svg rename to actions/22/find.svg diff --git a/actions/22x22-light/finish.svg b/actions/22/finish.svg similarity index 100% rename from actions/22x22-light/finish.svg rename to actions/22/finish.svg diff --git a/actions/22x22-light/flag-black.svg b/actions/22/flag-black.svg similarity index 100% rename from actions/22x22-light/flag-black.svg rename to actions/22/flag-black.svg diff --git a/actions/22x22-light/flag-blue.svg b/actions/22/flag-blue.svg similarity index 100% rename from actions/22x22-light/flag-blue.svg rename to actions/22/flag-blue.svg diff --git a/actions/22x22-light/flag-green.svg b/actions/22/flag-green.svg similarity index 100% rename from actions/22x22-light/flag-green.svg rename to actions/22/flag-green.svg diff --git a/actions/22x22-light/flag-red.svg b/actions/22/flag-red.svg similarity index 100% rename from actions/22x22-light/flag-red.svg rename to actions/22/flag-red.svg diff --git a/actions/22x22-light/flag-yellow.svg b/actions/22/flag-yellow.svg similarity index 100% rename from actions/22x22-light/flag-yellow.svg rename to actions/22/flag-yellow.svg diff --git a/actions/22x22-light/flag.svg b/actions/22/flag.svg similarity index 100% rename from actions/22x22-light/flag.svg rename to actions/22/flag.svg diff --git a/actions/22x22-light/flip-horizontal.svg b/actions/22/flip-horizontal.svg similarity index 100% rename from actions/22x22-light/flip-horizontal.svg rename to actions/22/flip-horizontal.svg diff --git a/actions/22x22-light/folder-copy.svg b/actions/22/folder-copy.svg similarity index 100% rename from actions/22x22-light/folder-copy.svg rename to actions/22/folder-copy.svg diff --git a/actions/22x22-light/folder-move.svg b/actions/22/folder-move.svg similarity index 100% rename from actions/22x22-light/folder-move.svg rename to actions/22/folder-move.svg diff --git a/actions/22x22-light/folder-new.svg b/actions/22/folder-new.svg similarity index 100% rename from actions/22x22-light/folder-new.svg rename to actions/22/folder-new.svg diff --git a/actions/22x22-light/folder-sync.svg b/actions/22/folder-sync.svg similarity index 100% rename from actions/22x22-light/folder-sync.svg rename to actions/22/folder-sync.svg diff --git a/actions/22x22-light/folder_new.svg b/actions/22/folder_new.svg similarity index 100% rename from actions/22x22-light/folder_new.svg rename to actions/22/folder_new.svg diff --git a/actions/22x22-light/followmouse.svg b/actions/22/followmouse.svg similarity index 100% rename from actions/22x22-light/followmouse.svg rename to actions/22/followmouse.svg diff --git a/actions/22x22-light/fork.svg b/actions/22/fork.svg similarity index 100% rename from actions/22x22-light/fork.svg rename to actions/22/fork.svg diff --git a/actions/22x22-light/format-add-node.svg b/actions/22/format-add-node.svg similarity index 100% rename from actions/22x22-light/format-add-node.svg rename to actions/22/format-add-node.svg diff --git a/actions/22x22-light/format-break-node.svg b/actions/22/format-break-node.svg similarity index 100% rename from actions/22x22-light/format-break-node.svg rename to actions/22/format-break-node.svg diff --git a/actions/22x22-light/format-connect-node.svg b/actions/22/format-connect-node.svg similarity index 100% rename from actions/22x22-light/format-connect-node.svg rename to actions/22/format-connect-node.svg diff --git a/actions/22x22-light/format-disconnect-node.svg b/actions/22/format-disconnect-node.svg similarity index 100% rename from actions/22x22-light/format-disconnect-node.svg rename to actions/22/format-disconnect-node.svg diff --git a/actions/22x22-light/format-fill-color.svg b/actions/22/format-fill-color.svg similarity index 100% rename from actions/22x22-light/format-fill-color.svg rename to actions/22/format-fill-color.svg diff --git a/actions/22x22-light/format-font-size-less.svg b/actions/22/format-font-size-less.svg similarity index 100% rename from actions/22x22-light/format-font-size-less.svg rename to actions/22/format-font-size-less.svg diff --git a/actions/22x22-light/format-font-size-more.svg b/actions/22/format-font-size-more.svg similarity index 100% rename from actions/22x22-light/format-font-size-more.svg rename to actions/22/format-font-size-more.svg diff --git a/actions/22x22-light/format-indent-less.svg b/actions/22/format-indent-less.svg similarity index 100% rename from actions/22x22-light/format-indent-less.svg rename to actions/22/format-indent-less.svg diff --git a/actions/22x22-light/format-indent-more.svg b/actions/22/format-indent-more.svg similarity index 100% rename from actions/22x22-light/format-indent-more.svg rename to actions/22/format-indent-more.svg diff --git a/actions/22x22-light/format-join-node.svg b/actions/22/format-join-node.svg similarity index 100% rename from actions/22x22-light/format-join-node.svg rename to actions/22/format-join-node.svg diff --git a/actions/22x22-light/format-justify-center.svg b/actions/22/format-justify-center.svg similarity index 100% rename from actions/22x22-light/format-justify-center.svg rename to actions/22/format-justify-center.svg diff --git a/actions/22x22-light/format-justify-fill.svg b/actions/22/format-justify-fill.svg similarity index 100% rename from actions/22x22-light/format-justify-fill.svg rename to actions/22/format-justify-fill.svg diff --git a/actions/22x22-light/format-justify-left.svg b/actions/22/format-justify-left.svg similarity index 100% rename from actions/22x22-light/format-justify-left.svg rename to actions/22/format-justify-left.svg diff --git a/actions/22x22-light/format-justify-right.svg b/actions/22/format-justify-right.svg similarity index 100% rename from actions/22x22-light/format-justify-right.svg rename to actions/22/format-justify-right.svg diff --git a/actions/22x22-light/format-line-spacing-double.svg b/actions/22/format-line-spacing-double.svg similarity index 100% rename from actions/22x22-light/format-line-spacing-double.svg rename to actions/22/format-line-spacing-double.svg diff --git a/actions/22x22-light/format-line-spacing-normal.svg b/actions/22/format-line-spacing-normal.svg similarity index 100% rename from actions/22x22-light/format-line-spacing-normal.svg rename to actions/22/format-line-spacing-normal.svg diff --git a/actions/22x22-light/format-line-spacing-triple.svg b/actions/22/format-line-spacing-triple.svg similarity index 100% rename from actions/22x22-light/format-line-spacing-triple.svg rename to actions/22/format-line-spacing-triple.svg diff --git a/actions/22x22-light/format-list-ordered.svg b/actions/22/format-list-ordered.svg similarity index 100% rename from actions/22x22-light/format-list-ordered.svg rename to actions/22/format-list-ordered.svg diff --git a/actions/22x22-light/format-list-unordered.svg b/actions/22/format-list-unordered.svg similarity index 100% rename from actions/22x22-light/format-list-unordered.svg rename to actions/22/format-list-unordered.svg diff --git a/actions/22x22-light/format-remove-node.svg b/actions/22/format-remove-node.svg similarity index 100% rename from actions/22x22-light/format-remove-node.svg rename to actions/22/format-remove-node.svg diff --git a/actions/22x22-light/format-stroke-color.svg b/actions/22/format-stroke-color.svg similarity index 100% rename from actions/22x22-light/format-stroke-color.svg rename to actions/22/format-stroke-color.svg diff --git a/actions/22x22-light/format-text-blockquote.svg b/actions/22/format-text-blockquote.svg similarity index 100% rename from actions/22x22-light/format-text-blockquote.svg rename to actions/22/format-text-blockquote.svg diff --git a/actions/22x22-light/format-text-bold.svg b/actions/22/format-text-bold.svg similarity index 100% rename from actions/22x22-light/format-text-bold.svg rename to actions/22/format-text-bold.svg diff --git a/actions/22x22-light/format-text-code.svg b/actions/22/format-text-code.svg similarity index 100% rename from actions/22x22-light/format-text-code.svg rename to actions/22/format-text-code.svg diff --git a/actions/22x22-light/format-text-color.svg b/actions/22/format-text-color.svg similarity index 100% rename from actions/22x22-light/format-text-color.svg rename to actions/22/format-text-color.svg diff --git a/actions/22x22-light/format-text-direction-horizontal.svg b/actions/22/format-text-direction-horizontal.svg similarity index 100% rename from actions/22x22-light/format-text-direction-horizontal.svg rename to actions/22/format-text-direction-horizontal.svg diff --git a/actions/22x22-light/format-text-direction-ltr.svg b/actions/22/format-text-direction-ltr.svg similarity index 100% rename from actions/22x22-light/format-text-direction-ltr.svg rename to actions/22/format-text-direction-ltr.svg diff --git a/actions/22x22-light/format-text-direction-rtl.svg b/actions/22/format-text-direction-rtl.svg similarity index 100% rename from actions/22x22-light/format-text-direction-rtl.svg rename to actions/22/format-text-direction-rtl.svg diff --git a/actions/22x22-light/format-text-direction-vertical.svg b/actions/22/format-text-direction-vertical.svg similarity index 100% rename from actions/22x22-light/format-text-direction-vertical.svg rename to actions/22/format-text-direction-vertical.svg diff --git a/actions/22x22-light/format-text-italic.svg b/actions/22/format-text-italic.svg similarity index 100% rename from actions/22x22-light/format-text-italic.svg rename to actions/22/format-text-italic.svg diff --git a/actions/22x22-light/format-text-strikethrough.svg b/actions/22/format-text-strikethrough.svg similarity index 100% rename from actions/22x22-light/format-text-strikethrough.svg rename to actions/22/format-text-strikethrough.svg diff --git a/actions/22x22-light/format-text-subscript.svg b/actions/22/format-text-subscript.svg similarity index 100% rename from actions/22x22-light/format-text-subscript.svg rename to actions/22/format-text-subscript.svg diff --git a/actions/22x22-light/format-text-superscript.svg b/actions/22/format-text-superscript.svg similarity index 100% rename from actions/22x22-light/format-text-superscript.svg rename to actions/22/format-text-superscript.svg diff --git a/actions/22x22-light/format-text-symbol.svg b/actions/22/format-text-symbol.svg similarity index 100% rename from actions/22x22-light/format-text-symbol.svg rename to actions/22/format-text-symbol.svg diff --git a/actions/22x22-light/format-text-underline.svg b/actions/22/format-text-underline.svg similarity index 100% rename from actions/22x22-light/format-text-underline.svg rename to actions/22/format-text-underline.svg diff --git a/actions/22x22-light/formula.svg b/actions/22/formula.svg similarity index 100% rename from actions/22x22-light/formula.svg rename to actions/22/formula.svg diff --git a/actions/22x22-light/forward.svg b/actions/22/forward.svg similarity index 100% rename from actions/22x22-light/forward.svg rename to actions/22/forward.svg diff --git a/actions/22x22-light/freerotation.svg b/actions/22/freerotation.svg similarity index 100% rename from actions/22x22-light/freerotation.svg rename to actions/22/freerotation.svg diff --git a/actions/22x22-light/games-achievements.svg b/actions/22/games-achievements.svg similarity index 100% rename from actions/22x22-light/games-achievements.svg rename to actions/22/games-achievements.svg diff --git a/actions/22x22-light/games-config-background.svg b/actions/22/games-config-background.svg similarity index 100% rename from actions/22x22-light/games-config-background.svg rename to actions/22/games-config-background.svg diff --git a/actions/22x22-light/games-config-board.svg b/actions/22/games-config-board.svg similarity index 100% rename from actions/22x22-light/games-config-board.svg rename to actions/22/games-config-board.svg diff --git a/actions/22x22-light/games-config-custom.svg b/actions/22/games-config-custom.svg similarity index 100% rename from actions/22x22-light/games-config-custom.svg rename to actions/22/games-config-custom.svg diff --git a/actions/22x22-light/games-config-options.svg b/actions/22/games-config-options.svg similarity index 100% rename from actions/22x22-light/games-config-options.svg rename to actions/22/games-config-options.svg diff --git a/actions/22x22-light/games-config-theme.svg b/actions/22/games-config-theme.svg similarity index 100% rename from actions/22x22-light/games-config-theme.svg rename to actions/22/games-config-theme.svg diff --git a/actions/22x22-light/games-config-tiles.svg b/actions/22/games-config-tiles.svg similarity index 100% rename from actions/22x22-light/games-config-tiles.svg rename to actions/22/games-config-tiles.svg diff --git a/actions/22x22-light/games-difficult.svg b/actions/22/games-difficult.svg similarity index 100% rename from actions/22x22-light/games-difficult.svg rename to actions/22/games-difficult.svg diff --git a/actions/22x22-light/games-endturn.svg b/actions/22/games-endturn.svg similarity index 100% rename from actions/22x22-light/games-endturn.svg rename to actions/22/games-endturn.svg diff --git a/actions/22x22-light/games-highscores.svg b/actions/22/games-highscores.svg similarity index 100% rename from actions/22x22-light/games-highscores.svg rename to actions/22/games-highscores.svg diff --git a/actions/22x22-light/games-hint.svg b/actions/22/games-hint.svg similarity index 100% rename from actions/22x22-light/games-hint.svg rename to actions/22/games-hint.svg diff --git a/actions/22x22-light/games-solve.svg b/actions/22/games-solve.svg similarity index 100% rename from actions/22x22-light/games-solve.svg rename to actions/22/games-solve.svg diff --git a/actions/22x22-light/geany-build.svg b/actions/22/geany-build.svg similarity index 100% rename from actions/22x22-light/geany-build.svg rename to actions/22/geany-build.svg diff --git a/actions/22x22-light/geany-close-all.svg b/actions/22/geany-close-all.svg similarity index 100% rename from actions/22x22-light/geany-close-all.svg rename to actions/22/geany-close-all.svg diff --git a/actions/22x22-light/geany-save-all.svg b/actions/22/geany-save-all.svg similarity index 100% rename from actions/22x22-light/geany-save-all.svg rename to actions/22/geany-save-all.svg diff --git a/actions/22x22-light/get-hot-new-stuff.svg b/actions/22/get-hot-new-stuff.svg similarity index 100% rename from actions/22x22-light/get-hot-new-stuff.svg rename to actions/22/get-hot-new-stuff.svg diff --git a/actions/22x22-light/gnome-app-install-star.svg b/actions/22/gnome-app-install-star.svg similarity index 100% rename from actions/22x22-light/gnome-app-install-star.svg rename to actions/22/gnome-app-install-star.svg diff --git a/actions/22x22-light/gnome-fs-bookmark.svg b/actions/22/gnome-fs-bookmark.svg similarity index 100% rename from actions/22x22-light/gnome-fs-bookmark.svg rename to actions/22/gnome-fs-bookmark.svg diff --git a/actions/22x22-light/gnome-help.svg b/actions/22/gnome-help.svg similarity index 100% rename from actions/22x22-light/gnome-help.svg rename to actions/22/gnome-help.svg diff --git a/actions/22x22-light/gnome-run.svg b/actions/22/gnome-run.svg similarity index 100% rename from actions/22x22-light/gnome-run.svg rename to actions/22/gnome-run.svg diff --git a/actions/22x22-light/gnome-shutdown.svg b/actions/22/gnome-shutdown.svg similarity index 100% rename from actions/22x22-light/gnome-shutdown.svg rename to actions/22/gnome-shutdown.svg diff --git a/actions/22x22-light/gnome-stock-mail-fwd.svg b/actions/22/gnome-stock-mail-fwd.svg similarity index 100% rename from actions/22x22-light/gnome-stock-mail-fwd.svg rename to actions/22/gnome-stock-mail-fwd.svg diff --git a/actions/22x22-light/gnome-stock-mail-new.svg b/actions/22/gnome-stock-mail-new.svg similarity index 100% rename from actions/22x22-light/gnome-stock-mail-new.svg rename to actions/22/gnome-stock-mail-new.svg diff --git a/actions/22x22-light/gnome-stock-mail-rpl.svg b/actions/22/gnome-stock-mail-rpl.svg similarity index 100% rename from actions/22x22-light/gnome-stock-mail-rpl.svg rename to actions/22/gnome-stock-mail-rpl.svg diff --git a/actions/22x22-light/gnome-stock-mail-snd.svg b/actions/22/gnome-stock-mail-snd.svg similarity index 100% rename from actions/22x22-light/gnome-stock-mail-snd.svg rename to actions/22/gnome-stock-mail-snd.svg diff --git a/actions/22x22-light/go-bottom.svg b/actions/22/go-bottom.svg similarity index 100% rename from actions/22x22-light/go-bottom.svg rename to actions/22/go-bottom.svg diff --git a/actions/22x22-light/go-down-search.svg b/actions/22/go-down-search.svg similarity index 100% rename from actions/22x22-light/go-down-search.svg rename to actions/22/go-down-search.svg diff --git a/actions/22x22-light/go-down.svg b/actions/22/go-down.svg similarity index 100% rename from actions/22x22-light/go-down.svg rename to actions/22/go-down.svg diff --git a/actions/22x22-light/go-first-rtl.svg b/actions/22/go-first-rtl.svg similarity index 100% rename from actions/22x22-light/go-first-rtl.svg rename to actions/22/go-first-rtl.svg diff --git a/actions/22x22-light/go-first-view-page.svg b/actions/22/go-first-view-page.svg similarity index 100% rename from actions/22x22-light/go-first-view-page.svg rename to actions/22/go-first-view-page.svg diff --git a/actions/22x22-light/go-first-view.svg b/actions/22/go-first-view.svg similarity index 100% rename from actions/22x22-light/go-first-view.svg rename to actions/22/go-first-view.svg diff --git a/actions/22x22-light/go-first.svg b/actions/22/go-first.svg similarity index 100% rename from actions/22x22-light/go-first.svg rename to actions/22/go-first.svg diff --git a/actions/22x22-light/go-home.svg b/actions/22/go-home.svg similarity index 100% rename from actions/22x22-light/go-home.svg rename to actions/22/go-home.svg diff --git a/actions/22x22-light/go-jump-declaration.svg b/actions/22/go-jump-declaration.svg similarity index 100% rename from actions/22x22-light/go-jump-declaration.svg rename to actions/22/go-jump-declaration.svg diff --git a/actions/22x22-light/go-jump-definition.svg b/actions/22/go-jump-definition.svg similarity index 100% rename from actions/22x22-light/go-jump-definition.svg rename to actions/22/go-jump-definition.svg diff --git a/actions/22x22-light/go-jump-locationbar.svg b/actions/22/go-jump-locationbar.svg similarity index 100% rename from actions/22x22-light/go-jump-locationbar.svg rename to actions/22/go-jump-locationbar.svg diff --git a/actions/22x22-light/go-jump-today.svg b/actions/22/go-jump-today.svg similarity index 100% rename from actions/22x22-light/go-jump-today.svg rename to actions/22/go-jump-today.svg diff --git a/actions/22x22-light/go-jump.svg b/actions/22/go-jump.svg similarity index 100% rename from actions/22x22-light/go-jump.svg rename to actions/22/go-jump.svg diff --git a/actions/22x22-light/go-last-rtl.svg b/actions/22/go-last-rtl.svg similarity index 100% rename from actions/22x22-light/go-last-rtl.svg rename to actions/22/go-last-rtl.svg diff --git a/actions/22x22-light/go-last-view-page.svg b/actions/22/go-last-view-page.svg similarity index 100% rename from actions/22x22-light/go-last-view-page.svg rename to actions/22/go-last-view-page.svg diff --git a/actions/22x22-light/go-last-view.svg b/actions/22/go-last-view.svg similarity index 100% rename from actions/22x22-light/go-last-view.svg rename to actions/22/go-last-view.svg diff --git a/actions/22x22-light/go-last.svg b/actions/22/go-last.svg similarity index 100% rename from actions/22x22-light/go-last.svg rename to actions/22/go-last.svg diff --git a/actions/22x22-light/go-next-context.svg b/actions/22/go-next-context.svg similarity index 100% rename from actions/22x22-light/go-next-context.svg rename to actions/22/go-next-context.svg diff --git a/actions/22x22-light/go-next-use.svg b/actions/22/go-next-use.svg similarity index 100% rename from actions/22x22-light/go-next-use.svg rename to actions/22/go-next-use.svg diff --git a/actions/22x22-light/go-next-view-page.svg b/actions/22/go-next-view-page.svg similarity index 100% rename from actions/22x22-light/go-next-view-page.svg rename to actions/22/go-next-view-page.svg diff --git a/actions/22x22-light/go-next-view.svg b/actions/22/go-next-view.svg similarity index 100% rename from actions/22x22-light/go-next-view.svg rename to actions/22/go-next-view.svg diff --git a/actions/22x22-light/go-next.svg b/actions/22/go-next.svg similarity index 100% rename from actions/22x22-light/go-next.svg rename to actions/22/go-next.svg diff --git a/actions/22x22-light/go-parent-folder.svg b/actions/22/go-parent-folder.svg similarity index 100% rename from actions/22x22-light/go-parent-folder.svg rename to actions/22/go-parent-folder.svg diff --git a/actions/22x22-light/go-previous-context.svg b/actions/22/go-previous-context.svg similarity index 100% rename from actions/22x22-light/go-previous-context.svg rename to actions/22/go-previous-context.svg diff --git a/actions/22x22-light/go-previous-rtl.svg b/actions/22/go-previous-rtl.svg similarity index 100% rename from actions/22x22-light/go-previous-rtl.svg rename to actions/22/go-previous-rtl.svg diff --git a/actions/22x22-light/go-previous-use.svg b/actions/22/go-previous-use.svg similarity index 100% rename from actions/22x22-light/go-previous-use.svg rename to actions/22/go-previous-use.svg diff --git a/actions/22x22-light/go-previous-view-page.svg b/actions/22/go-previous-view-page.svg similarity index 100% rename from actions/22x22-light/go-previous-view-page.svg rename to actions/22/go-previous-view-page.svg diff --git a/actions/22x22-light/go-previous-view.svg b/actions/22/go-previous-view.svg similarity index 100% rename from actions/22x22-light/go-previous-view.svg rename to actions/22/go-previous-view.svg diff --git a/actions/22x22-light/go-previous.svg b/actions/22/go-previous.svg similarity index 100% rename from actions/22x22-light/go-previous.svg rename to actions/22/go-previous.svg diff --git a/actions/22x22-light/go-top.svg b/actions/22/go-top.svg similarity index 100% rename from actions/22x22-light/go-top.svg rename to actions/22/go-top.svg diff --git a/actions/22x22-light/go-up-search.svg b/actions/22/go-up-search.svg similarity index 100% rename from actions/22x22-light/go-up-search.svg rename to actions/22/go-up-search.svg diff --git a/actions/22x22-light/go-up.svg b/actions/22/go-up.svg similarity index 100% rename from actions/22x22-light/go-up.svg rename to actions/22/go-up.svg diff --git a/actions/22x22-light/gohome.svg b/actions/22/gohome.svg similarity index 100% rename from actions/22x22-light/gohome.svg rename to actions/22/gohome.svg diff --git a/actions/22x22-light/gpg.svg b/actions/22/gpg.svg similarity index 100% rename from actions/22x22-light/gpg.svg rename to actions/22/gpg.svg diff --git a/actions/22x22-light/gpgsm.svg b/actions/22/gpgsm.svg similarity index 100% rename from actions/22x22-light/gpgsm.svg rename to actions/22/gpgsm.svg diff --git a/actions/22x22-light/gtk-about.svg b/actions/22/gtk-about.svg similarity index 100% rename from actions/22x22-light/gtk-about.svg rename to actions/22/gtk-about.svg diff --git a/actions/22x22-light/gtk-add.svg b/actions/22/gtk-add.svg similarity index 100% rename from actions/22x22-light/gtk-add.svg rename to actions/22/gtk-add.svg diff --git a/actions/22x22-light/gtk-apply.svg b/actions/22/gtk-apply.svg similarity index 100% rename from actions/22x22-light/gtk-apply.svg rename to actions/22/gtk-apply.svg diff --git a/actions/22x22-light/gtk-authentication.svg b/actions/22/gtk-authentication.svg similarity index 100% rename from actions/22x22-light/gtk-authentication.svg rename to actions/22/gtk-authentication.svg diff --git a/actions/22x22-light/gtk-bold.svg b/actions/22/gtk-bold.svg similarity index 100% rename from actions/22x22-light/gtk-bold.svg rename to actions/22/gtk-bold.svg diff --git a/actions/22x22-light/gtk-cancel.svg b/actions/22/gtk-cancel.svg similarity index 100% rename from actions/22x22-light/gtk-cancel.svg rename to actions/22/gtk-cancel.svg diff --git a/actions/22x22-light/gtk-cdrom.svg b/actions/22/gtk-cdrom.svg similarity index 100% rename from actions/22x22-light/gtk-cdrom.svg rename to actions/22/gtk-cdrom.svg diff --git a/actions/22x22-light/gtk-clear.svg b/actions/22/gtk-clear.svg similarity index 100% rename from actions/22x22-light/gtk-clear.svg rename to actions/22/gtk-clear.svg diff --git a/actions/22x22-light/gtk-close.svg b/actions/22/gtk-close.svg similarity index 100% rename from actions/22x22-light/gtk-close.svg rename to actions/22/gtk-close.svg diff --git a/actions/22x22-light/gtk-color-picker.svg b/actions/22/gtk-color-picker.svg similarity index 100% rename from actions/22x22-light/gtk-color-picker.svg rename to actions/22/gtk-color-picker.svg diff --git a/actions/22x22-light/gtk-connect.svg b/actions/22/gtk-connect.svg similarity index 100% rename from actions/22x22-light/gtk-connect.svg rename to actions/22/gtk-connect.svg diff --git a/actions/22x22-light/gtk-convert.svg b/actions/22/gtk-convert.svg similarity index 100% rename from actions/22x22-light/gtk-convert.svg rename to actions/22/gtk-convert.svg diff --git a/actions/22x22-light/gtk-copy.svg b/actions/22/gtk-copy.svg similarity index 100% rename from actions/22x22-light/gtk-copy.svg rename to actions/22/gtk-copy.svg diff --git a/actions/22x22-light/gtk-cut.svg b/actions/22/gtk-cut.svg similarity index 100% rename from actions/22x22-light/gtk-cut.svg rename to actions/22/gtk-cut.svg diff --git a/actions/22x22-light/gtk-delete.svg b/actions/22/gtk-delete.svg similarity index 100% rename from actions/22x22-light/gtk-delete.svg rename to actions/22/gtk-delete.svg diff --git a/actions/22x22-light/gtk-disconnect.svg b/actions/22/gtk-disconnect.svg similarity index 100% rename from actions/22x22-light/gtk-disconnect.svg rename to actions/22/gtk-disconnect.svg diff --git a/actions/22x22-light/gtk-edit.svg b/actions/22/gtk-edit.svg similarity index 100% rename from actions/22x22-light/gtk-edit.svg rename to actions/22/gtk-edit.svg diff --git a/actions/22x22-light/gtk-execute.svg b/actions/22/gtk-execute.svg similarity index 100% rename from actions/22x22-light/gtk-execute.svg rename to actions/22/gtk-execute.svg diff --git a/actions/22x22-light/gtk-find-and-replace.svg b/actions/22/gtk-find-and-replace.svg similarity index 100% rename from actions/22x22-light/gtk-find-and-replace.svg rename to actions/22/gtk-find-and-replace.svg diff --git a/actions/22x22-light/gtk-find.svg b/actions/22/gtk-find.svg similarity index 100% rename from actions/22x22-light/gtk-find.svg rename to actions/22/gtk-find.svg diff --git a/actions/22x22-light/gtk-floppy.svg b/actions/22/gtk-floppy.svg similarity index 100% rename from actions/22x22-light/gtk-floppy.svg rename to actions/22/gtk-floppy.svg diff --git a/actions/22x22-light/gtk-fullscreen.svg b/actions/22/gtk-fullscreen.svg similarity index 100% rename from actions/22x22-light/gtk-fullscreen.svg rename to actions/22/gtk-fullscreen.svg diff --git a/actions/22x22-light/gtk-go-back-ltr.svg b/actions/22/gtk-go-back-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-go-back-ltr.svg rename to actions/22/gtk-go-back-ltr.svg diff --git a/actions/22x22-light/gtk-go-back-rtl.svg b/actions/22/gtk-go-back-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-go-back-rtl.svg rename to actions/22/gtk-go-back-rtl.svg diff --git a/actions/22x22-light/gtk-go-down.svg b/actions/22/gtk-go-down.svg similarity index 100% rename from actions/22x22-light/gtk-go-down.svg rename to actions/22/gtk-go-down.svg diff --git a/actions/22x22-light/gtk-go-forward-ltr.svg b/actions/22/gtk-go-forward-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-go-forward-ltr.svg rename to actions/22/gtk-go-forward-ltr.svg diff --git a/actions/22x22-light/gtk-go-forward-rtl.svg b/actions/22/gtk-go-forward-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-go-forward-rtl.svg rename to actions/22/gtk-go-forward-rtl.svg diff --git a/actions/22x22-light/gtk-go-up.svg b/actions/22/gtk-go-up.svg similarity index 100% rename from actions/22x22-light/gtk-go-up.svg rename to actions/22/gtk-go-up.svg diff --git a/actions/22x22-light/gtk-goto-bottom.svg b/actions/22/gtk-goto-bottom.svg similarity index 100% rename from actions/22x22-light/gtk-goto-bottom.svg rename to actions/22/gtk-goto-bottom.svg diff --git a/actions/22x22-light/gtk-goto-first-ltr.svg b/actions/22/gtk-goto-first-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-goto-first-ltr.svg rename to actions/22/gtk-goto-first-ltr.svg diff --git a/actions/22x22-light/gtk-goto-first-rtl.svg b/actions/22/gtk-goto-first-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-goto-first-rtl.svg rename to actions/22/gtk-goto-first-rtl.svg diff --git a/actions/22x22-light/gtk-goto-last-ltr.svg b/actions/22/gtk-goto-last-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-goto-last-ltr.svg rename to actions/22/gtk-goto-last-ltr.svg diff --git a/actions/22x22-light/gtk-goto-last-rtl.svg b/actions/22/gtk-goto-last-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-goto-last-rtl.svg rename to actions/22/gtk-goto-last-rtl.svg diff --git a/actions/22x22-light/gtk-goto-top.svg b/actions/22/gtk-goto-top.svg similarity index 100% rename from actions/22x22-light/gtk-goto-top.svg rename to actions/22/gtk-goto-top.svg diff --git a/actions/22x22-light/gtk-home.svg b/actions/22/gtk-home.svg similarity index 100% rename from actions/22x22-light/gtk-home.svg rename to actions/22/gtk-home.svg diff --git a/actions/22x22-light/gtk-index.svg b/actions/22/gtk-index.svg similarity index 100% rename from actions/22x22-light/gtk-index.svg rename to actions/22/gtk-index.svg diff --git a/actions/22x22-light/gtk-info.svg b/actions/22/gtk-info.svg similarity index 100% rename from actions/22x22-light/gtk-info.svg rename to actions/22/gtk-info.svg diff --git a/actions/22x22-light/gtk-jump-to-ltr.svg b/actions/22/gtk-jump-to-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-jump-to-ltr.svg rename to actions/22/gtk-jump-to-ltr.svg diff --git a/actions/22x22-light/gtk-jump-to-rtl.svg b/actions/22/gtk-jump-to-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-jump-to-rtl.svg rename to actions/22/gtk-jump-to-rtl.svg diff --git a/actions/22x22-light/gtk-leave-fullscreen.svg b/actions/22/gtk-leave-fullscreen.svg similarity index 100% rename from actions/22x22-light/gtk-leave-fullscreen.svg rename to actions/22/gtk-leave-fullscreen.svg diff --git a/actions/22x22-light/gtk-media-forward-ltr.svg b/actions/22/gtk-media-forward-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-media-forward-ltr.svg rename to actions/22/gtk-media-forward-ltr.svg diff --git a/actions/22x22-light/gtk-media-forward-rtl.svg b/actions/22/gtk-media-forward-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-media-forward-rtl.svg rename to actions/22/gtk-media-forward-rtl.svg diff --git a/actions/22x22-light/gtk-media-next-ltr.svg b/actions/22/gtk-media-next-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-media-next-ltr.svg rename to actions/22/gtk-media-next-ltr.svg diff --git a/actions/22x22-light/gtk-media-next-rtl.svg b/actions/22/gtk-media-next-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-media-next-rtl.svg rename to actions/22/gtk-media-next-rtl.svg diff --git a/actions/22x22-light/gtk-media-pause.svg b/actions/22/gtk-media-pause.svg similarity index 100% rename from actions/22x22-light/gtk-media-pause.svg rename to actions/22/gtk-media-pause.svg diff --git a/actions/22x22-light/gtk-media-play-ltr.svg b/actions/22/gtk-media-play-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-media-play-ltr.svg rename to actions/22/gtk-media-play-ltr.svg diff --git a/actions/22x22-light/gtk-media-previous-ltr.svg b/actions/22/gtk-media-previous-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-media-previous-ltr.svg rename to actions/22/gtk-media-previous-ltr.svg diff --git a/actions/22x22-light/gtk-media-previous-rtl.svg b/actions/22/gtk-media-previous-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-media-previous-rtl.svg rename to actions/22/gtk-media-previous-rtl.svg diff --git a/actions/22x22-light/gtk-media-record.svg b/actions/22/gtk-media-record.svg similarity index 100% rename from actions/22x22-light/gtk-media-record.svg rename to actions/22/gtk-media-record.svg diff --git a/actions/22x22-light/gtk-media-rewind-ltr.svg b/actions/22/gtk-media-rewind-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-media-rewind-ltr.svg rename to actions/22/gtk-media-rewind-ltr.svg diff --git a/actions/22x22-light/gtk-media-rewind-rtl.svg b/actions/22/gtk-media-rewind-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-media-rewind-rtl.svg rename to actions/22/gtk-media-rewind-rtl.svg diff --git a/actions/22x22-light/gtk-media-stop.svg b/actions/22/gtk-media-stop.svg similarity index 100% rename from actions/22x22-light/gtk-media-stop.svg rename to actions/22/gtk-media-stop.svg diff --git a/actions/22x22-light/gtk-new.svg b/actions/22/gtk-new.svg similarity index 100% rename from actions/22x22-light/gtk-new.svg rename to actions/22/gtk-new.svg diff --git a/actions/22x22-light/gtk-no.svg b/actions/22/gtk-no.svg similarity index 100% rename from actions/22x22-light/gtk-no.svg rename to actions/22/gtk-no.svg diff --git a/actions/22x22-light/gtk-ok.svg b/actions/22/gtk-ok.svg similarity index 100% rename from actions/22x22-light/gtk-ok.svg rename to actions/22/gtk-ok.svg diff --git a/actions/22x22-light/gtk-open.svg b/actions/22/gtk-open.svg similarity index 100% rename from actions/22x22-light/gtk-open.svg rename to actions/22/gtk-open.svg diff --git a/actions/22x22-light/gtk-paste.svg b/actions/22/gtk-paste.svg similarity index 100% rename from actions/22x22-light/gtk-paste.svg rename to actions/22/gtk-paste.svg diff --git a/actions/22x22-light/gtk-preferences.svg b/actions/22/gtk-preferences.svg similarity index 100% rename from actions/22x22-light/gtk-preferences.svg rename to actions/22/gtk-preferences.svg diff --git a/actions/22x22-light/gtk-print-preview.svg b/actions/22/gtk-print-preview.svg similarity index 100% rename from actions/22x22-light/gtk-print-preview.svg rename to actions/22/gtk-print-preview.svg diff --git a/actions/22x22-light/gtk-print.svg b/actions/22/gtk-print.svg similarity index 100% rename from actions/22x22-light/gtk-print.svg rename to actions/22/gtk-print.svg diff --git a/actions/22x22-light/gtk-properties.svg b/actions/22/gtk-properties.svg similarity index 100% rename from actions/22x22-light/gtk-properties.svg rename to actions/22/gtk-properties.svg diff --git a/actions/22x22-light/gtk-quit.svg b/actions/22/gtk-quit.svg similarity index 100% rename from actions/22x22-light/gtk-quit.svg rename to actions/22/gtk-quit.svg diff --git a/actions/22x22-light/gtk-redo-ltr.svg b/actions/22/gtk-redo-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-redo-ltr.svg rename to actions/22/gtk-redo-ltr.svg diff --git a/actions/22x22-light/gtk-redo-rtl.svg b/actions/22/gtk-redo-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-redo-rtl.svg rename to actions/22/gtk-redo-rtl.svg diff --git a/actions/22x22-light/gtk-redo.ltr.svg b/actions/22/gtk-redo.ltr.svg similarity index 100% rename from actions/22x22-light/gtk-redo.ltr.svg rename to actions/22/gtk-redo.ltr.svg diff --git a/actions/22x22-light/gtk-redo.svg b/actions/22/gtk-redo.svg similarity index 100% rename from actions/22x22-light/gtk-redo.svg rename to actions/22/gtk-redo.svg diff --git a/actions/22x22-light/gtk-refresh.svg b/actions/22/gtk-refresh.svg similarity index 100% rename from actions/22x22-light/gtk-refresh.svg rename to actions/22/gtk-refresh.svg diff --git a/actions/22x22-light/gtk-remove.svg b/actions/22/gtk-remove.svg similarity index 100% rename from actions/22x22-light/gtk-remove.svg rename to actions/22/gtk-remove.svg diff --git a/actions/22x22-light/gtk-revert-to-saved-ltr.svg b/actions/22/gtk-revert-to-saved-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-revert-to-saved-ltr.svg rename to actions/22/gtk-revert-to-saved-ltr.svg diff --git a/actions/22x22-light/gtk-revert-to-saved-rtl.svg b/actions/22/gtk-revert-to-saved-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-revert-to-saved-rtl.svg rename to actions/22/gtk-revert-to-saved-rtl.svg diff --git a/actions/22x22-light/gtk-save-all.svg b/actions/22/gtk-save-all.svg similarity index 100% rename from actions/22x22-light/gtk-save-all.svg rename to actions/22/gtk-save-all.svg diff --git a/actions/22x22-light/gtk-save-as.svg b/actions/22/gtk-save-as.svg similarity index 100% rename from actions/22x22-light/gtk-save-as.svg rename to actions/22/gtk-save-as.svg diff --git a/actions/22x22-light/gtk-save.svg b/actions/22/gtk-save.svg similarity index 100% rename from actions/22x22-light/gtk-save.svg rename to actions/22/gtk-save.svg diff --git a/actions/22x22-light/gtk-search.svg b/actions/22/gtk-search.svg similarity index 100% rename from actions/22x22-light/gtk-search.svg rename to actions/22/gtk-search.svg diff --git a/actions/22x22-light/gtk-select-all.svg b/actions/22/gtk-select-all.svg similarity index 100% rename from actions/22x22-light/gtk-select-all.svg rename to actions/22/gtk-select-all.svg diff --git a/actions/22x22-light/gtk-select-color.svg b/actions/22/gtk-select-color.svg similarity index 100% rename from actions/22x22-light/gtk-select-color.svg rename to actions/22/gtk-select-color.svg diff --git a/actions/22x22-light/gtk-select-font.svg b/actions/22/gtk-select-font.svg similarity index 100% rename from actions/22x22-light/gtk-select-font.svg rename to actions/22/gtk-select-font.svg diff --git a/actions/22x22-light/gtk-sort-ascending.svg b/actions/22/gtk-sort-ascending.svg similarity index 100% rename from actions/22x22-light/gtk-sort-ascending.svg rename to actions/22/gtk-sort-ascending.svg diff --git a/actions/22x22-light/gtk-sort-descending.svg b/actions/22/gtk-sort-descending.svg similarity index 100% rename from actions/22x22-light/gtk-sort-descending.svg rename to actions/22/gtk-sort-descending.svg diff --git a/actions/22x22-light/gtk-stop.svg b/actions/22/gtk-stop.svg similarity index 100% rename from actions/22x22-light/gtk-stop.svg rename to actions/22/gtk-stop.svg diff --git a/actions/22x22-light/gtk-tab-duplicate.svg b/actions/22/gtk-tab-duplicate.svg similarity index 100% rename from actions/22x22-light/gtk-tab-duplicate.svg rename to actions/22/gtk-tab-duplicate.svg diff --git a/actions/22x22-light/gtk-tab-new.svg b/actions/22/gtk-tab-new.svg similarity index 100% rename from actions/22x22-light/gtk-tab-new.svg rename to actions/22/gtk-tab-new.svg diff --git a/actions/22x22-light/gtk-undelete-ltr.svg b/actions/22/gtk-undelete-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-undelete-ltr.svg rename to actions/22/gtk-undelete-ltr.svg diff --git a/actions/22x22-light/gtk-undelete-rtl.svg b/actions/22/gtk-undelete-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-undelete-rtl.svg rename to actions/22/gtk-undelete-rtl.svg diff --git a/actions/22x22-light/gtk-undo-ltr.svg b/actions/22/gtk-undo-ltr.svg similarity index 100% rename from actions/22x22-light/gtk-undo-ltr.svg rename to actions/22/gtk-undo-ltr.svg diff --git a/actions/22x22-light/gtk-undo-rtl.svg b/actions/22/gtk-undo-rtl.svg similarity index 100% rename from actions/22x22-light/gtk-undo-rtl.svg rename to actions/22/gtk-undo-rtl.svg diff --git a/actions/22x22-light/gtk-undo.svg b/actions/22/gtk-undo.svg similarity index 100% rename from actions/22x22-light/gtk-undo.svg rename to actions/22/gtk-undo.svg diff --git a/actions/22x22-light/gtk-yes.svg b/actions/22/gtk-yes.svg similarity index 100% rename from actions/22x22-light/gtk-yes.svg rename to actions/22/gtk-yes.svg diff --git a/actions/22x22-light/gtk-zoom-100.svg b/actions/22/gtk-zoom-100.svg similarity index 100% rename from actions/22x22-light/gtk-zoom-100.svg rename to actions/22/gtk-zoom-100.svg diff --git a/actions/22x22-light/gtk-zoom-fit.svg b/actions/22/gtk-zoom-fit.svg similarity index 100% rename from actions/22x22-light/gtk-zoom-fit.svg rename to actions/22/gtk-zoom-fit.svg diff --git a/actions/22x22-light/gtk-zoom-in.svg b/actions/22/gtk-zoom-in.svg similarity index 100% rename from actions/22x22-light/gtk-zoom-in.svg rename to actions/22/gtk-zoom-in.svg diff --git a/actions/22x22-light/gtk-zoom-out.svg b/actions/22/gtk-zoom-out.svg similarity index 100% rename from actions/22x22-light/gtk-zoom-out.svg rename to actions/22/gtk-zoom-out.svg diff --git a/actions/22x22-light/help-about.svg b/actions/22/help-about.svg similarity index 100% rename from actions/22x22-light/help-about.svg rename to actions/22/help-about.svg diff --git a/actions/22x22-light/help-contents.svg b/actions/22/help-contents.svg similarity index 100% rename from actions/22x22-light/help-contents.svg rename to actions/22/help-contents.svg diff --git a/actions/22x22-light/help-contextual.svg b/actions/22/help-contextual.svg similarity index 100% rename from actions/22x22-light/help-contextual.svg rename to actions/22/help-contextual.svg diff --git a/actions/22x22-light/help-donate.svg b/actions/22/help-donate.svg similarity index 100% rename from actions/22x22-light/help-donate.svg rename to actions/22/help-donate.svg diff --git a/actions/22x22-light/help-faq.svg b/actions/22/help-faq.svg similarity index 100% rename from actions/22x22-light/help-faq.svg rename to actions/22/help-faq.svg diff --git a/actions/22x22-light/help-feedback.svg b/actions/22/help-feedback.svg similarity index 100% rename from actions/22x22-light/help-feedback.svg rename to actions/22/help-feedback.svg diff --git a/actions/22x22-light/help-hint.svg b/actions/22/help-hint.svg similarity index 100% rename from actions/22x22-light/help-hint.svg rename to actions/22/help-hint.svg diff --git a/actions/22x22-light/help-keybord-shortcuts.svg b/actions/22/help-keybord-shortcuts.svg similarity index 100% rename from actions/22x22-light/help-keybord-shortcuts.svg rename to actions/22/help-keybord-shortcuts.svg diff --git a/actions/22x22-light/help.svg b/actions/22/help.svg similarity index 100% rename from actions/22x22-light/help.svg rename to actions/22/help.svg diff --git a/actions/22x22-light/hidemouse.svg b/actions/22/hidemouse.svg similarity index 100% rename from actions/22x22-light/hidemouse.svg rename to actions/22/hidemouse.svg diff --git a/actions/22x22-light/hint.svg b/actions/22/hint.svg similarity index 100% rename from actions/22x22-light/hint.svg rename to actions/22/hint.svg diff --git a/actions/22x22-light/hook-notifier.svg b/actions/22/hook-notifier.svg similarity index 100% rename from actions/22x22-light/hook-notifier.svg rename to actions/22/hook-notifier.svg diff --git a/actions/22x22-light/hotpixels.svg b/actions/22/hotpixels.svg similarity index 100% rename from actions/22x22-light/hotpixels.svg rename to actions/22/hotpixels.svg diff --git a/actions/22x22-light/identity.svg b/actions/22/identity.svg similarity index 100% rename from actions/22x22-light/identity.svg rename to actions/22/identity.svg diff --git a/actions/22x22-light/im-aim.svg b/actions/22/im-aim.svg similarity index 100% rename from actions/22x22-light/im-aim.svg rename to actions/22/im-aim.svg diff --git a/actions/22x22-light/im-ban-kick-user.svg b/actions/22/im-ban-kick-user.svg similarity index 100% rename from actions/22x22-light/im-ban-kick-user.svg rename to actions/22/im-ban-kick-user.svg diff --git a/actions/22x22-light/im-ban-user.svg b/actions/22/im-ban-user.svg similarity index 100% rename from actions/22x22-light/im-ban-user.svg rename to actions/22/im-ban-user.svg diff --git a/actions/22x22-light/im-facebook.svg b/actions/22/im-facebook.svg similarity index 100% rename from actions/22x22-light/im-facebook.svg rename to actions/22/im-facebook.svg diff --git a/actions/22x22-light/im-gadugadu.svg b/actions/22/im-gadugadu.svg similarity index 100% rename from actions/22x22-light/im-gadugadu.svg rename to actions/22/im-gadugadu.svg diff --git a/actions/22x22-light/im-google-talk.svg b/actions/22/im-google-talk.svg similarity index 100% rename from actions/22x22-light/im-google-talk.svg rename to actions/22/im-google-talk.svg diff --git a/actions/22x22-light/im-google.svg b/actions/22/im-google.svg similarity index 100% rename from actions/22x22-light/im-google.svg rename to actions/22/im-google.svg diff --git a/actions/22x22-light/im-icq.svg b/actions/22/im-icq.svg similarity index 100% rename from actions/22x22-light/im-icq.svg rename to actions/22/im-icq.svg diff --git a/actions/22x22-light/im-identi.ca.svg b/actions/22/im-identi.ca.svg similarity index 100% rename from actions/22x22-light/im-identi.ca.svg rename to actions/22/im-identi.ca.svg diff --git a/actions/22x22-light/im-invisible-user.svg b/actions/22/im-invisible-user.svg similarity index 100% rename from actions/22x22-light/im-invisible-user.svg rename to actions/22/im-invisible-user.svg diff --git a/actions/22x22-light/im-jabber.svg b/actions/22/im-jabber.svg similarity index 100% rename from actions/22x22-light/im-jabber.svg rename to actions/22/im-jabber.svg diff --git a/actions/22x22-light/im-kick-user.svg b/actions/22/im-kick-user.svg similarity index 100% rename from actions/22x22-light/im-kick-user.svg rename to actions/22/im-kick-user.svg diff --git a/actions/22x22-light/im-msn.svg b/actions/22/im-msn.svg similarity index 100% rename from actions/22x22-light/im-msn.svg rename to actions/22/im-msn.svg diff --git a/actions/22x22-light/im-qq.svg b/actions/22/im-qq.svg similarity index 100% rename from actions/22x22-light/im-qq.svg rename to actions/22/im-qq.svg diff --git a/actions/22x22-light/im-skype.svg b/actions/22/im-skype.svg similarity index 100% rename from actions/22x22-light/im-skype.svg rename to actions/22/im-skype.svg diff --git a/actions/22x22-light/im-twitter.svg b/actions/22/im-twitter.svg similarity index 100% rename from actions/22x22-light/im-twitter.svg rename to actions/22/im-twitter.svg diff --git a/actions/22x22-light/im-user-away.svg b/actions/22/im-user-away.svg similarity index 100% rename from actions/22x22-light/im-user-away.svg rename to actions/22/im-user-away.svg diff --git a/actions/22x22-light/im-user-busy.svg b/actions/22/im-user-busy.svg similarity index 100% rename from actions/22x22-light/im-user-busy.svg rename to actions/22/im-user-busy.svg diff --git a/actions/22x22-light/im-user-offline.svg b/actions/22/im-user-offline.svg similarity index 100% rename from actions/22x22-light/im-user-offline.svg rename to actions/22/im-user-offline.svg diff --git a/actions/22x22-light/im-user-online.svg b/actions/22/im-user-online.svg similarity index 100% rename from actions/22x22-light/im-user-online.svg rename to actions/22/im-user-online.svg diff --git a/actions/22x22-light/im-user.svg b/actions/22/im-user.svg similarity index 100% rename from actions/22x22-light/im-user.svg rename to actions/22/im-user.svg diff --git a/actions/22x22-light/im-yahoo.svg b/actions/22/im-yahoo.svg similarity index 100% rename from actions/22x22-light/im-yahoo.svg rename to actions/22/im-yahoo.svg diff --git a/actions/22x22-light/image-zoom-in.svg b/actions/22/image-zoom-in.svg similarity index 100% rename from actions/22x22-light/image-zoom-in.svg rename to actions/22/image-zoom-in.svg diff --git a/actions/22x22-light/image-zoom-out.svg b/actions/22/image-zoom-out.svg similarity index 100% rename from actions/22x22-light/image-zoom-out.svg rename to actions/22/image-zoom-out.svg diff --git a/actions/22x22-light/imagecomment.svg b/actions/22/imagecomment.svg similarity index 100% rename from actions/22x22-light/imagecomment.svg rename to actions/22/imagecomment.svg diff --git a/actions/22x22-light/inpainting.svg b/actions/22/inpainting.svg similarity index 100% rename from actions/22x22-light/inpainting.svg rename to actions/22/inpainting.svg diff --git a/actions/22x22-light/insert-button.svg b/actions/22/insert-button.svg similarity index 100% rename from actions/22x22-light/insert-button.svg rename to actions/22/insert-button.svg diff --git a/actions/22x22-light/insert-endnote.svg b/actions/22/insert-endnote.svg similarity index 100% rename from actions/22x22-light/insert-endnote.svg rename to actions/22/insert-endnote.svg diff --git a/actions/22x22-light/insert-footnote.svg b/actions/22/insert-footnote.svg similarity index 100% rename from actions/22x22-light/insert-footnote.svg rename to actions/22/insert-footnote.svg diff --git a/actions/22x22-light/insert-horizontal-rule.svg b/actions/22/insert-horizontal-rule.svg similarity index 100% rename from actions/22x22-light/insert-horizontal-rule.svg rename to actions/22/insert-horizontal-rule.svg diff --git a/actions/22x22-light/insert-image.svg b/actions/22/insert-image.svg similarity index 100% rename from actions/22x22-light/insert-image.svg rename to actions/22/insert-image.svg diff --git a/actions/22x22-light/insert-link.svg b/actions/22/insert-link.svg similarity index 100% rename from actions/22x22-light/insert-link.svg rename to actions/22/insert-link.svg diff --git a/actions/22x22-light/insert-more-mark.svg b/actions/22/insert-more-mark.svg similarity index 100% rename from actions/22x22-light/insert-more-mark.svg rename to actions/22/insert-more-mark.svg diff --git a/actions/22x22-light/insert-pause.svg b/actions/22/insert-pause.svg similarity index 100% rename from actions/22x22-light/insert-pause.svg rename to actions/22/insert-pause.svg diff --git a/actions/22x22-light/insert-table-row.svg b/actions/22/insert-table-row.svg similarity index 100% rename from actions/22x22-light/insert-table-row.svg rename to actions/22/insert-table-row.svg diff --git a/actions/22x22-light/insert-table.svg b/actions/22/insert-table.svg similarity index 100% rename from actions/22x22-light/insert-table.svg rename to actions/22/insert-table.svg diff --git a/actions/22x22-light/insert-tableofcontents.svg b/actions/22/insert-tableofcontents.svg similarity index 100% rename from actions/22x22-light/insert-tableofcontents.svg rename to actions/22/insert-tableofcontents.svg diff --git a/actions/22x22-light/insert-text-frame.svg b/actions/22/insert-text-frame.svg similarity index 100% rename from actions/22x22-light/insert-text-frame.svg rename to actions/22/insert-text-frame.svg diff --git a/actions/22x22-light/insert-text.svg b/actions/22/insert-text.svg similarity index 100% rename from actions/22x22-light/insert-text.svg rename to actions/22/insert-text.svg diff --git a/actions/22x22-light/internet-amarok.svg b/actions/22/internet-amarok.svg similarity index 100% rename from actions/22x22-light/internet-amarok.svg rename to actions/22/internet-amarok.svg diff --git a/actions/22x22-light/invertimage.svg b/actions/22/invertimage.svg similarity index 100% rename from actions/22x22-light/invertimage.svg rename to actions/22/invertimage.svg diff --git a/actions/22x22-light/irc-channel-active.svg b/actions/22/irc-channel-active.svg similarity index 100% rename from actions/22x22-light/irc-channel-active.svg rename to actions/22/irc-channel-active.svg diff --git a/actions/22x22-light/irc-channel-inactive.svg b/actions/22/irc-channel-inactive.svg similarity index 100% rename from actions/22x22-light/irc-channel-inactive.svg rename to actions/22/irc-channel-inactive.svg diff --git a/actions/22x22-light/irc-close-channel.svg b/actions/22/irc-close-channel.svg similarity index 100% rename from actions/22x22-light/irc-close-channel.svg rename to actions/22/irc-close-channel.svg diff --git a/actions/22x22-light/irc-join-channel.svg b/actions/22/irc-join-channel.svg similarity index 100% rename from actions/22x22-light/irc-join-channel.svg rename to actions/22/irc-join-channel.svg diff --git a/actions/22x22-light/irc-operator.svg b/actions/22/irc-operator.svg similarity index 100% rename from actions/22x22-light/irc-operator.svg rename to actions/22/irc-operator.svg diff --git a/actions/22x22-light/irc-remove-operator.svg b/actions/22/irc-remove-operator.svg similarity index 100% rename from actions/22x22-light/irc-remove-operator.svg rename to actions/22/irc-remove-operator.svg diff --git a/actions/22x22-light/irc-unvoice.svg b/actions/22/irc-unvoice.svg similarity index 100% rename from actions/22x22-light/irc-unvoice.svg rename to actions/22/irc-unvoice.svg diff --git a/actions/22x22-light/irc-voice.svg b/actions/22/irc-voice.svg similarity index 100% rename from actions/22x22-light/irc-voice.svg rename to actions/22/irc-voice.svg diff --git a/actions/22x22-light/iso-image-burn.svg b/actions/22/iso-image-burn.svg similarity index 100% rename from actions/22x22-light/iso-image-burn.svg rename to actions/22/iso-image-burn.svg diff --git a/actions/22x22-light/iso-image-iso.svg b/actions/22/iso-image-iso.svg similarity index 100% rename from actions/22x22-light/iso-image-iso.svg rename to actions/22/iso-image-iso.svg diff --git a/actions/22x22-light/journal-new.svg b/actions/22/journal-new.svg similarity index 100% rename from actions/22x22-light/journal-new.svg rename to actions/22/journal-new.svg diff --git a/actions/22x22-light/jump-today.svg b/actions/22/jump-today.svg similarity index 100% rename from actions/22x22-light/jump-today.svg rename to actions/22/jump-today.svg diff --git a/actions/22x22-light/kdenlive-add-clip.svg b/actions/22/kdenlive-add-clip.svg similarity index 100% rename from actions/22x22-light/kdenlive-add-clip.svg rename to actions/22/kdenlive-add-clip.svg diff --git a/actions/22x22-light/kdenlive-add-color-clip.svg b/actions/22/kdenlive-add-color-clip.svg similarity index 100% rename from actions/22x22-light/kdenlive-add-color-clip.svg rename to actions/22/kdenlive-add-color-clip.svg diff --git a/actions/22x22-light/kdenlive-add-slide-clip.svg b/actions/22/kdenlive-add-slide-clip.svg similarity index 100% rename from actions/22x22-light/kdenlive-add-slide-clip.svg rename to actions/22/kdenlive-add-slide-clip.svg diff --git a/actions/22x22-light/kdenlive-add-text-clip.svg b/actions/22/kdenlive-add-text-clip.svg similarity index 100% rename from actions/22x22-light/kdenlive-add-text-clip.svg rename to actions/22/kdenlive-add-text-clip.svg diff --git a/actions/22x22-light/kdenlive-align-bottom.svg b/actions/22/kdenlive-align-bottom.svg similarity index 100% rename from actions/22x22-light/kdenlive-align-bottom.svg rename to actions/22/kdenlive-align-bottom.svg diff --git a/actions/22x22-light/kdenlive-align-hor.svg b/actions/22/kdenlive-align-hor.svg similarity index 100% rename from actions/22x22-light/kdenlive-align-hor.svg rename to actions/22/kdenlive-align-hor.svg diff --git a/actions/22x22-light/kdenlive-align-left.svg b/actions/22/kdenlive-align-left.svg similarity index 100% rename from actions/22x22-light/kdenlive-align-left.svg rename to actions/22/kdenlive-align-left.svg diff --git a/actions/22x22-light/kdenlive-align-none.svg b/actions/22/kdenlive-align-none.svg similarity index 100% rename from actions/22x22-light/kdenlive-align-none.svg rename to actions/22/kdenlive-align-none.svg diff --git a/actions/22x22-light/kdenlive-align-right.svg b/actions/22/kdenlive-align-right.svg similarity index 100% rename from actions/22x22-light/kdenlive-align-right.svg rename to actions/22/kdenlive-align-right.svg diff --git a/actions/22x22-light/kdenlive-align-top.svg b/actions/22/kdenlive-align-top.svg similarity index 100% rename from actions/22x22-light/kdenlive-align-top.svg rename to actions/22/kdenlive-align-top.svg diff --git a/actions/22x22-light/kdenlive-align-vert.svg b/actions/22/kdenlive-align-vert.svg similarity index 100% rename from actions/22x22-light/kdenlive-align-vert.svg rename to actions/22/kdenlive-align-vert.svg diff --git a/actions/22x22-light/kdenlive-custom-effect.svg b/actions/22/kdenlive-custom-effect.svg similarity index 100% rename from actions/22x22-light/kdenlive-custom-effect.svg rename to actions/22/kdenlive-custom-effect.svg diff --git a/actions/22x22-light/kdenlive-deleffect.svg b/actions/22/kdenlive-deleffect.svg similarity index 100% rename from actions/22x22-light/kdenlive-deleffect.svg rename to actions/22/kdenlive-deleffect.svg diff --git a/actions/22x22-light/kdenlive-down.svg b/actions/22/kdenlive-down.svg similarity index 100% rename from actions/22x22-light/kdenlive-down.svg rename to actions/22/kdenlive-down.svg diff --git a/actions/22x22-light/kdenlive-hide-audio.svg b/actions/22/kdenlive-hide-audio.svg similarity index 100% rename from actions/22x22-light/kdenlive-hide-audio.svg rename to actions/22/kdenlive-hide-audio.svg diff --git a/actions/22x22-light/kdenlive-hide-video.svg b/actions/22/kdenlive-hide-video.svg similarity index 100% rename from actions/22x22-light/kdenlive-hide-video.svg rename to actions/22/kdenlive-hide-video.svg diff --git a/actions/22x22-light/kdenlive-insert-edit.svg b/actions/22/kdenlive-insert-edit.svg similarity index 100% rename from actions/22x22-light/kdenlive-insert-edit.svg rename to actions/22/kdenlive-insert-edit.svg diff --git a/actions/22x22-light/kdenlive-insert-rect.svg b/actions/22/kdenlive-insert-rect.svg similarity index 100% rename from actions/22x22-light/kdenlive-insert-rect.svg rename to actions/22/kdenlive-insert-rect.svg diff --git a/actions/22x22-light/kdenlive-insert-unicode.svg b/actions/22/kdenlive-insert-unicode.svg similarity index 100% rename from actions/22x22-light/kdenlive-insert-unicode.svg rename to actions/22/kdenlive-insert-unicode.svg diff --git a/actions/22x22-light/kdenlive-lock.svg b/actions/22/kdenlive-lock.svg similarity index 100% rename from actions/22x22-light/kdenlive-lock.svg rename to actions/22/kdenlive-lock.svg diff --git a/actions/22x22-light/kdenlive-menu.svg b/actions/22/kdenlive-menu.svg similarity index 100% rename from actions/22x22-light/kdenlive-menu.svg rename to actions/22/kdenlive-menu.svg diff --git a/actions/22x22-light/kdenlive-normal-edit.svg b/actions/22/kdenlive-normal-edit.svg similarity index 100% rename from actions/22x22-light/kdenlive-normal-edit.svg rename to actions/22/kdenlive-normal-edit.svg diff --git a/actions/22x22-light/kdenlive-object-height.svg b/actions/22/kdenlive-object-height.svg similarity index 100% rename from actions/22x22-light/kdenlive-object-height.svg rename to actions/22/kdenlive-object-height.svg diff --git a/actions/22x22-light/kdenlive-object-width.svg b/actions/22/kdenlive-object-width.svg similarity index 100% rename from actions/22x22-light/kdenlive-object-width.svg rename to actions/22/kdenlive-object-width.svg diff --git a/actions/22x22-light/kdenlive-overwrite-edit.svg b/actions/22/kdenlive-overwrite-edit.svg similarity index 100% rename from actions/22x22-light/kdenlive-overwrite-edit.svg rename to actions/22/kdenlive-overwrite-edit.svg diff --git a/actions/22x22-light/kdenlive-select-all.svg b/actions/22/kdenlive-select-all.svg similarity index 100% rename from actions/22x22-light/kdenlive-select-all.svg rename to actions/22/kdenlive-select-all.svg diff --git a/actions/22x22-light/kdenlive-select-images.svg b/actions/22/kdenlive-select-images.svg similarity index 100% rename from actions/22x22-light/kdenlive-select-images.svg rename to actions/22/kdenlive-select-images.svg diff --git a/actions/22x22-light/kdenlive-select-rects.svg b/actions/22/kdenlive-select-rects.svg similarity index 100% rename from actions/22x22-light/kdenlive-select-rects.svg rename to actions/22/kdenlive-select-rects.svg diff --git a/actions/22x22-light/kdenlive-select-texts.svg b/actions/22/kdenlive-select-texts.svg similarity index 100% rename from actions/22x22-light/kdenlive-select-texts.svg rename to actions/22/kdenlive-select-texts.svg diff --git a/actions/22x22-light/kdenlive-select-tool.svg b/actions/22/kdenlive-select-tool.svg similarity index 100% rename from actions/22x22-light/kdenlive-select-tool.svg rename to actions/22/kdenlive-select-tool.svg diff --git a/actions/22x22-light/kdenlive-show-audio.svg b/actions/22/kdenlive-show-audio.svg similarity index 100% rename from actions/22x22-light/kdenlive-show-audio.svg rename to actions/22/kdenlive-show-audio.svg diff --git a/actions/22x22-light/kdenlive-show-audiothumb.svg b/actions/22/kdenlive-show-audiothumb.svg similarity index 100% rename from actions/22x22-light/kdenlive-show-audiothumb.svg rename to actions/22/kdenlive-show-audiothumb.svg diff --git a/actions/22x22-light/kdenlive-show-markers.svg b/actions/22/kdenlive-show-markers.svg similarity index 100% rename from actions/22x22-light/kdenlive-show-markers.svg rename to actions/22/kdenlive-show-markers.svg diff --git a/actions/22x22-light/kdenlive-show-video.svg b/actions/22/kdenlive-show-video.svg similarity index 100% rename from actions/22x22-light/kdenlive-show-video.svg rename to actions/22/kdenlive-show-video.svg diff --git a/actions/22x22-light/kdenlive-show-videothumb.svg b/actions/22/kdenlive-show-videothumb.svg similarity index 100% rename from actions/22x22-light/kdenlive-show-videothumb.svg rename to actions/22/kdenlive-show-videothumb.svg diff --git a/actions/22x22-light/kdenlive-snap.svg b/actions/22/kdenlive-snap.svg similarity index 100% rename from actions/22x22-light/kdenlive-snap.svg rename to actions/22/kdenlive-snap.svg diff --git a/actions/22x22-light/kdenlive-spacer-tool.svg b/actions/22/kdenlive-spacer-tool.svg similarity index 100% rename from actions/22x22-light/kdenlive-spacer-tool.svg rename to actions/22/kdenlive-spacer-tool.svg diff --git a/actions/22x22-light/kdenlive-split-audio.svg b/actions/22/kdenlive-split-audio.svg similarity index 100% rename from actions/22x22-light/kdenlive-split-audio.svg rename to actions/22/kdenlive-split-audio.svg diff --git a/actions/22x22-light/kdenlive-track-has-effect.svg b/actions/22/kdenlive-track-has-effect.svg similarity index 100% rename from actions/22x22-light/kdenlive-track-has-effect.svg rename to actions/22/kdenlive-track-has-effect.svg diff --git a/actions/22x22-light/kdenlive-track_has_effect.svg b/actions/22/kdenlive-track_has_effect.svg similarity index 100% rename from actions/22x22-light/kdenlive-track_has_effect.svg rename to actions/22/kdenlive-track_has_effect.svg diff --git a/actions/22x22-light/kdenlive-unlock.svg b/actions/22/kdenlive-unlock.svg similarity index 100% rename from actions/22x22-light/kdenlive-unlock.svg rename to actions/22/kdenlive-unlock.svg diff --git a/actions/22x22-light/kdenlive-unselect-all.svg b/actions/22/kdenlive-unselect-all.svg similarity index 100% rename from actions/22x22-light/kdenlive-unselect-all.svg rename to actions/22/kdenlive-unselect-all.svg diff --git a/actions/22x22-light/kdenlive-up.svg b/actions/22/kdenlive-up.svg similarity index 100% rename from actions/22x22-light/kdenlive-up.svg rename to actions/22/kdenlive-up.svg diff --git a/actions/22x22-light/kdenlive-zindex-bottom.svg b/actions/22/kdenlive-zindex-bottom.svg similarity index 100% rename from actions/22x22-light/kdenlive-zindex-bottom.svg rename to actions/22/kdenlive-zindex-bottom.svg diff --git a/actions/22x22-light/kdenlive-zindex-down.svg b/actions/22/kdenlive-zindex-down.svg similarity index 100% rename from actions/22x22-light/kdenlive-zindex-down.svg rename to actions/22/kdenlive-zindex-down.svg diff --git a/actions/22x22-light/kdenlive-zindex-top.svg b/actions/22/kdenlive-zindex-top.svg similarity index 100% rename from actions/22x22-light/kdenlive-zindex-top.svg rename to actions/22/kdenlive-zindex-top.svg diff --git a/actions/22x22-light/kdenlive-zindex-up.svg b/actions/22/kdenlive-zindex-up.svg similarity index 100% rename from actions/22x22-light/kdenlive-zindex-up.svg rename to actions/22/kdenlive-zindex-up.svg diff --git a/actions/22x22-light/kdenlive-zone-end.svg b/actions/22/kdenlive-zone-end.svg similarity index 100% rename from actions/22x22-light/kdenlive-zone-end.svg rename to actions/22/kdenlive-zone-end.svg diff --git a/actions/22x22-light/kdenlive-zone-start.svg b/actions/22/kdenlive-zone-start.svg similarity index 100% rename from actions/22x22-light/kdenlive-zone-start.svg rename to actions/22/kdenlive-zone-start.svg diff --git a/actions/22x22-light/kdenlive-zoom-large.svg b/actions/22/kdenlive-zoom-large.svg similarity index 100% rename from actions/22x22-light/kdenlive-zoom-large.svg rename to actions/22/kdenlive-zoom-large.svg diff --git a/actions/22x22-light/kdenlive-zoom-small.svg b/actions/22/kdenlive-zoom-small.svg similarity index 100% rename from actions/22x22-light/kdenlive-zoom-small.svg rename to actions/22/kdenlive-zoom-small.svg diff --git a/actions/22x22-light/key-enter.svg b/actions/22/key-enter.svg similarity index 100% rename from actions/22x22-light/key-enter.svg rename to actions/22/key-enter.svg diff --git a/actions/22x22-light/kfind.svg b/actions/22/kfind.svg similarity index 100% rename from actions/22x22-light/kfind.svg rename to actions/22/kfind.svg diff --git a/actions/22x22-light/kfm-home.svg b/actions/22/kfm-home.svg similarity index 100% rename from actions/22x22-light/kfm-home.svg rename to actions/22/kfm-home.svg diff --git a/actions/22x22-light/kfm_home.svg b/actions/22/kfm_home.svg similarity index 100% rename from actions/22x22-light/kfm_home.svg rename to actions/22/kfm_home.svg diff --git a/actions/22x22-light/kmouth-phrase-new.svg b/actions/22/kmouth-phrase-new.svg similarity index 100% rename from actions/22x22-light/kmouth-phrase-new.svg rename to actions/22/kmouth-phrase-new.svg diff --git a/actions/22x22-light/kmouth-phrase.svg b/actions/22/kmouth-phrase.svg similarity index 100% rename from actions/22x22-light/kmouth-phrase.svg rename to actions/22/kmouth-phrase.svg diff --git a/actions/22x22-light/kmouth-phrasebook.svg b/actions/22/kmouth-phrasebook.svg similarity index 100% rename from actions/22x22-light/kmouth-phrasebook.svg rename to actions/22/kmouth-phrasebook.svg diff --git a/actions/22x22-light/kmouth-phresebook-new.svg b/actions/22/kmouth-phresebook-new.svg similarity index 100% rename from actions/22x22-light/kmouth-phresebook-new.svg rename to actions/22/kmouth-phresebook-new.svg diff --git a/actions/22x22-light/knotes_alarm.svg b/actions/22/knotes_alarm.svg similarity index 100% rename from actions/22x22-light/knotes_alarm.svg rename to actions/22/knotes_alarm.svg diff --git a/actions/22x22-light/knotes_date.svg b/actions/22/knotes_date.svg similarity index 100% rename from actions/22x22-light/knotes_date.svg rename to actions/22/knotes_date.svg diff --git a/actions/22x22-light/knotes_delete.svg b/actions/22/knotes_delete.svg similarity index 100% rename from actions/22x22-light/knotes_delete.svg rename to actions/22/knotes_delete.svg diff --git a/actions/22x22-light/kontes_close.svg b/actions/22/kontes_close.svg similarity index 100% rename from actions/22x22-light/kontes_close.svg rename to actions/22/kontes_close.svg diff --git a/actions/22x22-light/kr_combine.svg b/actions/22/kr_combine.svg similarity index 100% rename from actions/22x22-light/kr_combine.svg rename to actions/22/kr_combine.svg diff --git a/actions/22x22-light/kr_comparedirs.svg b/actions/22/kr_comparedirs.svg similarity index 100% rename from actions/22x22-light/kr_comparedirs.svg rename to actions/22/kr_comparedirs.svg diff --git a/actions/22x22-light/kr_diskusage.svg b/actions/22/kr_diskusage.svg similarity index 100% rename from actions/22x22-light/kr_diskusage.svg rename to actions/22/kr_diskusage.svg diff --git a/actions/22x22-light/kr_jumpback.svg b/actions/22/kr_jumpback.svg similarity index 100% rename from actions/22x22-light/kr_jumpback.svg rename to actions/22/kr_jumpback.svg diff --git a/actions/22x22-light/kr_mountman.svg b/actions/22/kr_mountman.svg similarity index 100% rename from actions/22x22-light/kr_mountman.svg rename to actions/22/kr_mountman.svg diff --git a/actions/22x22-light/kr_setjumpback.svg b/actions/22/kr_setjumpback.svg similarity index 100% rename from actions/22x22-light/kr_setjumpback.svg rename to actions/22/kr_setjumpback.svg diff --git a/actions/22x22-light/kr_syncbrowse_off.svg b/actions/22/kr_syncbrowse_off.svg similarity index 100% rename from actions/22x22-light/kr_syncbrowse_off.svg rename to actions/22/kr_syncbrowse_off.svg diff --git a/actions/22x22-light/kr_syncbrowse_on.svg b/actions/22/kr_syncbrowse_on.svg similarity index 100% rename from actions/22x22-light/kr_syncbrowse_on.svg rename to actions/22/kr_syncbrowse_on.svg diff --git a/actions/22x22-light/kr_unselect.svg b/actions/22/kr_unselect.svg similarity index 100% rename from actions/22x22-light/kr_unselect.svg rename to actions/22/kr_unselect.svg diff --git a/actions/22x22-light/kt-add-feeds.svg b/actions/22/kt-add-feeds.svg similarity index 100% rename from actions/22x22-light/kt-add-feeds.svg rename to actions/22/kt-add-feeds.svg diff --git a/actions/22x22-light/kt-add-filters.svg b/actions/22/kt-add-filters.svg similarity index 100% rename from actions/22x22-light/kt-add-filters.svg rename to actions/22/kt-add-filters.svg diff --git a/actions/22x22-light/kt-bandwidth-scheduler.svg b/actions/22/kt-bandwidth-scheduler.svg similarity index 100% rename from actions/22x22-light/kt-bandwidth-scheduler.svg rename to actions/22/kt-bandwidth-scheduler.svg diff --git a/actions/22x22-light/kt-change-tracker.svg b/actions/22/kt-change-tracker.svg similarity index 100% rename from actions/22x22-light/kt-change-tracker.svg rename to actions/22/kt-change-tracker.svg diff --git a/actions/22x22-light/kt-check-data.svg b/actions/22/kt-check-data.svg similarity index 100% rename from actions/22x22-light/kt-check-data.svg rename to actions/22/kt-check-data.svg diff --git a/actions/22x22-light/kt-chunks.svg b/actions/22/kt-chunks.svg similarity index 100% rename from actions/22x22-light/kt-chunks.svg rename to actions/22/kt-chunks.svg diff --git a/actions/22x22-light/kt-encrypted.svg b/actions/22/kt-encrypted.svg similarity index 100% rename from actions/22x22-light/kt-encrypted.svg rename to actions/22/kt-encrypted.svg diff --git a/actions/22x22-light/kt-info-widget.svg b/actions/22/kt-info-widget.svg similarity index 100% rename from actions/22x22-light/kt-info-widget.svg rename to actions/22/kt-info-widget.svg diff --git a/actions/22x22-light/kt-magnet.svg b/actions/22/kt-magnet.svg similarity index 100% rename from actions/22x22-light/kt-magnet.svg rename to actions/22/kt-magnet.svg diff --git a/actions/22x22-light/kt-pause.svg b/actions/22/kt-pause.svg similarity index 100% rename from actions/22x22-light/kt-pause.svg rename to actions/22/kt-pause.svg diff --git a/actions/22x22-light/kt-plugins.svg b/actions/22/kt-plugins.svg similarity index 100% rename from actions/22x22-light/kt-plugins.svg rename to actions/22/kt-plugins.svg diff --git a/actions/22x22-light/kt-queue-manager.svg b/actions/22/kt-queue-manager.svg similarity index 100% rename from actions/22x22-light/kt-queue-manager.svg rename to actions/22/kt-queue-manager.svg diff --git a/actions/22x22-light/kt-remove-feeds.svg b/actions/22/kt-remove-feeds.svg similarity index 100% rename from actions/22x22-light/kt-remove-feeds.svg rename to actions/22/kt-remove-feeds.svg diff --git a/actions/22x22-light/kt-remove-filters.svg b/actions/22/kt-remove-filters.svg similarity index 100% rename from actions/22x22-light/kt-remove-filters.svg rename to actions/22/kt-remove-filters.svg diff --git a/actions/22x22-light/kt-remove.svg b/actions/22/kt-remove.svg similarity index 100% rename from actions/22x22-light/kt-remove.svg rename to actions/22/kt-remove.svg diff --git a/actions/22x22-light/kt-restore-defaults.svg b/actions/22/kt-restore-defaults.svg similarity index 100% rename from actions/22x22-light/kt-restore-defaults.svg rename to actions/22/kt-restore-defaults.svg diff --git a/actions/22x22-light/kt-set-max-download-speed.svg b/actions/22/kt-set-max-download-speed.svg similarity index 100% rename from actions/22x22-light/kt-set-max-download-speed.svg rename to actions/22/kt-set-max-download-speed.svg diff --git a/actions/22x22-light/kt-set-max-upload-speed.svg b/actions/22/kt-set-max-upload-speed.svg similarity index 100% rename from actions/22x22-light/kt-set-max-upload-speed.svg rename to actions/22/kt-set-max-upload-speed.svg diff --git a/actions/22x22-light/kt-show-statusbar.svg b/actions/22/kt-show-statusbar.svg similarity index 100% rename from actions/22x22-light/kt-show-statusbar.svg rename to actions/22/kt-show-statusbar.svg diff --git a/actions/22x22-light/kt-speed-limits.svg b/actions/22/kt-speed-limits.svg similarity index 100% rename from actions/22x22-light/kt-speed-limits.svg rename to actions/22/kt-speed-limits.svg diff --git a/actions/22x22-light/kt-start-all.svg b/actions/22/kt-start-all.svg similarity index 100% rename from actions/22x22-light/kt-start-all.svg rename to actions/22/kt-start-all.svg diff --git a/actions/22x22-light/kt-start.svg b/actions/22/kt-start.svg similarity index 100% rename from actions/22x22-light/kt-start.svg rename to actions/22/kt-start.svg diff --git a/actions/22x22-light/kt-stop-all.svg b/actions/22/kt-stop-all.svg similarity index 100% rename from actions/22x22-light/kt-stop-all.svg rename to actions/22/kt-stop-all.svg diff --git a/actions/22x22-light/kt-stop.svg b/actions/22/kt-stop.svg similarity index 100% rename from actions/22x22-light/kt-stop.svg rename to actions/22/kt-stop.svg diff --git a/actions/22x22-light/ktnef_extract_to.svg b/actions/22/ktnef_extract_to.svg similarity index 100% rename from actions/22x22-light/ktnef_extract_to.svg rename to actions/22/ktnef_extract_to.svg diff --git a/actions/22x22-light/label-amarok.svg b/actions/22/label-amarok.svg similarity index 100% rename from actions/22x22-light/label-amarok.svg rename to actions/22/label-amarok.svg diff --git a/actions/22x22-light/labplot-TeX-logo.svg b/actions/22/labplot-TeX-logo.svg similarity index 100% rename from actions/22x22-light/labplot-TeX-logo.svg rename to actions/22/labplot-TeX-logo.svg diff --git a/actions/22x22-light/labplot-axis-horizontal.svg b/actions/22/labplot-axis-horizontal.svg similarity index 100% rename from actions/22x22-light/labplot-axis-horizontal.svg rename to actions/22/labplot-axis-horizontal.svg diff --git a/actions/22x22-light/labplot-axis-vertical.svg b/actions/22/labplot-axis-vertical.svg similarity index 100% rename from actions/22x22-light/labplot-axis-vertical.svg rename to actions/22/labplot-axis-vertical.svg diff --git a/actions/22x22-light/labplot-shift-down-y.svg b/actions/22/labplot-shift-down-y.svg similarity index 100% rename from actions/22x22-light/labplot-shift-down-y.svg rename to actions/22/labplot-shift-down-y.svg diff --git a/actions/22x22-light/labplot-shift-left-x.svg b/actions/22/labplot-shift-left-x.svg similarity index 100% rename from actions/22x22-light/labplot-shift-left-x.svg rename to actions/22/labplot-shift-left-x.svg diff --git a/actions/22x22-light/labplot-shift-right-x.svg b/actions/22/labplot-shift-right-x.svg similarity index 100% rename from actions/22x22-light/labplot-shift-right-x.svg rename to actions/22/labplot-shift-right-x.svg diff --git a/actions/22x22-light/labplot-shift-up-y.svg b/actions/22/labplot-shift-up-y.svg similarity index 100% rename from actions/22x22-light/labplot-shift-up-y.svg rename to actions/22/labplot-shift-up-y.svg diff --git a/actions/22x22-light/labplot-xy-equation-curve.svg b/actions/22/labplot-xy-equation-curve.svg similarity index 100% rename from actions/22x22-light/labplot-xy-equation-curve.svg rename to actions/22/labplot-xy-equation-curve.svg diff --git a/actions/22x22-light/labplot-xy-fit-curve.svg b/actions/22/labplot-xy-fit-curve.svg similarity index 100% rename from actions/22x22-light/labplot-xy-fit-curve.svg rename to actions/22/labplot-xy-fit-curve.svg diff --git a/actions/22x22-light/layer-bottom.svg b/actions/22/layer-bottom.svg similarity index 100% rename from actions/22x22-light/layer-bottom.svg rename to actions/22/layer-bottom.svg diff --git a/actions/22x22-light/layer-delete.svg b/actions/22/layer-delete.svg similarity index 100% rename from actions/22x22-light/layer-delete.svg rename to actions/22/layer-delete.svg diff --git a/actions/22x22-light/layer-duplicate.svg b/actions/22/layer-duplicate.svg similarity index 100% rename from actions/22x22-light/layer-duplicate.svg rename to actions/22/layer-duplicate.svg diff --git a/actions/22x22-light/layer-lower.svg b/actions/22/layer-lower.svg similarity index 100% rename from actions/22x22-light/layer-lower.svg rename to actions/22/layer-lower.svg diff --git a/actions/22x22-light/layer-new.svg b/actions/22/layer-new.svg similarity index 100% rename from actions/22x22-light/layer-new.svg rename to actions/22/layer-new.svg diff --git a/actions/22x22-light/layer-next.svg b/actions/22/layer-next.svg similarity index 100% rename from actions/22x22-light/layer-next.svg rename to actions/22/layer-next.svg diff --git a/actions/22x22-light/layer-previous.svg b/actions/22/layer-previous.svg similarity index 100% rename from actions/22x22-light/layer-previous.svg rename to actions/22/layer-previous.svg diff --git a/actions/22x22-light/layer-raise.svg b/actions/22/layer-raise.svg similarity index 100% rename from actions/22x22-light/layer-raise.svg rename to actions/22/layer-raise.svg diff --git a/actions/22x22-light/layer-rename.svg b/actions/22/layer-rename.svg similarity index 100% rename from actions/22x22-light/layer-rename.svg rename to actions/22/layer-rename.svg diff --git a/actions/22x22-light/layer-top.svg b/actions/22/layer-top.svg similarity index 100% rename from actions/22x22-light/layer-top.svg rename to actions/22/layer-top.svg diff --git a/actions/22x22-light/layer-visible-off.svg b/actions/22/layer-visible-off.svg similarity index 100% rename from actions/22x22-light/layer-visible-off.svg rename to actions/22/layer-visible-off.svg diff --git a/actions/22x22-light/layer-visible-on.svg b/actions/22/layer-visible-on.svg similarity index 100% rename from actions/22x22-light/layer-visible-on.svg rename to actions/22/layer-visible-on.svg diff --git a/actions/22x22-light/lensautofix.svg b/actions/22/lensautofix.svg similarity index 100% rename from actions/22x22-light/lensautofix.svg rename to actions/22/lensautofix.svg diff --git a/actions/22x22-light/lensdistortion.svg b/actions/22/lensdistortion.svg similarity index 100% rename from actions/22x22-light/lensdistortion.svg rename to actions/22/lensdistortion.svg diff --git a/actions/22x22-light/lighttable.svg b/actions/22/lighttable.svg similarity index 100% rename from actions/22x22-light/lighttable.svg rename to actions/22/lighttable.svg diff --git a/actions/22x22-light/lighttableadd.svg b/actions/22/lighttableadd.svg similarity index 100% rename from actions/22x22-light/lighttableadd.svg rename to actions/22/lighttableadd.svg diff --git a/actions/22x22-light/lines-connector.svg b/actions/22/lines-connector.svg similarity index 100% rename from actions/22x22-light/lines-connector.svg rename to actions/22/lines-connector.svg diff --git a/actions/22x22-light/list-add-font.svg b/actions/22/list-add-font.svg similarity index 100% rename from actions/22x22-light/list-add-font.svg rename to actions/22/list-add-font.svg diff --git a/actions/22x22-light/list-add-user.svg b/actions/22/list-add-user.svg similarity index 100% rename from actions/22x22-light/list-add-user.svg rename to actions/22/list-add-user.svg diff --git a/actions/22x22-light/list-add.svg b/actions/22/list-add.svg similarity index 100% rename from actions/22x22-light/list-add.svg rename to actions/22/list-add.svg diff --git a/actions/22x22-light/list-remove-user.svg b/actions/22/list-remove-user.svg similarity index 100% rename from actions/22x22-light/list-remove-user.svg rename to actions/22/list-remove-user.svg diff --git a/actions/22x22-light/list-remove.svg b/actions/22/list-remove.svg similarity index 100% rename from actions/22x22-light/list-remove.svg rename to actions/22/list-remove.svg diff --git a/actions/22x22-light/list-resource-add.svg b/actions/22/list-resource-add.svg similarity index 100% rename from actions/22x22-light/list-resource-add.svg rename to actions/22/list-resource-add.svg diff --git a/actions/22x22-light/locationbar-erase.svg b/actions/22/locationbar-erase.svg similarity index 100% rename from actions/22x22-light/locationbar-erase.svg rename to actions/22/locationbar-erase.svg diff --git a/actions/22x22-light/lock-insecure.svg b/actions/22/lock-insecure.svg similarity index 100% rename from actions/22x22-light/lock-insecure.svg rename to actions/22/lock-insecure.svg diff --git a/actions/22x22-light/lock-secure.svg b/actions/22/lock-secure.svg similarity index 100% rename from actions/22x22-light/lock-secure.svg rename to actions/22/lock-secure.svg diff --git a/actions/22x22-light/lock.svg b/actions/22/lock.svg similarity index 100% rename from actions/22x22-light/lock.svg rename to actions/22/lock.svg diff --git a/actions/22x22-light/locked.svg b/actions/22/locked.svg similarity index 100% rename from actions/22x22-light/locked.svg rename to actions/22/locked.svg diff --git a/actions/22x22-light/love-amarok.svg b/actions/22/love-amarok.svg similarity index 100% rename from actions/22x22-light/love-amarok.svg rename to actions/22/love-amarok.svg diff --git a/actions/22x22-light/mail-attachment.svg b/actions/22/mail-attachment.svg similarity index 100% rename from actions/22x22-light/mail-attachment.svg rename to actions/22/mail-attachment.svg diff --git a/actions/22x22-light/mail-encrypted-full.svg b/actions/22/mail-encrypted-full.svg similarity index 100% rename from actions/22x22-light/mail-encrypted-full.svg rename to actions/22/mail-encrypted-full.svg diff --git a/actions/22x22-light/mail-encrypted-part.svg b/actions/22/mail-encrypted-part.svg similarity index 100% rename from actions/22x22-light/mail-encrypted-part.svg rename to actions/22/mail-encrypted-part.svg diff --git a/actions/22x22-light/mail-encrypted.svg b/actions/22/mail-encrypted.svg similarity index 100% rename from actions/22x22-light/mail-encrypted.svg rename to actions/22/mail-encrypted.svg diff --git a/actions/22x22-light/mail-encrytped-full.svg b/actions/22/mail-encrytped-full.svg similarity index 100% rename from actions/22x22-light/mail-encrytped-full.svg rename to actions/22/mail-encrytped-full.svg diff --git a/actions/22x22-light/mail-encrytped-part.svg b/actions/22/mail-encrytped-part.svg similarity index 100% rename from actions/22x22-light/mail-encrytped-part.svg rename to actions/22/mail-encrytped-part.svg diff --git a/actions/22x22-light/mail-encrytped.svg b/actions/22/mail-encrytped.svg similarity index 100% rename from actions/22x22-light/mail-encrytped.svg rename to actions/22/mail-encrytped.svg diff --git a/actions/22x22-light/mail-flag.svg b/actions/22/mail-flag.svg similarity index 100% rename from actions/22x22-light/mail-flag.svg rename to actions/22/mail-flag.svg diff --git a/actions/22x22-light/mail-folder-sent.svg b/actions/22/mail-folder-sent.svg similarity index 100% rename from actions/22x22-light/mail-folder-sent.svg rename to actions/22/mail-folder-sent.svg diff --git a/actions/22x22-light/mail-forward.svg b/actions/22/mail-forward.svg similarity index 100% rename from actions/22x22-light/mail-forward.svg rename to actions/22/mail-forward.svg diff --git a/actions/22x22-light/mail-forwarded-replied.svg b/actions/22/mail-forwarded-replied.svg similarity index 100% rename from actions/22x22-light/mail-forwarded-replied.svg rename to actions/22/mail-forwarded-replied.svg diff --git a/actions/22x22-light/mail-forwarded.svg b/actions/22/mail-forwarded.svg similarity index 100% rename from actions/22x22-light/mail-forwarded.svg rename to actions/22/mail-forwarded.svg diff --git a/actions/22x22-light/mail-invitation.svg b/actions/22/mail-invitation.svg similarity index 100% rename from actions/22x22-light/mail-invitation.svg rename to actions/22/mail-invitation.svg diff --git a/actions/22x22-light/mail-mark-important.svg b/actions/22/mail-mark-important.svg similarity index 100% rename from actions/22x22-light/mail-mark-important.svg rename to actions/22/mail-mark-important.svg diff --git a/actions/22x22-light/mail-mark-junk.svg b/actions/22/mail-mark-junk.svg similarity index 100% rename from actions/22x22-light/mail-mark-junk.svg rename to actions/22/mail-mark-junk.svg diff --git a/actions/22x22-light/mail-mark-not-junk.svg b/actions/22/mail-mark-not-junk.svg similarity index 100% rename from actions/22x22-light/mail-mark-not-junk.svg rename to actions/22/mail-mark-not-junk.svg diff --git a/actions/22x22-light/mail-mark-notjunk.svg b/actions/22/mail-mark-notjunk.svg similarity index 100% rename from actions/22x22-light/mail-mark-notjunk.svg rename to actions/22/mail-mark-notjunk.svg diff --git a/actions/22x22-light/mail-mark-read.svg b/actions/22/mail-mark-read.svg similarity index 100% rename from actions/22x22-light/mail-mark-read.svg rename to actions/22/mail-mark-read.svg diff --git a/actions/22x22-light/mail-mark-task.svg b/actions/22/mail-mark-task.svg similarity index 100% rename from actions/22x22-light/mail-mark-task.svg rename to actions/22/mail-mark-task.svg diff --git a/actions/22x22-light/mail-mark-unread-new.svg b/actions/22/mail-mark-unread-new.svg similarity index 100% rename from actions/22x22-light/mail-mark-unread-new.svg rename to actions/22/mail-mark-unread-new.svg diff --git a/actions/22x22-light/mail-mark-unread.svg b/actions/22/mail-mark-unread.svg similarity index 100% rename from actions/22x22-light/mail-mark-unread.svg rename to actions/22/mail-mark-unread.svg diff --git a/actions/22x22-light/mail-meeting-request-reply.svg b/actions/22/mail-meeting-request-reply.svg similarity index 100% rename from actions/22x22-light/mail-meeting-request-reply.svg rename to actions/22/mail-meeting-request-reply.svg diff --git a/actions/22x22-light/mail-message-new-list.svg b/actions/22/mail-message-new-list.svg similarity index 100% rename from actions/22x22-light/mail-message-new-list.svg rename to actions/22/mail-message-new-list.svg diff --git a/actions/22x22-light/mail-message-new.svg b/actions/22/mail-message-new.svg similarity index 100% rename from actions/22x22-light/mail-message-new.svg rename to actions/22/mail-message-new.svg diff --git a/actions/22x22-light/mail-new.svg b/actions/22/mail-new.svg similarity index 100% rename from actions/22x22-light/mail-new.svg rename to actions/22/mail-new.svg diff --git a/actions/22x22-light/mail-queue.svg b/actions/22/mail-queue.svg similarity index 100% rename from actions/22x22-light/mail-queue.svg rename to actions/22/mail-queue.svg diff --git a/actions/22x22-light/mail-receive.svg b/actions/22/mail-receive.svg similarity index 100% rename from actions/22x22-light/mail-receive.svg rename to actions/22/mail-receive.svg diff --git a/actions/22x22-light/mail-replied.svg b/actions/22/mail-replied.svg similarity index 100% rename from actions/22x22-light/mail-replied.svg rename to actions/22/mail-replied.svg diff --git a/actions/22x22-light/mail-reply-all.svg b/actions/22/mail-reply-all.svg similarity index 100% rename from actions/22x22-light/mail-reply-all.svg rename to actions/22/mail-reply-all.svg diff --git a/actions/22x22-light/mail-reply-custom-all.svg b/actions/22/mail-reply-custom-all.svg similarity index 100% rename from actions/22x22-light/mail-reply-custom-all.svg rename to actions/22/mail-reply-custom-all.svg diff --git a/actions/22x22-light/mail-reply-custom.svg b/actions/22/mail-reply-custom.svg similarity index 100% rename from actions/22x22-light/mail-reply-custom.svg rename to actions/22/mail-reply-custom.svg diff --git a/actions/22x22-light/mail-reply-list.svg b/actions/22/mail-reply-list.svg similarity index 100% rename from actions/22x22-light/mail-reply-list.svg rename to actions/22/mail-reply-list.svg diff --git a/actions/22x22-light/mail-reply-sender.svg b/actions/22/mail-reply-sender.svg similarity index 100% rename from actions/22x22-light/mail-reply-sender.svg rename to actions/22/mail-reply-sender.svg diff --git a/actions/22x22-light/mail-reply.svg b/actions/22/mail-reply.svg similarity index 100% rename from actions/22x22-light/mail-reply.svg rename to actions/22/mail-reply.svg diff --git a/actions/22x22-light/mail-send-receive.svg b/actions/22/mail-send-receive.svg similarity index 100% rename from actions/22x22-light/mail-send-receive.svg rename to actions/22/mail-send-receive.svg diff --git a/actions/22x22-light/mail-send.svg b/actions/22/mail-send.svg similarity index 100% rename from actions/22x22-light/mail-send.svg rename to actions/22/mail-send.svg diff --git a/actions/22x22-light/mail-sent.svg b/actions/22/mail-sent.svg similarity index 100% rename from actions/22x22-light/mail-sent.svg rename to actions/22/mail-sent.svg diff --git a/actions/22x22-light/mail-signature-unknown.svg b/actions/22/mail-signature-unknown.svg similarity index 100% rename from actions/22x22-light/mail-signature-unknown.svg rename to actions/22/mail-signature-unknown.svg diff --git a/actions/22x22-light/mail-signed-full.svg b/actions/22/mail-signed-full.svg similarity index 100% rename from actions/22x22-light/mail-signed-full.svg rename to actions/22/mail-signed-full.svg diff --git a/actions/22x22-light/mail-signed-fully.svg b/actions/22/mail-signed-fully.svg similarity index 100% rename from actions/22x22-light/mail-signed-fully.svg rename to actions/22/mail-signed-fully.svg diff --git a/actions/22x22-light/mail-signed-part.svg b/actions/22/mail-signed-part.svg similarity index 100% rename from actions/22x22-light/mail-signed-part.svg rename to actions/22/mail-signed-part.svg diff --git a/actions/22x22-light/mail-signed-verified.svg b/actions/22/mail-signed-verified.svg similarity index 100% rename from actions/22x22-light/mail-signed-verified.svg rename to actions/22/mail-signed-verified.svg diff --git a/actions/22x22-light/mail-signed.svg b/actions/22/mail-signed.svg similarity index 100% rename from actions/22x22-light/mail-signed.svg rename to actions/22/mail-signed.svg diff --git a/actions/22x22-light/mail-tagged.svg b/actions/22/mail-tagged.svg similarity index 100% rename from actions/22x22-light/mail-tagged.svg rename to actions/22/mail-tagged.svg diff --git a/actions/22x22-light/mail-unread.svg b/actions/22/mail-unread.svg similarity index 100% rename from actions/22x22-light/mail-unread.svg rename to actions/22/mail-unread.svg diff --git a/actions/22x22-light/mail_forward.svg b/actions/22/mail_forward.svg similarity index 100% rename from actions/22x22-light/mail_forward.svg rename to actions/22/mail_forward.svg diff --git a/actions/22x22-light/mail_new.svg b/actions/22/mail_new.svg similarity index 100% rename from actions/22x22-light/mail_new.svg rename to actions/22/mail_new.svg diff --git a/actions/22x22-light/mail_reply.svg b/actions/22/mail_reply.svg similarity index 100% rename from actions/22x22-light/mail_reply.svg rename to actions/22/mail_reply.svg diff --git a/actions/22x22-light/mail_replyall.svg b/actions/22/mail_replyall.svg similarity index 100% rename from actions/22x22-light/mail_replyall.svg rename to actions/22/mail_replyall.svg diff --git a/actions/22x22-light/mail_send.svg b/actions/22/mail_send.svg similarity index 100% rename from actions/22x22-light/mail_send.svg rename to actions/22/mail_send.svg diff --git a/actions/22x22-light/mark-location.svg b/actions/22/mark-location.svg similarity index 100% rename from actions/22x22-light/mark-location.svg rename to actions/22/mark-location.svg diff --git a/actions/22x22-light/measure.svg b/actions/22/measure.svg similarity index 100% rename from actions/22x22-light/measure.svg rename to actions/22/measure.svg diff --git a/actions/22x22-light/media-album-cover-manager-amarok.svg b/actions/22/media-album-cover-manager-amarok.svg similarity index 100% rename from actions/22x22-light/media-album-cover-manager-amarok.svg rename to actions/22/media-album-cover-manager-amarok.svg diff --git a/actions/22x22-light/media-album-cover.svg b/actions/22/media-album-cover.svg similarity index 100% rename from actions/22x22-light/media-album-cover.svg rename to actions/22/media-album-cover.svg diff --git a/actions/22x22-light/media-album-repeat-amarok.svg b/actions/22/media-album-repeat-amarok.svg similarity index 100% rename from actions/22x22-light/media-album-repeat-amarok.svg rename to actions/22/media-album-repeat-amarok.svg diff --git a/actions/22x22-light/media-album-track.svg b/actions/22/media-album-track.svg similarity index 100% rename from actions/22x22-light/media-album-track.svg rename to actions/22/media-album-track.svg diff --git a/actions/22x22-light/media-eject.svg b/actions/22/media-eject.svg similarity index 100% rename from actions/22x22-light/media-eject.svg rename to actions/22/media-eject.svg diff --git a/actions/22x22-light/media-import-audio-cd.svg b/actions/22/media-import-audio-cd.svg similarity index 100% rename from actions/22x22-light/media-import-audio-cd.svg rename to actions/22/media-import-audio-cd.svg diff --git a/actions/22x22-light/media-optical-audio-new.svg b/actions/22/media-optical-audio-new.svg similarity index 100% rename from actions/22x22-light/media-optical-audio-new.svg rename to actions/22/media-optical-audio-new.svg diff --git a/actions/22x22-light/media-optical-blank-symbolic.svg b/actions/22/media-optical-blank-symbolic.svg similarity index 100% rename from actions/22x22-light/media-optical-blank-symbolic.svg rename to actions/22/media-optical-blank-symbolic.svg diff --git a/actions/22x22-light/media-optical-burn.svg b/actions/22/media-optical-burn.svg similarity index 100% rename from actions/22x22-light/media-optical-burn.svg rename to actions/22/media-optical-burn.svg diff --git a/actions/22x22-light/media-optical-copy.svg b/actions/22/media-optical-copy.svg similarity index 100% rename from actions/22x22-light/media-optical-copy.svg rename to actions/22/media-optical-copy.svg diff --git a/actions/22x22-light/media-optical-data-new.svg b/actions/22/media-optical-data-new.svg similarity index 100% rename from actions/22x22-light/media-optical-data-new.svg rename to actions/22/media-optical-data-new.svg diff --git a/actions/22x22-light/media-optical-video-new.svg b/actions/22/media-optical-video-new.svg similarity index 100% rename from actions/22x22-light/media-optical-video-new.svg rename to actions/22/media-optical-video-new.svg diff --git a/actions/22x22-light/media-playback-pause.svg b/actions/22/media-playback-pause.svg similarity index 100% rename from actions/22x22-light/media-playback-pause.svg rename to actions/22/media-playback-pause.svg diff --git a/actions/22x22-light/media-playback-play-pause.svg b/actions/22/media-playback-play-pause.svg similarity index 100% rename from actions/22x22-light/media-playback-play-pause.svg rename to actions/22/media-playback-play-pause.svg diff --git a/actions/22x22-light/media-playback-start.svg b/actions/22/media-playback-start.svg similarity index 100% rename from actions/22x22-light/media-playback-start.svg rename to actions/22/media-playback-start.svg diff --git a/actions/22x22-light/media-playback-stop.svg b/actions/22/media-playback-stop.svg similarity index 100% rename from actions/22x22-light/media-playback-stop.svg rename to actions/22/media-playback-stop.svg diff --git a/actions/22x22-light/media-playlist-no-repeat.svg b/actions/22/media-playlist-no-repeat.svg similarity index 100% rename from actions/22x22-light/media-playlist-no-repeat.svg rename to actions/22/media-playlist-no-repeat.svg diff --git a/actions/22x22-light/media-playlist-repeat-amarok.svg b/actions/22/media-playlist-repeat-amarok.svg similarity index 100% rename from actions/22x22-light/media-playlist-repeat-amarok.svg rename to actions/22/media-playlist-repeat-amarok.svg diff --git a/actions/22x22-light/media-playlist-repeat-once.svg b/actions/22/media-playlist-repeat-once.svg similarity index 100% rename from actions/22x22-light/media-playlist-repeat-once.svg rename to actions/22/media-playlist-repeat-once.svg diff --git a/actions/22x22-light/media-playlist-repeat-one.svg b/actions/22/media-playlist-repeat-one.svg similarity index 100% rename from actions/22x22-light/media-playlist-repeat-one.svg rename to actions/22/media-playlist-repeat-one.svg diff --git a/actions/22x22-light/media-playlist-repeat-song.svg b/actions/22/media-playlist-repeat-song.svg similarity index 100% rename from actions/22x22-light/media-playlist-repeat-song.svg rename to actions/22/media-playlist-repeat-song.svg diff --git a/actions/22x22-light/media-playlist-repeat.svg b/actions/22/media-playlist-repeat.svg similarity index 100% rename from actions/22x22-light/media-playlist-repeat.svg rename to actions/22/media-playlist-repeat.svg diff --git a/actions/22x22-light/media-playlist-shuffle.svg b/actions/22/media-playlist-shuffle.svg similarity index 100% rename from actions/22x22-light/media-playlist-shuffle.svg rename to actions/22/media-playlist-shuffle.svg diff --git a/actions/22x22-light/media-random-albums-amarok.svg b/actions/22/media-random-albums-amarok.svg similarity index 100% rename from actions/22x22-light/media-random-albums-amarok.svg rename to actions/22/media-random-albums-amarok.svg diff --git a/actions/22x22-light/media-random-tracks-amarok.svg b/actions/22/media-random-tracks-amarok.svg similarity index 100% rename from actions/22x22-light/media-random-tracks-amarok.svg rename to actions/22/media-random-tracks-amarok.svg diff --git a/actions/22x22-light/media-record.svg b/actions/22/media-record.svg similarity index 100% rename from actions/22x22-light/media-record.svg rename to actions/22/media-record.svg diff --git a/actions/22x22-light/media-repeat-album-amarok.svg b/actions/22/media-repeat-album-amarok.svg similarity index 100% rename from actions/22x22-light/media-repeat-album-amarok.svg rename to actions/22/media-repeat-album-amarok.svg diff --git a/actions/22x22-light/media-repeat-playlist-amarok.svg b/actions/22/media-repeat-playlist-amarok.svg similarity index 100% rename from actions/22x22-light/media-repeat-playlist-amarok.svg rename to actions/22/media-repeat-playlist-amarok.svg diff --git a/actions/22x22-light/media-repeat-track-amarok.svg b/actions/22/media-repeat-track-amarok.svg similarity index 100% rename from actions/22x22-light/media-repeat-track-amarok.svg rename to actions/22/media-repeat-track-amarok.svg diff --git a/actions/22x22-light/media-seek-backward.svg b/actions/22/media-seek-backward.svg similarity index 100% rename from actions/22x22-light/media-seek-backward.svg rename to actions/22/media-seek-backward.svg diff --git a/actions/22x22-light/media-seek-forward.svg b/actions/22/media-seek-forward.svg similarity index 100% rename from actions/22x22-light/media-seek-forward.svg rename to actions/22/media-seek-forward.svg diff --git a/actions/22x22-light/media-show-active-track-amarok.svg b/actions/22/media-show-active-track-amarok.svg similarity index 100% rename from actions/22x22-light/media-show-active-track-amarok.svg rename to actions/22/media-show-active-track-amarok.svg diff --git a/actions/22x22-light/media-skip-backward.svg b/actions/22/media-skip-backward.svg similarity index 100% rename from actions/22x22-light/media-skip-backward.svg rename to actions/22/media-skip-backward.svg diff --git a/actions/22x22-light/media-skip-forward.svg b/actions/22/media-skip-forward.svg similarity index 100% rename from actions/22x22-light/media-skip-forward.svg rename to actions/22/media-skip-forward.svg diff --git a/actions/22x22-light/media-standard-track-progression-amarok.svg b/actions/22/media-standard-track-progression-amarok.svg similarity index 100% rename from actions/22x22-light/media-standard-track-progression-amarok.svg rename to actions/22/media-standard-track-progression-amarok.svg diff --git a/actions/22x22-light/media-track-add-amarok.svg b/actions/22/media-track-add-amarok.svg similarity index 100% rename from actions/22x22-light/media-track-add-amarok.svg rename to actions/22/media-track-add-amarok.svg diff --git a/actions/22x22-light/media-track-edit-amarok.svg b/actions/22/media-track-edit-amarok.svg similarity index 100% rename from actions/22x22-light/media-track-edit-amarok.svg rename to actions/22/media-track-edit-amarok.svg diff --git a/actions/22x22-light/media-track-queue-amarok.svg b/actions/22/media-track-queue-amarok.svg similarity index 100% rename from actions/22x22-light/media-track-queue-amarok.svg rename to actions/22/media-track-queue-amarok.svg diff --git a/actions/22x22-light/media-track-remove-amarok.svg b/actions/22/media-track-remove-amarok.svg similarity index 100% rename from actions/22x22-light/media-track-remove-amarok.svg rename to actions/22/media-track-remove-amarok.svg diff --git a/actions/22x22-light/media-write-cd.svg b/actions/22/media-write-cd.svg similarity index 100% rename from actions/22x22-light/media-write-cd.svg rename to actions/22/media-write-cd.svg diff --git a/actions/22x22-light/meeting-attending-tentative.svg b/actions/22/meeting-attending-tentative.svg similarity index 100% rename from actions/22x22-light/meeting-attending-tentative.svg rename to actions/22/meeting-attending-tentative.svg diff --git a/actions/22x22-light/meeting-attending.svg b/actions/22/meeting-attending.svg similarity index 100% rename from actions/22x22-light/meeting-attending.svg rename to actions/22/meeting-attending.svg diff --git a/actions/22x22-light/meeting-participant-no-response.svg b/actions/22/meeting-participant-no-response.svg similarity index 100% rename from actions/22x22-light/meeting-participant-no-response.svg rename to actions/22/meeting-participant-no-response.svg diff --git a/actions/22x22-light/meeting-participant-request-response.svg b/actions/22/meeting-participant-request-response.svg similarity index 100% rename from actions/22x22-light/meeting-participant-request-response.svg rename to actions/22/meeting-participant-request-response.svg diff --git a/actions/22x22-light/menu_new.svg b/actions/22/menu_new.svg similarity index 100% rename from actions/22x22-light/menu_new.svg rename to actions/22/menu_new.svg diff --git a/actions/22x22-light/menu_new_sep.svg b/actions/22/menu_new_sep.svg similarity index 100% rename from actions/22x22-light/menu_new_sep.svg rename to actions/22/menu_new_sep.svg diff --git a/actions/22x22-light/merge.svg b/actions/22/merge.svg similarity index 100% rename from actions/22x22-light/merge.svg rename to actions/22/merge.svg diff --git a/actions/22x22-light/messagebox_warning.svg b/actions/22/messagebox_warning.svg similarity index 100% rename from actions/22x22-light/messagebox_warning.svg rename to actions/22/messagebox_warning.svg diff --git a/actions/22x22-light/mic-off.svg b/actions/22/mic-off.svg similarity index 100% rename from actions/22x22-light/mic-off.svg rename to actions/22/mic-off.svg diff --git a/actions/22x22-light/mic-on.svg b/actions/22/mic-on.svg similarity index 100% rename from actions/22x22-light/mic-on.svg rename to actions/22/mic-on.svg diff --git a/actions/22x22-light/mic-ready.svg b/actions/22/mic-ready.svg similarity index 100% rename from actions/22x22-light/mic-ready.svg rename to actions/22/mic-ready.svg diff --git a/actions/22x22-light/milestone.svg b/actions/22/milestone.svg similarity index 100% rename from actions/22x22-light/milestone.svg rename to actions/22/milestone.svg diff --git a/actions/22x22-light/mixer-digital.svg b/actions/22/mixer-digital.svg similarity index 100% rename from actions/22x22-light/mixer-digital.svg rename to actions/22/mixer-digital.svg diff --git a/actions/22x22-light/mixer-line.svg b/actions/22/mixer-line.svg similarity index 100% rename from actions/22x22-light/mixer-line.svg rename to actions/22/mixer-line.svg diff --git a/actions/22x22-light/music-amarok.svg b/actions/22/music-amarok.svg similarity index 100% rename from actions/22x22-light/music-amarok.svg rename to actions/22/music-amarok.svg diff --git a/actions/22x22-light/music-library.svg b/actions/22/music-library.svg similarity index 100% rename from actions/22x22-light/music-library.svg rename to actions/22/music-library.svg diff --git a/actions/22x22-light/nemo-eject.svg b/actions/22/nemo-eject.svg similarity index 100% rename from actions/22x22-light/nemo-eject.svg rename to actions/22/nemo-eject.svg diff --git a/actions/22x22-light/network-connect.svg b/actions/22/network-connect.svg similarity index 100% rename from actions/22x22-light/network-connect.svg rename to actions/22/network-connect.svg diff --git a/actions/22x22-light/network-disconnect.svg b/actions/22/network-disconnect.svg similarity index 100% rename from actions/22x22-light/network-disconnect.svg rename to actions/22/network-disconnect.svg diff --git a/actions/22x22-light/new-audio-alarm.svg b/actions/22/new-audio-alarm.svg similarity index 100% rename from actions/22x22-light/new-audio-alarm.svg rename to actions/22/new-audio-alarm.svg diff --git a/actions/22x22-light/news-subscribe.svg b/actions/22/news-subscribe.svg similarity index 100% rename from actions/22x22-light/news-subscribe.svg rename to actions/22/news-subscribe.svg diff --git a/actions/22x22-light/news-unsubscribe.svg b/actions/22/news-unsubscribe.svg similarity index 100% rename from actions/22x22-light/news-unsubscribe.svg rename to actions/22/news-unsubscribe.svg diff --git a/actions/22x22-light/next.svg b/actions/22/next.svg similarity index 100% rename from actions/22x22-light/next.svg rename to actions/22/next.svg diff --git a/actions/22x22-light/nocover.svg b/actions/22/nocover.svg similarity index 100% rename from actions/22x22-light/nocover.svg rename to actions/22/nocover.svg diff --git a/actions/22x22-light/noisereduction.svg b/actions/22/noisereduction.svg similarity index 100% rename from actions/22x22-light/noisereduction.svg rename to actions/22/noisereduction.svg diff --git a/actions/22x22-light/notebook-new.svg b/actions/22/notebook-new.svg similarity index 100% rename from actions/22x22-light/notebook-new.svg rename to actions/22/notebook-new.svg diff --git a/actions/22x22-light/object-align-horizontal-center-calligra.svg b/actions/22/object-align-horizontal-center-calligra.svg similarity index 100% rename from actions/22x22-light/object-align-horizontal-center-calligra.svg rename to actions/22/object-align-horizontal-center-calligra.svg diff --git a/actions/22x22-light/object-align-horizontal-left-calligra.svg b/actions/22/object-align-horizontal-left-calligra.svg similarity index 100% rename from actions/22x22-light/object-align-horizontal-left-calligra.svg rename to actions/22/object-align-horizontal-left-calligra.svg diff --git a/actions/22x22-light/object-align-horizontal-right-calligra.svg b/actions/22/object-align-horizontal-right-calligra.svg similarity index 100% rename from actions/22x22-light/object-align-horizontal-right-calligra.svg rename to actions/22/object-align-horizontal-right-calligra.svg diff --git a/actions/22x22-light/object-align-vertical-bottom-calligra.svg b/actions/22/object-align-vertical-bottom-calligra.svg similarity index 100% rename from actions/22x22-light/object-align-vertical-bottom-calligra.svg rename to actions/22/object-align-vertical-bottom-calligra.svg diff --git a/actions/22x22-light/object-align-vertical-bottom-top-calligra.svg b/actions/22/object-align-vertical-bottom-top-calligra.svg similarity index 100% rename from actions/22x22-light/object-align-vertical-bottom-top-calligra.svg rename to actions/22/object-align-vertical-bottom-top-calligra.svg diff --git a/actions/22x22-light/object-align-vertical-center-calligra.svg b/actions/22/object-align-vertical-center-calligra.svg similarity index 100% rename from actions/22x22-light/object-align-vertical-center-calligra.svg rename to actions/22/object-align-vertical-center-calligra.svg diff --git a/actions/22x22-light/object-align-vertical-top-calligra.svg b/actions/22/object-align-vertical-top-calligra.svg similarity index 100% rename from actions/22x22-light/object-align-vertical-top-calligra.svg rename to actions/22/object-align-vertical-top-calligra.svg diff --git a/actions/22x22-light/object-flip-horizontal.svg b/actions/22/object-flip-horizontal.svg similarity index 100% rename from actions/22x22-light/object-flip-horizontal.svg rename to actions/22/object-flip-horizontal.svg diff --git a/actions/22x22-light/object-flip-vertical.svg b/actions/22/object-flip-vertical.svg similarity index 100% rename from actions/22x22-light/object-flip-vertical.svg rename to actions/22/object-flip-vertical.svg diff --git a/actions/22x22-light/object-group-calligra.svg b/actions/22/object-group-calligra.svg similarity index 100% rename from actions/22x22-light/object-group-calligra.svg rename to actions/22/object-group-calligra.svg diff --git a/actions/22x22-light/object-group.svg b/actions/22/object-group.svg similarity index 100% rename from actions/22x22-light/object-group.svg rename to actions/22/object-group.svg diff --git a/actions/22x22-light/object-hidden.svg b/actions/22/object-hidden.svg similarity index 100% rename from actions/22x22-light/object-hidden.svg rename to actions/22/object-hidden.svg diff --git a/actions/22x22-light/object-locked.svg b/actions/22/object-locked.svg similarity index 100% rename from actions/22x22-light/object-locked.svg rename to actions/22/object-locked.svg diff --git a/actions/22x22-light/object-order-back-calligra.svg b/actions/22/object-order-back-calligra.svg similarity index 100% rename from actions/22x22-light/object-order-back-calligra.svg rename to actions/22/object-order-back-calligra.svg diff --git a/actions/22x22-light/object-order-back.svg b/actions/22/object-order-back.svg similarity index 100% rename from actions/22x22-light/object-order-back.svg rename to actions/22/object-order-back.svg diff --git a/actions/22x22-light/object-order-front-calligra.svg b/actions/22/object-order-front-calligra.svg similarity index 100% rename from actions/22x22-light/object-order-front-calligra.svg rename to actions/22/object-order-front-calligra.svg diff --git a/actions/22x22-light/object-order-front.svg b/actions/22/object-order-front.svg similarity index 100% rename from actions/22x22-light/object-order-front.svg rename to actions/22/object-order-front.svg diff --git a/actions/22x22-light/object-order-lower-calligra.svg b/actions/22/object-order-lower-calligra.svg similarity index 100% rename from actions/22x22-light/object-order-lower-calligra.svg rename to actions/22/object-order-lower-calligra.svg diff --git a/actions/22x22-light/object-order-lower.svg b/actions/22/object-order-lower.svg similarity index 100% rename from actions/22x22-light/object-order-lower.svg rename to actions/22/object-order-lower.svg diff --git a/actions/22x22-light/object-order-raise-calligra.svg b/actions/22/object-order-raise-calligra.svg similarity index 100% rename from actions/22x22-light/object-order-raise-calligra.svg rename to actions/22/object-order-raise-calligra.svg diff --git a/actions/22x22-light/object-order-raise.svg b/actions/22/object-order-raise.svg similarity index 100% rename from actions/22x22-light/object-order-raise.svg rename to actions/22/object-order-raise.svg diff --git a/actions/22x22-light/object-rotate-left.svg b/actions/22/object-rotate-left.svg similarity index 100% rename from actions/22x22-light/object-rotate-left.svg rename to actions/22/object-rotate-left.svg diff --git a/actions/22x22-light/object-rotate-right.svg b/actions/22/object-rotate-right.svg similarity index 100% rename from actions/22x22-light/object-rotate-right.svg rename to actions/22/object-rotate-right.svg diff --git a/actions/22x22-light/object-ungroup-calligra.svg b/actions/22/object-ungroup-calligra.svg similarity index 100% rename from actions/22x22-light/object-ungroup-calligra.svg rename to actions/22/object-ungroup-calligra.svg diff --git a/actions/22x22-light/object-ungroup.svg b/actions/22/object-ungroup.svg similarity index 100% rename from actions/22x22-light/object-ungroup.svg rename to actions/22/object-ungroup.svg diff --git a/actions/22x22-light/object-unlocked.svg b/actions/22/object-unlocked.svg similarity index 100% rename from actions/22x22-light/object-unlocked.svg rename to actions/22/object-unlocked.svg diff --git a/actions/22x22-light/object-visible.svg b/actions/22/object-visible.svg similarity index 100% rename from actions/22x22-light/object-visible.svg rename to actions/22/object-visible.svg diff --git a/actions/22x22-light/office-chart-area-focus-peak-node.svg b/actions/22/office-chart-area-focus-peak-node.svg similarity index 100% rename from actions/22x22-light/office-chart-area-focus-peak-node.svg rename to actions/22/office-chart-area-focus-peak-node.svg diff --git a/actions/22x22-light/office-chart-area-percentage.svg b/actions/22/office-chart-area-percentage.svg similarity index 100% rename from actions/22x22-light/office-chart-area-percentage.svg rename to actions/22/office-chart-area-percentage.svg diff --git a/actions/22x22-light/office-chart-area-stacked.svg b/actions/22/office-chart-area-stacked.svg similarity index 100% rename from actions/22x22-light/office-chart-area-stacked.svg rename to actions/22/office-chart-area-stacked.svg diff --git a/actions/22x22-light/office-chart-area.svg b/actions/22/office-chart-area.svg similarity index 100% rename from actions/22x22-light/office-chart-area.svg rename to actions/22/office-chart-area.svg diff --git a/actions/22x22-light/office-chart-bar-percentage.svg b/actions/22/office-chart-bar-percentage.svg similarity index 100% rename from actions/22x22-light/office-chart-bar-percentage.svg rename to actions/22/office-chart-bar-percentage.svg diff --git a/actions/22x22-light/office-chart-bar-stacked.svg b/actions/22/office-chart-bar-stacked.svg similarity index 100% rename from actions/22x22-light/office-chart-bar-stacked.svg rename to actions/22/office-chart-bar-stacked.svg diff --git a/actions/22x22-light/office-chart-bar.svg b/actions/22/office-chart-bar.svg similarity index 100% rename from actions/22x22-light/office-chart-bar.svg rename to actions/22/office-chart-bar.svg diff --git a/actions/22x22-light/office-chart-line-percentage.svg b/actions/22/office-chart-line-percentage.svg similarity index 100% rename from actions/22x22-light/office-chart-line-percentage.svg rename to actions/22/office-chart-line-percentage.svg diff --git a/actions/22x22-light/office-chart-line-stacked.svg b/actions/22/office-chart-line-stacked.svg similarity index 100% rename from actions/22x22-light/office-chart-line-stacked.svg rename to actions/22/office-chart-line-stacked.svg diff --git a/actions/22x22-light/office-chart-line.svg b/actions/22/office-chart-line.svg similarity index 100% rename from actions/22x22-light/office-chart-line.svg rename to actions/22/office-chart-line.svg diff --git a/actions/22x22-light/office-chart-pie.svg b/actions/22/office-chart-pie.svg similarity index 100% rename from actions/22x22-light/office-chart-pie.svg rename to actions/22/office-chart-pie.svg diff --git a/actions/22x22-light/office-chart-polar-stacked.svg b/actions/22/office-chart-polar-stacked.svg similarity index 100% rename from actions/22x22-light/office-chart-polar-stacked.svg rename to actions/22/office-chart-polar-stacked.svg diff --git a/actions/22x22-light/office-chart-polar.svg b/actions/22/office-chart-polar.svg similarity index 100% rename from actions/22x22-light/office-chart-polar.svg rename to actions/22/office-chart-polar.svg diff --git a/actions/22x22-light/office-chart-ring.svg b/actions/22/office-chart-ring.svg similarity index 100% rename from actions/22x22-light/office-chart-ring.svg rename to actions/22/office-chart-ring.svg diff --git a/actions/22x22-light/office-chart-scatter.svg b/actions/22/office-chart-scatter.svg similarity index 100% rename from actions/22x22-light/office-chart-scatter.svg rename to actions/22/office-chart-scatter.svg diff --git a/actions/22x22-light/oilpaint.svg b/actions/22/oilpaint.svg similarity index 100% rename from actions/22x22-light/oilpaint.svg rename to actions/22/oilpaint.svg diff --git a/actions/22x22-light/ok.svg b/actions/22/ok.svg similarity index 100% rename from actions/22x22-light/ok.svg rename to actions/22/ok.svg diff --git a/actions/22x22-light/overexposure.svg b/actions/22/overexposure.svg similarity index 100% rename from actions/22x22-light/overexposure.svg rename to actions/22/overexposure.svg diff --git a/actions/22x22-light/page-2sides.svg b/actions/22/page-2sides.svg similarity index 100% rename from actions/22x22-light/page-2sides.svg rename to actions/22/page-2sides.svg diff --git a/actions/22x22-light/page-3sides.svg b/actions/22/page-3sides.svg similarity index 100% rename from actions/22x22-light/page-3sides.svg rename to actions/22/page-3sides.svg diff --git a/actions/22x22-light/page-4sides.svg b/actions/22/page-4sides.svg similarity index 100% rename from actions/22x22-light/page-4sides.svg rename to actions/22/page-4sides.svg diff --git a/actions/22x22-light/page-simple.svg b/actions/22/page-simple.svg similarity index 100% rename from actions/22x22-light/page-simple.svg rename to actions/22/page-simple.svg diff --git a/actions/22x22-light/page-zoom.svg b/actions/22/page-zoom.svg similarity index 100% rename from actions/22x22-light/page-zoom.svg rename to actions/22/page-zoom.svg diff --git a/actions/22x22-light/password-copy.svg b/actions/22/password-copy.svg similarity index 100% rename from actions/22x22-light/password-copy.svg rename to actions/22/password-copy.svg diff --git a/actions/22x22-light/path-break-apart.svg b/actions/22/path-break-apart.svg similarity index 100% rename from actions/22x22-light/path-break-apart.svg rename to actions/22/path-break-apart.svg diff --git a/actions/22x22-light/path-combine.svg b/actions/22/path-combine.svg similarity index 100% rename from actions/22x22-light/path-combine.svg rename to actions/22/path-combine.svg diff --git a/actions/22x22-light/path-cut.svg b/actions/22/path-cut.svg similarity index 100% rename from actions/22x22-light/path-cut.svg rename to actions/22/path-cut.svg diff --git a/actions/22x22-light/path-difference.svg b/actions/22/path-difference.svg similarity index 100% rename from actions/22x22-light/path-difference.svg rename to actions/22/path-difference.svg diff --git a/actions/22x22-light/path-division.svg b/actions/22/path-division.svg similarity index 100% rename from actions/22x22-light/path-division.svg rename to actions/22/path-division.svg diff --git a/actions/22x22-light/path-exclusion.svg b/actions/22/path-exclusion.svg similarity index 100% rename from actions/22x22-light/path-exclusion.svg rename to actions/22/path-exclusion.svg diff --git a/actions/22x22-light/path-intersection.svg b/actions/22/path-intersection.svg similarity index 100% rename from actions/22x22-light/path-intersection.svg rename to actions/22/path-intersection.svg diff --git a/actions/22x22-light/path-union.svg b/actions/22/path-union.svg similarity index 100% rename from actions/22x22-light/path-union.svg rename to actions/22/path-union.svg diff --git a/actions/22x22-light/pdf-annotations.svg b/actions/22/pdf-annotations.svg similarity index 100% rename from actions/22x22-light/pdf-annotations.svg rename to actions/22/pdf-annotations.svg diff --git a/actions/22x22-light/percent.svg b/actions/22/percent.svg similarity index 100% rename from actions/22x22-light/percent.svg rename to actions/22/percent.svg diff --git a/actions/22x22-light/perspective.svg b/actions/22/perspective.svg similarity index 100% rename from actions/22x22-light/perspective.svg rename to actions/22/perspective.svg diff --git a/actions/22x22-light/photos-amarok.svg b/actions/22/photos-amarok.svg similarity index 100% rename from actions/22x22-light/photos-amarok.svg rename to actions/22/photos-amarok.svg diff --git a/actions/22x22-light/pixelart-trace.svg b/actions/22/pixelart-trace.svg similarity index 100% rename from actions/22x22-light/pixelart-trace.svg rename to actions/22/pixelart-trace.svg diff --git a/actions/22x22-light/player-eject.svg b/actions/22/player-eject.svg similarity index 100% rename from actions/22x22-light/player-eject.svg rename to actions/22/player-eject.svg diff --git a/actions/22x22-light/player-end.svg b/actions/22/player-end.svg similarity index 100% rename from actions/22x22-light/player-end.svg rename to actions/22/player-end.svg diff --git a/actions/22x22-light/player-fwd.svg b/actions/22/player-fwd.svg similarity index 100% rename from actions/22x22-light/player-fwd.svg rename to actions/22/player-fwd.svg diff --git a/actions/22x22-light/player-new.svg b/actions/22/player-new.svg similarity index 100% rename from actions/22x22-light/player-new.svg rename to actions/22/player-new.svg diff --git a/actions/22x22-light/player-pause.svg b/actions/22/player-pause.svg similarity index 100% rename from actions/22x22-light/player-pause.svg rename to actions/22/player-pause.svg diff --git a/actions/22x22-light/player-play.svg b/actions/22/player-play.svg similarity index 100% rename from actions/22x22-light/player-play.svg rename to actions/22/player-play.svg diff --git a/actions/22x22-light/player-record.svg b/actions/22/player-record.svg similarity index 100% rename from actions/22x22-light/player-record.svg rename to actions/22/player-record.svg diff --git a/actions/22x22-light/player-rew.svg b/actions/22/player-rew.svg similarity index 100% rename from actions/22x22-light/player-rew.svg rename to actions/22/player-rew.svg diff --git a/actions/22x22-light/player-start.svg b/actions/22/player-start.svg similarity index 100% rename from actions/22x22-light/player-start.svg rename to actions/22/player-start.svg diff --git a/actions/22x22-light/player-stop.svg b/actions/22/player-stop.svg similarity index 100% rename from actions/22x22-light/player-stop.svg rename to actions/22/player-stop.svg diff --git a/actions/22x22-light/player-time.svg b/actions/22/player-time.svg similarity index 100% rename from actions/22x22-light/player-time.svg rename to actions/22/player-time.svg diff --git a/actions/22x22-light/player-volume-muted.svg b/actions/22/player-volume-muted.svg similarity index 100% rename from actions/22x22-light/player-volume-muted.svg rename to actions/22/player-volume-muted.svg diff --git a/actions/22x22-light/player-volume.svg b/actions/22/player-volume.svg similarity index 100% rename from actions/22x22-light/player-volume.svg rename to actions/22/player-volume.svg diff --git a/actions/22x22-light/player_eject.svg b/actions/22/player_eject.svg similarity index 100% rename from actions/22x22-light/player_eject.svg rename to actions/22/player_eject.svg diff --git a/actions/22x22-light/player_end.svg b/actions/22/player_end.svg similarity index 100% rename from actions/22x22-light/player_end.svg rename to actions/22/player_end.svg diff --git a/actions/22x22-light/player_fwd.svg b/actions/22/player_fwd.svg similarity index 100% rename from actions/22x22-light/player_fwd.svg rename to actions/22/player_fwd.svg diff --git a/actions/22x22-light/player_new.svg b/actions/22/player_new.svg similarity index 100% rename from actions/22x22-light/player_new.svg rename to actions/22/player_new.svg diff --git a/actions/22x22-light/player_pause.svg b/actions/22/player_pause.svg similarity index 100% rename from actions/22x22-light/player_pause.svg rename to actions/22/player_pause.svg diff --git a/actions/22x22-light/player_play.svg b/actions/22/player_play.svg similarity index 100% rename from actions/22x22-light/player_play.svg rename to actions/22/player_play.svg diff --git a/actions/22x22-light/player_record.svg b/actions/22/player_record.svg similarity index 100% rename from actions/22x22-light/player_record.svg rename to actions/22/player_record.svg diff --git a/actions/22x22-light/player_rew.svg b/actions/22/player_rew.svg similarity index 100% rename from actions/22x22-light/player_rew.svg rename to actions/22/player_rew.svg diff --git a/actions/22x22-light/player_start.svg b/actions/22/player_start.svg similarity index 100% rename from actions/22x22-light/player_start.svg rename to actions/22/player_start.svg diff --git a/actions/22x22-light/player_stop.svg b/actions/22/player_stop.svg similarity index 100% rename from actions/22x22-light/player_stop.svg rename to actions/22/player_stop.svg diff --git a/actions/22x22-light/playlist-generator.svg b/actions/22/playlist-generator.svg similarity index 100% rename from actions/22x22-light/playlist-generator.svg rename to actions/22/playlist-generator.svg diff --git a/actions/22x22-light/playlist-sort.svg b/actions/22/playlist-sort.svg similarity index 100% rename from actions/22x22-light/playlist-sort.svg rename to actions/22/playlist-sort.svg diff --git a/actions/22x22-light/plugins.svg b/actions/22/plugins.svg similarity index 100% rename from actions/22x22-light/plugins.svg rename to actions/22/plugins.svg diff --git a/actions/22x22-light/podcast-amarok.svg b/actions/22/podcast-amarok.svg similarity index 100% rename from actions/22x22-light/podcast-amarok.svg rename to actions/22/podcast-amarok.svg diff --git a/actions/22x22-light/preferences-activities.svg b/actions/22/preferences-activities.svg similarity index 100% rename from actions/22x22-light/preferences-activities.svg rename to actions/22/preferences-activities.svg diff --git a/actions/22x22-light/preferences-indicator-amarok.svg b/actions/22/preferences-indicator-amarok.svg similarity index 100% rename from actions/22x22-light/preferences-indicator-amarok.svg rename to actions/22/preferences-indicator-amarok.svg diff --git a/actions/22x22-light/preferences-media-playback-amarok.svg b/actions/22/preferences-media-playback-amarok.svg similarity index 100% rename from actions/22x22-light/preferences-media-playback-amarok.svg rename to actions/22/preferences-media-playback-amarok.svg diff --git a/actions/22x22-light/preferences-other.svg b/actions/22/preferences-other.svg similarity index 100% rename from actions/22x22-light/preferences-other.svg rename to actions/22/preferences-other.svg diff --git a/actions/22x22-light/preferences-other2.svg b/actions/22/preferences-other2.svg similarity index 100% rename from actions/22x22-light/preferences-other2.svg rename to actions/22/preferences-other2.svg diff --git a/actions/22x22-light/preflight-verifier.svg b/actions/22/preflight-verifier.svg similarity index 100% rename from actions/22x22-light/preflight-verifier.svg rename to actions/22/preflight-verifier.svg diff --git a/actions/22x22-light/preview-file.svg b/actions/22/preview-file.svg similarity index 100% rename from actions/22x22-light/preview-file.svg rename to actions/22/preview-file.svg diff --git a/actions/22x22-light/previous.svg b/actions/22/previous.svg similarity index 100% rename from actions/22x22-light/previous.svg rename to actions/22/previous.svg diff --git a/actions/22x22-light/process-stop.svg b/actions/22/process-stop.svg similarity index 100% rename from actions/22x22-light/process-stop.svg rename to actions/22/process-stop.svg diff --git a/actions/22x22-light/project-development-close-all.svg b/actions/22/project-development-close-all.svg similarity index 100% rename from actions/22x22-light/project-development-close-all.svg rename to actions/22/project-development-close-all.svg diff --git a/actions/22x22-light/project-development-close.svg b/actions/22/project-development-close.svg similarity index 100% rename from actions/22x22-light/project-development-close.svg rename to actions/22/project-development-close.svg diff --git a/actions/22x22-light/project-development-new-template.svg b/actions/22/project-development-new-template.svg similarity index 100% rename from actions/22x22-light/project-development-new-template.svg rename to actions/22/project-development-new-template.svg diff --git a/actions/22x22-light/project-development.svg b/actions/22/project-development.svg similarity index 100% rename from actions/22x22-light/project-development.svg rename to actions/22/project-development.svg diff --git a/actions/22x22-light/project-open.svg b/actions/22/project-open.svg similarity index 100% rename from actions/22x22-light/project-open.svg rename to actions/22/project-open.svg diff --git a/actions/22x22-light/quickopen-class.svg b/actions/22/quickopen-class.svg similarity index 100% rename from actions/22x22-light/quickopen-class.svg rename to actions/22/quickopen-class.svg diff --git a/actions/22x22-light/quickopen-file.svg b/actions/22/quickopen-file.svg similarity index 100% rename from actions/22x22-light/quickopen-file.svg rename to actions/22/quickopen-file.svg diff --git a/actions/22x22-light/quickopen-function.svg b/actions/22/quickopen-function.svg similarity index 100% rename from actions/22x22-light/quickopen-function.svg rename to actions/22/quickopen-function.svg diff --git a/actions/22x22-light/quickopen.svg b/actions/22/quickopen.svg similarity index 100% rename from actions/22x22-light/quickopen.svg rename to actions/22/quickopen.svg diff --git a/actions/22x22-light/quickview.svg b/actions/22/quickview.svg similarity index 100% rename from actions/22x22-light/quickview.svg rename to actions/22/quickview.svg diff --git a/actions/22x22-light/raindrop.svg b/actions/22/raindrop.svg similarity index 100% rename from actions/22x22-light/raindrop.svg rename to actions/22/raindrop.svg diff --git a/actions/22x22-light/rating.svg b/actions/22/rating.svg similarity index 100% rename from actions/22x22-light/rating.svg rename to actions/22/rating.svg diff --git a/actions/22x22-light/ratio.svg b/actions/22/ratio.svg similarity index 100% rename from actions/22x22-light/ratio.svg rename to actions/22/ratio.svg diff --git a/actions/22x22-light/ratiocrop.svg b/actions/22/ratiocrop.svg similarity index 100% rename from actions/22x22-light/ratiocrop.svg rename to actions/22/ratiocrop.svg diff --git a/actions/22x22-light/redeyes.svg b/actions/22/redeyes.svg similarity index 100% rename from actions/22x22-light/redeyes.svg rename to actions/22/redeyes.svg diff --git a/actions/22x22-light/redhat-home.svg b/actions/22/redhat-home.svg similarity index 100% rename from actions/22x22-light/redhat-home.svg rename to actions/22/redhat-home.svg diff --git a/actions/22x22-light/redo.svg b/actions/22/redo.svg similarity index 100% rename from actions/22x22-light/redo.svg rename to actions/22/redo.svg diff --git a/actions/22x22-light/reload.svg b/actions/22/reload.svg similarity index 100% rename from actions/22x22-light/reload.svg rename to actions/22/reload.svg diff --git a/actions/22x22-light/reload3.svg b/actions/22/reload3.svg similarity index 100% rename from actions/22x22-light/reload3.svg rename to actions/22/reload3.svg diff --git a/actions/22x22-light/reload_all_tabs.svg b/actions/22/reload_all_tabs.svg similarity index 100% rename from actions/22x22-light/reload_all_tabs.svg rename to actions/22/reload_all_tabs.svg diff --git a/actions/22x22-light/reload_page.svg b/actions/22/reload_page.svg similarity index 100% rename from actions/22x22-light/reload_page.svg rename to actions/22/reload_page.svg diff --git a/actions/22x22-light/remove-amarok.svg b/actions/22/remove-amarok.svg similarity index 100% rename from actions/22x22-light/remove-amarok.svg rename to actions/22/remove-amarok.svg diff --git a/actions/22x22-light/remove-link.svg b/actions/22/remove-link.svg similarity index 100% rename from actions/22x22-light/remove-link.svg rename to actions/22/remove-link.svg diff --git a/actions/22x22-light/remove.svg b/actions/22/remove.svg similarity index 100% rename from actions/22x22-light/remove.svg rename to actions/22/remove.svg diff --git a/actions/22x22-light/resource-calendar-child-insert.svg b/actions/22/resource-calendar-child-insert.svg similarity index 100% rename from actions/22x22-light/resource-calendar-child-insert.svg rename to actions/22/resource-calendar-child-insert.svg diff --git a/actions/22x22-light/resource-calendar-child.svg b/actions/22/resource-calendar-child.svg similarity index 100% rename from actions/22x22-light/resource-calendar-child.svg rename to actions/22/resource-calendar-child.svg diff --git a/actions/22x22-light/resource-calendar-insert.svg b/actions/22/resource-calendar-insert.svg similarity index 100% rename from actions/22x22-light/resource-calendar-insert.svg rename to actions/22/resource-calendar-insert.svg diff --git a/actions/22x22-light/resource-group-new.svg b/actions/22/resource-group-new.svg similarity index 100% rename from actions/22x22-light/resource-group-new.svg rename to actions/22/resource-group-new.svg diff --git a/actions/22x22-light/resource-group.svg b/actions/22/resource-group.svg similarity index 100% rename from actions/22x22-light/resource-group.svg rename to actions/22/resource-group.svg diff --git a/actions/22x22-light/restoration.svg b/actions/22/restoration.svg similarity index 100% rename from actions/22x22-light/restoration.svg rename to actions/22/restoration.svg diff --git a/actions/22x22-light/retweet.svg b/actions/22/retweet.svg similarity index 100% rename from actions/22x22-light/retweet.svg rename to actions/22/retweet.svg diff --git a/actions/22x22-light/revert.svg b/actions/22/revert.svg similarity index 100% rename from actions/22x22-light/revert.svg rename to actions/22/revert.svg diff --git a/actions/22x22-light/rhythmbox-set-star.svg b/actions/22/rhythmbox-set-star.svg similarity index 100% rename from actions/22x22-light/rhythmbox-set-star.svg rename to actions/22/rhythmbox-set-star.svg diff --git a/actions/22x22-light/roll.svg b/actions/22/roll.svg similarity index 100% rename from actions/22x22-light/roll.svg rename to actions/22/roll.svg diff --git a/actions/22x22-light/rotate.svg b/actions/22/rotate.svg similarity index 100% rename from actions/22x22-light/rotate.svg rename to actions/22/rotate.svg diff --git a/actions/22x22-light/run-build-clean.svg b/actions/22/run-build-clean.svg similarity index 100% rename from actions/22x22-light/run-build-clean.svg rename to actions/22/run-build-clean.svg diff --git a/actions/22x22-light/run-build-configure.svg b/actions/22/run-build-configure.svg similarity index 100% rename from actions/22x22-light/run-build-configure.svg rename to actions/22/run-build-configure.svg diff --git a/actions/22x22-light/run-build-file.svg b/actions/22/run-build-file.svg similarity index 100% rename from actions/22x22-light/run-build-file.svg rename to actions/22/run-build-file.svg diff --git a/actions/22x22-light/run-build-install-root.svg b/actions/22/run-build-install-root.svg similarity index 100% rename from actions/22x22-light/run-build-install-root.svg rename to actions/22/run-build-install-root.svg diff --git a/actions/22x22-light/run-build-install.svg b/actions/22/run-build-install.svg similarity index 100% rename from actions/22x22-light/run-build-install.svg rename to actions/22/run-build-install.svg diff --git a/actions/22x22-light/run-build-prune.svg b/actions/22/run-build-prune.svg similarity index 100% rename from actions/22x22-light/run-build-prune.svg rename to actions/22/run-build-prune.svg diff --git a/actions/22x22-light/run-build.svg b/actions/22/run-build.svg similarity index 100% rename from actions/22x22-light/run-build.svg rename to actions/22/run-build.svg diff --git a/actions/22x22-light/run-clean.svg b/actions/22/run-clean.svg similarity index 100% rename from actions/22x22-light/run-clean.svg rename to actions/22/run-clean.svg diff --git a/actions/22x22-light/run-install.svg b/actions/22/run-install.svg similarity index 100% rename from actions/22x22-light/run-install.svg rename to actions/22/run-install.svg diff --git a/actions/22x22-light/search.svg b/actions/22/search.svg similarity index 100% rename from actions/22x22-light/search.svg rename to actions/22/search.svg diff --git a/actions/22x22-light/select-rectangular.svg b/actions/22/select-rectangular.svg similarity index 100% rename from actions/22x22-light/select-rectangular.svg rename to actions/22/select-rectangular.svg diff --git a/actions/22x22-light/selection-bottom.svg b/actions/22/selection-bottom.svg similarity index 100% rename from actions/22x22-light/selection-bottom.svg rename to actions/22/selection-bottom.svg diff --git a/actions/22x22-light/selection-lower.svg b/actions/22/selection-lower.svg similarity index 100% rename from actions/22x22-light/selection-lower.svg rename to actions/22/selection-lower.svg diff --git a/actions/22x22-light/selection-make-bitmap-copy.svg b/actions/22/selection-make-bitmap-copy.svg similarity index 100% rename from actions/22x22-light/selection-make-bitmap-copy.svg rename to actions/22/selection-make-bitmap-copy.svg diff --git a/actions/22x22-light/selection-move-to-layer-above.svg b/actions/22/selection-move-to-layer-above.svg similarity index 100% rename from actions/22x22-light/selection-move-to-layer-above.svg rename to actions/22/selection-move-to-layer-above.svg diff --git a/actions/22x22-light/selection-move-to-layer-below.svg b/actions/22/selection-move-to-layer-below.svg similarity index 100% rename from actions/22x22-light/selection-move-to-layer-below.svg rename to actions/22/selection-move-to-layer-below.svg diff --git a/actions/22x22-light/selection-raise.svg b/actions/22/selection-raise.svg similarity index 100% rename from actions/22x22-light/selection-raise.svg rename to actions/22/selection-raise.svg diff --git a/actions/22x22-light/selection-top.svg b/actions/22/selection-top.svg similarity index 100% rename from actions/22x22-light/selection-top.svg rename to actions/22/selection-top.svg diff --git a/actions/22x22-light/services.svg b/actions/22/services.svg similarity index 100% rename from actions/22x22-light/services.svg rename to actions/22/services.svg diff --git a/actions/22x22-light/setroubleshoot_icon.svg b/actions/22/setroubleshoot_icon.svg similarity index 100% rename from actions/22x22-light/setroubleshoot_icon.svg rename to actions/22/setroubleshoot_icon.svg diff --git a/actions/22x22-light/shape-choose.svg b/actions/22/shape-choose.svg similarity index 100% rename from actions/22x22-light/shape-choose.svg rename to actions/22/shape-choose.svg diff --git a/actions/22x22-light/shapes.svg b/actions/22/shapes.svg similarity index 100% rename from actions/22x22-light/shapes.svg rename to actions/22/shapes.svg diff --git a/actions/22x22-light/sharpenimage.svg b/actions/22/sharpenimage.svg similarity index 100% rename from actions/22x22-light/sharpenimage.svg rename to actions/22/sharpenimage.svg diff --git a/actions/22x22-light/shear.svg b/actions/22/shear.svg similarity index 100% rename from actions/22x22-light/shear.svg rename to actions/22/shear.svg diff --git a/actions/22x22-light/shift-down-y.svg b/actions/22/shift-down-y.svg similarity index 100% rename from actions/22x22-light/shift-down-y.svg rename to actions/22/shift-down-y.svg diff --git a/actions/22x22-light/shift-left-x.svg b/actions/22/shift-left-x.svg similarity index 100% rename from actions/22x22-light/shift-left-x.svg rename to actions/22/shift-left-x.svg diff --git a/actions/22x22-light/shift-right-x.svg b/actions/22/shift-right-x.svg similarity index 100% rename from actions/22x22-light/shift-right-x.svg rename to actions/22/shift-right-x.svg diff --git a/actions/22x22-light/shift-up-y.svg b/actions/22/shift-up-y.svg similarity index 100% rename from actions/22x22-light/shift-up-y.svg rename to actions/22/shift-up-y.svg diff --git a/actions/22x22-light/show-dialogs.svg b/actions/22/show-dialogs.svg similarity index 100% rename from actions/22x22-light/show-dialogs.svg rename to actions/22/show-dialogs.svg diff --git a/actions/22x22-light/show-grid.svg b/actions/22/show-grid.svg similarity index 100% rename from actions/22x22-light/show-grid.svg rename to actions/22/show-grid.svg diff --git a/actions/22x22-light/show-guides.svg b/actions/22/show-guides.svg similarity index 100% rename from actions/22x22-light/show-guides.svg rename to actions/22/show-guides.svg diff --git a/actions/22x22-light/show-hidden.svg b/actions/22/show-hidden.svg similarity index 100% rename from actions/22x22-light/show-hidden.svg rename to actions/22/show-hidden.svg diff --git a/actions/22x22-light/show-menu.svg b/actions/22/show-menu.svg similarity index 100% rename from actions/22x22-light/show-menu.svg rename to actions/22/show-menu.svg diff --git a/actions/22x22-light/show-offline.svg b/actions/22/show-offline.svg similarity index 100% rename from actions/22x22-light/show-offline.svg rename to actions/22/show-offline.svg diff --git a/actions/22x22-light/similarartists-amarok.svg b/actions/22/similarartists-amarok.svg similarity index 100% rename from actions/22x22-light/similarartists-amarok.svg rename to actions/22/similarartists-amarok.svg diff --git a/actions/22x22-light/smallclock.svg b/actions/22/smallclock.svg similarity index 100% rename from actions/22x22-light/smallclock.svg rename to actions/22/smallclock.svg diff --git a/actions/22x22-light/snap-extension.svg b/actions/22/snap-extension.svg similarity index 100% rename from actions/22x22-light/snap-extension.svg rename to actions/22/snap-extension.svg diff --git a/actions/22x22-light/snap-guideline.svg b/actions/22/snap-guideline.svg similarity index 100% rename from actions/22x22-light/snap-guideline.svg rename to actions/22/snap-guideline.svg diff --git a/actions/22x22-light/snap-intersection.svg b/actions/22/snap-intersection.svg similarity index 100% rename from actions/22x22-light/snap-intersection.svg rename to actions/22/snap-intersection.svg diff --git a/actions/22x22-light/snap-node.svg b/actions/22/snap-node.svg similarity index 100% rename from actions/22x22-light/snap-node.svg rename to actions/22/snap-node.svg diff --git a/actions/22x22-light/snap-orthogonal.svg b/actions/22/snap-orthogonal.svg similarity index 100% rename from actions/22x22-light/snap-orthogonal.svg rename to actions/22/snap-orthogonal.svg diff --git a/actions/22x22-light/sort-name.svg b/actions/22/sort-name.svg similarity index 100% rename from actions/22x22-light/sort-name.svg rename to actions/22/sort-name.svg diff --git a/actions/22x22-light/sort-presence.svg b/actions/22/sort-presence.svg similarity index 100% rename from actions/22x22-light/sort-presence.svg rename to actions/22/sort-presence.svg diff --git a/actions/22x22-light/speaker.svg b/actions/22/speaker.svg similarity index 100% rename from actions/22x22-light/speaker.svg rename to actions/22/speaker.svg diff --git a/actions/22x22-light/speed-high.svg b/actions/22/speed-high.svg similarity index 100% rename from actions/22x22-light/speed-high.svg rename to actions/22/speed-high.svg diff --git a/actions/22x22-light/speed-low.svg b/actions/22/speed-low.svg similarity index 100% rename from actions/22x22-light/speed-low.svg rename to actions/22/speed-low.svg diff --git a/actions/22x22-light/split.svg b/actions/22/split.svg similarity index 100% rename from actions/22x22-light/split.svg rename to actions/22/split.svg diff --git a/actions/22x22-light/standard-connector.svg b/actions/22/standard-connector.svg similarity index 100% rename from actions/22x22-light/standard-connector.svg rename to actions/22/standard-connector.svg diff --git a/actions/22x22-light/star.svg b/actions/22/star.svg similarity index 100% rename from actions/22x22-light/star.svg rename to actions/22/star.svg diff --git a/actions/22x22-light/start.svg b/actions/22/start.svg similarity index 100% rename from actions/22x22-light/start.svg rename to actions/22/start.svg diff --git a/actions/22x22-light/sticky_zoom.svg b/actions/22/sticky_zoom.svg similarity index 100% rename from actions/22x22-light/sticky_zoom.svg rename to actions/22/sticky_zoom.svg diff --git a/actions/22x22-light/stock-exit.svg b/actions/22/stock-exit.svg similarity index 100% rename from actions/22x22-light/stock-exit.svg rename to actions/22/stock-exit.svg diff --git a/actions/22x22-light/stock-help.svg b/actions/22/stock-help.svg similarity index 100% rename from actions/22x22-light/stock-help.svg rename to actions/22/stock-help.svg diff --git a/actions/22x22-light/stock-home.svg b/actions/22/stock-home.svg similarity index 100% rename from actions/22x22-light/stock-home.svg rename to actions/22/stock-home.svg diff --git a/actions/22x22-light/stock-new-adress-book.svg b/actions/22/stock-new-adress-book.svg similarity index 100% rename from actions/22x22-light/stock-new-adress-book.svg rename to actions/22/stock-new-adress-book.svg diff --git a/actions/22x22-light/stock-refresh.svg b/actions/22/stock-refresh.svg similarity index 100% rename from actions/22x22-light/stock-refresh.svg rename to actions/22/stock-refresh.svg diff --git a/actions/22x22-light/stock-refresh2.svg b/actions/22/stock-refresh2.svg similarity index 100% rename from actions/22x22-light/stock-refresh2.svg rename to actions/22/stock-refresh2.svg diff --git a/actions/22x22-light/stock_about.svg b/actions/22/stock_about.svg similarity index 100% rename from actions/22x22-light/stock_about.svg rename to actions/22/stock_about.svg diff --git a/actions/22x22-light/stock_add-bookmark.svg b/actions/22/stock_add-bookmark.svg similarity index 100% rename from actions/22x22-light/stock_add-bookmark.svg rename to actions/22/stock_add-bookmark.svg diff --git a/actions/22x22-light/stock_bookmark.svg b/actions/22/stock_bookmark.svg similarity index 100% rename from actions/22x22-light/stock_bookmark.svg rename to actions/22/stock_bookmark.svg diff --git a/actions/22x22-light/stock_bottom.svg b/actions/22/stock_bottom.svg similarity index 100% rename from actions/22x22-light/stock_bottom.svg rename to actions/22/stock_bottom.svg diff --git a/actions/22x22-light/stock_calc-accept.svg b/actions/22/stock_calc-accept.svg similarity index 100% rename from actions/22x22-light/stock_calc-accept.svg rename to actions/22/stock_calc-accept.svg diff --git a/actions/22x22-light/stock_calc-cancel.svg b/actions/22/stock_calc-cancel.svg similarity index 100% rename from actions/22x22-light/stock_calc-cancel.svg rename to actions/22/stock_calc-cancel.svg diff --git a/actions/22x22-light/stock_close.svg b/actions/22/stock_close.svg similarity index 100% rename from actions/22x22-light/stock_close.svg rename to actions/22/stock_close.svg diff --git a/actions/22x22-light/stock_copy.svg b/actions/22/stock_copy.svg similarity index 100% rename from actions/22x22-light/stock_copy.svg rename to actions/22/stock_copy.svg diff --git a/actions/22x22-light/stock_cut.svg b/actions/22/stock_cut.svg similarity index 100% rename from actions/22x22-light/stock_cut.svg rename to actions/22/stock_cut.svg diff --git a/actions/22x22-light/stock_delete.svg b/actions/22/stock_delete.svg similarity index 100% rename from actions/22x22-light/stock_delete.svg rename to actions/22/stock_delete.svg diff --git a/actions/22x22-light/stock_down.svg b/actions/22/stock_down.svg similarity index 100% rename from actions/22x22-light/stock_down.svg rename to actions/22/stock_down.svg diff --git a/actions/22x22-light/stock_edit.svg b/actions/22/stock_edit.svg similarity index 100% rename from actions/22x22-light/stock_edit.svg rename to actions/22/stock_edit.svg diff --git a/actions/22x22-light/stock_exit.svg b/actions/22/stock_exit.svg similarity index 100% rename from actions/22x22-light/stock_exit.svg rename to actions/22/stock_exit.svg diff --git a/actions/22x22-light/stock_file-properites.svg b/actions/22/stock_file-properites.svg similarity index 100% rename from actions/22x22-light/stock_file-properites.svg rename to actions/22/stock_file-properites.svg diff --git a/actions/22x22-light/stock_file-properties.svg b/actions/22/stock_file-properties.svg similarity index 100% rename from actions/22x22-light/stock_file-properties.svg rename to actions/22/stock_file-properties.svg diff --git a/actions/22x22-light/stock_first.svg b/actions/22/stock_first.svg similarity index 100% rename from actions/22x22-light/stock_first.svg rename to actions/22/stock_first.svg diff --git a/actions/22x22-light/stock_folder-copy.svg b/actions/22/stock_folder-copy.svg similarity index 100% rename from actions/22x22-light/stock_folder-copy.svg rename to actions/22/stock_folder-copy.svg diff --git a/actions/22x22-light/stock_folder-move.svg b/actions/22/stock_folder-move.svg similarity index 100% rename from actions/22x22-light/stock_folder-move.svg rename to actions/22/stock_folder-move.svg diff --git a/actions/22x22-light/stock_folder-properties.svg b/actions/22/stock_folder-properties.svg similarity index 100% rename from actions/22x22-light/stock_folder-properties.svg rename to actions/22/stock_folder-properties.svg diff --git a/actions/22x22-light/stock_fullscreen.svg b/actions/22/stock_fullscreen.svg similarity index 100% rename from actions/22x22-light/stock_fullscreen.svg rename to actions/22/stock_fullscreen.svg diff --git a/actions/22x22-light/stock_help-add-bookmark.svg b/actions/22/stock_help-add-bookmark.svg similarity index 100% rename from actions/22x22-light/stock_help-add-bookmark.svg rename to actions/22/stock_help-add-bookmark.svg diff --git a/actions/22x22-light/stock_help.svg b/actions/22/stock_help.svg similarity index 100% rename from actions/22x22-light/stock_help.svg rename to actions/22/stock_help.svg diff --git a/actions/22x22-light/stock_home.svg b/actions/22/stock_home.svg similarity index 100% rename from actions/22x22-light/stock_home.svg rename to actions/22/stock_home.svg diff --git a/actions/22x22-light/stock_last.svg b/actions/22/stock_last.svg similarity index 100% rename from actions/22x22-light/stock_last.svg rename to actions/22/stock_last.svg diff --git a/actions/22x22-light/stock_leave-fullscreen.svg b/actions/22/stock_leave-fullscreen.svg similarity index 100% rename from actions/22x22-light/stock_leave-fullscreen.svg rename to actions/22/stock_leave-fullscreen.svg diff --git a/actions/22x22-light/stock_left.svg b/actions/22/stock_left.svg similarity index 100% rename from actions/22x22-light/stock_left.svg rename to actions/22/stock_left.svg diff --git a/actions/22x22-light/stock_mail-compose.svg b/actions/22/stock_mail-compose.svg similarity index 100% rename from actions/22x22-light/stock_mail-compose.svg rename to actions/22/stock_mail-compose.svg diff --git a/actions/22x22-light/stock_mail-filters-apply.svg b/actions/22/stock_mail-filters-apply.svg similarity index 100% rename from actions/22x22-light/stock_mail-filters-apply.svg rename to actions/22/stock_mail-filters-apply.svg diff --git a/actions/22x22-light/stock_mail-forward.svg b/actions/22/stock_mail-forward.svg similarity index 100% rename from actions/22x22-light/stock_mail-forward.svg rename to actions/22/stock_mail-forward.svg diff --git a/actions/22x22-light/stock_mail-reply-to-all.svg b/actions/22/stock_mail-reply-to-all.svg similarity index 100% rename from actions/22x22-light/stock_mail-reply-to-all.svg rename to actions/22/stock_mail-reply-to-all.svg diff --git a/actions/22x22-light/stock_mail-reply.svg b/actions/22/stock_mail-reply.svg similarity index 100% rename from actions/22x22-light/stock_mail-reply.svg rename to actions/22/stock_mail-reply.svg diff --git a/actions/22x22-light/stock_mail-send-receive.svg b/actions/22/stock_mail-send-receive.svg similarity index 100% rename from actions/22x22-light/stock_mail-send-receive.svg rename to actions/22/stock_mail-send-receive.svg diff --git a/actions/22x22-light/stock_mail-send.svg b/actions/22/stock_mail-send.svg similarity index 100% rename from actions/22x22-light/stock_mail-send.svg rename to actions/22/stock_mail-send.svg diff --git a/actions/22x22-light/stock_mark.svg b/actions/22/stock_mark.svg similarity index 100% rename from actions/22x22-light/stock_mark.svg rename to actions/22/stock_mark.svg diff --git a/actions/22x22-light/stock_media-fwd.svg b/actions/22/stock_media-fwd.svg similarity index 100% rename from actions/22x22-light/stock_media-fwd.svg rename to actions/22/stock_media-fwd.svg diff --git a/actions/22x22-light/stock_media-next.svg b/actions/22/stock_media-next.svg similarity index 100% rename from actions/22x22-light/stock_media-next.svg rename to actions/22/stock_media-next.svg diff --git a/actions/22x22-light/stock_media-pause.svg b/actions/22/stock_media-pause.svg similarity index 100% rename from actions/22x22-light/stock_media-pause.svg rename to actions/22/stock_media-pause.svg diff --git a/actions/22x22-light/stock_media-play.svg b/actions/22/stock_media-play.svg similarity index 100% rename from actions/22x22-light/stock_media-play.svg rename to actions/22/stock_media-play.svg diff --git a/actions/22x22-light/stock_media-prev.svg b/actions/22/stock_media-prev.svg similarity index 100% rename from actions/22x22-light/stock_media-prev.svg rename to actions/22/stock_media-prev.svg diff --git a/actions/22x22-light/stock_media-rec.svg b/actions/22/stock_media-rec.svg similarity index 100% rename from actions/22x22-light/stock_media-rec.svg rename to actions/22/stock_media-rec.svg diff --git a/actions/22x22-light/stock_media-rev.svg b/actions/22/stock_media-rev.svg similarity index 100% rename from actions/22x22-light/stock_media-rev.svg rename to actions/22/stock_media-rev.svg diff --git a/actions/22x22-light/stock_media-rew.svg b/actions/22/stock_media-rew.svg similarity index 100% rename from actions/22x22-light/stock_media-rew.svg rename to actions/22/stock_media-rew.svg diff --git a/actions/22x22-light/stock_media-stop.svg b/actions/22/stock_media-stop.svg similarity index 100% rename from actions/22x22-light/stock_media-stop.svg rename to actions/22/stock_media-stop.svg diff --git a/actions/22x22-light/stock_navigator.svg b/actions/22/stock_navigator.svg similarity index 100% rename from actions/22x22-light/stock_navigator.svg rename to actions/22/stock_navigator.svg diff --git a/actions/22x22-light/stock_new-appointment.svg b/actions/22/stock_new-appointment.svg similarity index 100% rename from actions/22x22-light/stock_new-appointment.svg rename to actions/22/stock_new-appointment.svg diff --git a/actions/22x22-light/stock_new-bcard.svg b/actions/22/stock_new-bcard.svg similarity index 100% rename from actions/22x22-light/stock_new-bcard.svg rename to actions/22/stock_new-bcard.svg diff --git a/actions/22x22-light/stock_new-card.svg b/actions/22/stock_new-card.svg similarity index 100% rename from actions/22x22-light/stock_new-card.svg rename to actions/22/stock_new-card.svg diff --git a/actions/22x22-light/stock_new-dir.svg b/actions/22/stock_new-dir.svg similarity index 100% rename from actions/22x22-light/stock_new-dir.svg rename to actions/22/stock_new-dir.svg diff --git a/actions/22x22-light/stock_new-tab.svg b/actions/22/stock_new-tab.svg similarity index 100% rename from actions/22x22-light/stock_new-tab.svg rename to actions/22/stock_new-tab.svg diff --git a/actions/22x22-light/stock_new-text.svg b/actions/22/stock_new-text.svg similarity index 100% rename from actions/22x22-light/stock_new-text.svg rename to actions/22/stock_new-text.svg diff --git a/actions/22x22-light/stock_new-window.svg b/actions/22/stock_new-window.svg similarity index 100% rename from actions/22x22-light/stock_new-window.svg rename to actions/22/stock_new-window.svg diff --git a/actions/22x22-light/stock_no.svg b/actions/22/stock_no.svg similarity index 100% rename from actions/22x22-light/stock_no.svg rename to actions/22/stock_no.svg diff --git a/actions/22x22-light/stock_not.svg b/actions/22/stock_not.svg similarity index 100% rename from actions/22x22-light/stock_not.svg rename to actions/22/stock_not.svg diff --git a/actions/22x22-light/stock_paste.svg b/actions/22/stock_paste.svg similarity index 100% rename from actions/22x22-light/stock_paste.svg rename to actions/22/stock_paste.svg diff --git a/actions/22x22-light/stock_print-preview.svg b/actions/22/stock_print-preview.svg similarity index 100% rename from actions/22x22-light/stock_print-preview.svg rename to actions/22/stock_print-preview.svg diff --git a/actions/22x22-light/stock_print-setup.svg b/actions/22/stock_print-setup.svg similarity index 100% rename from actions/22x22-light/stock_print-setup.svg rename to actions/22/stock_print-setup.svg diff --git a/actions/22x22-light/stock_print.svg b/actions/22/stock_print.svg similarity index 100% rename from actions/22x22-light/stock_print.svg rename to actions/22/stock_print.svg diff --git a/actions/22x22-light/stock_properties.svg b/actions/22/stock_properties.svg similarity index 100% rename from actions/22x22-light/stock_properties.svg rename to actions/22/stock_properties.svg diff --git a/actions/22x22-light/stock_redo.svg b/actions/22/stock_redo.svg similarity index 100% rename from actions/22x22-light/stock_redo.svg rename to actions/22/stock_redo.svg diff --git a/actions/22x22-light/stock_refresh.svg b/actions/22/stock_refresh.svg similarity index 100% rename from actions/22x22-light/stock_refresh.svg rename to actions/22/stock_refresh.svg diff --git a/actions/22x22-light/stock_repeat.svg b/actions/22/stock_repeat.svg similarity index 100% rename from actions/22x22-light/stock_repeat.svg rename to actions/22/stock_repeat.svg diff --git a/actions/22x22-light/stock_right.svg b/actions/22/stock_right.svg similarity index 100% rename from actions/22x22-light/stock_right.svg rename to actions/22/stock_right.svg diff --git a/actions/22x22-light/stock_save-all.svg b/actions/22/stock_save-all.svg similarity index 100% rename from actions/22x22-light/stock_save-all.svg rename to actions/22/stock_save-all.svg diff --git a/actions/22x22-light/stock_save-as.svg b/actions/22/stock_save-as.svg similarity index 100% rename from actions/22x22-light/stock_save-as.svg rename to actions/22/stock_save-as.svg diff --git a/actions/22x22-light/stock_save.svg b/actions/22/stock_save.svg similarity index 100% rename from actions/22x22-light/stock_save.svg rename to actions/22/stock_save.svg diff --git a/actions/22x22-light/stock_search-and-replace.svg b/actions/22/stock_search-and-replace.svg similarity index 100% rename from actions/22x22-light/stock_search-and-replace.svg rename to actions/22/stock_search-and-replace.svg diff --git a/actions/22x22-light/stock_search.svg b/actions/22/stock_search.svg similarity index 100% rename from actions/22x22-light/stock_search.svg rename to actions/22/stock_search.svg diff --git a/actions/22x22-light/stock_select-all.svg b/actions/22/stock_select-all.svg similarity index 100% rename from actions/22x22-light/stock_select-all.svg rename to actions/22/stock_select-all.svg diff --git a/actions/22x22-light/stock_sent-mail.svg b/actions/22/stock_sent-mail.svg similarity index 100% rename from actions/22x22-light/stock_sent-mail.svg rename to actions/22/stock_sent-mail.svg diff --git a/actions/22x22-light/stock_shuffle.svg b/actions/22/stock_shuffle.svg similarity index 100% rename from actions/22x22-light/stock_shuffle.svg rename to actions/22/stock_shuffle.svg diff --git a/actions/22x22-light/stock_stop.svg b/actions/22/stock_stop.svg similarity index 100% rename from actions/22x22-light/stock_stop.svg rename to actions/22/stock_stop.svg diff --git a/actions/22x22-light/stock_top.svg b/actions/22/stock_top.svg similarity index 100% rename from actions/22x22-light/stock_top.svg rename to actions/22/stock_top.svg diff --git a/actions/22x22-light/stock_undo.svg b/actions/22/stock_undo.svg similarity index 100% rename from actions/22x22-light/stock_undo.svg rename to actions/22/stock_undo.svg diff --git a/actions/22x22-light/stock_up.svg b/actions/22/stock_up.svg similarity index 100% rename from actions/22x22-light/stock_up.svg rename to actions/22/stock_up.svg diff --git a/actions/22x22-light/stock_view-details.svg b/actions/22/stock_view-details.svg similarity index 100% rename from actions/22x22-light/stock_view-details.svg rename to actions/22/stock_view-details.svg diff --git a/actions/22x22-light/stock_yes.svg b/actions/22/stock_yes.svg similarity index 100% rename from actions/22x22-light/stock_yes.svg rename to actions/22/stock_yes.svg diff --git a/actions/22x22-light/stock_zoom-1.svg b/actions/22/stock_zoom-1.svg similarity index 100% rename from actions/22x22-light/stock_zoom-1.svg rename to actions/22/stock_zoom-1.svg diff --git a/actions/22x22-light/stock_zoom-in.svg b/actions/22/stock_zoom-in.svg similarity index 100% rename from actions/22x22-light/stock_zoom-in.svg rename to actions/22/stock_zoom-in.svg diff --git a/actions/22x22-light/stock_zoom-out.svg b/actions/22/stock_zoom-out.svg similarity index 100% rename from actions/22x22-light/stock_zoom-out.svg rename to actions/22/stock_zoom-out.svg diff --git a/actions/22x22-light/stock_zoom-page.svg b/actions/22/stock_zoom-page.svg similarity index 100% rename from actions/22x22-light/stock_zoom-page.svg rename to actions/22/stock_zoom-page.svg diff --git a/actions/22x22-light/stop.svg b/actions/22/stop.svg similarity index 100% rename from actions/22x22-light/stop.svg rename to actions/22/stop.svg diff --git a/actions/22x22-light/story-editor.svg b/actions/22/story-editor.svg similarity index 100% rename from actions/22x22-light/story-editor.svg rename to actions/22/story-editor.svg diff --git a/actions/22x22-light/straight-connector.svg b/actions/22/straight-connector.svg similarity index 100% rename from actions/22x22-light/straight-connector.svg rename to actions/22/straight-connector.svg diff --git a/actions/22x22-light/stroke-cap-bevel.svg b/actions/22/stroke-cap-bevel.svg similarity index 100% rename from actions/22x22-light/stroke-cap-bevel.svg rename to actions/22/stroke-cap-bevel.svg diff --git a/actions/22x22-light/stroke-cap-butt.svg b/actions/22/stroke-cap-butt.svg similarity index 100% rename from actions/22x22-light/stroke-cap-butt.svg rename to actions/22/stroke-cap-butt.svg diff --git a/actions/22x22-light/stroke-cap-miter.svg b/actions/22/stroke-cap-miter.svg similarity index 100% rename from actions/22x22-light/stroke-cap-miter.svg rename to actions/22/stroke-cap-miter.svg diff --git a/actions/22x22-light/stroke-cap-round.svg b/actions/22/stroke-cap-round.svg similarity index 100% rename from actions/22x22-light/stroke-cap-round.svg rename to actions/22/stroke-cap-round.svg diff --git a/actions/22x22-light/stroke-cap-square.svg b/actions/22/stroke-cap-square.svg similarity index 100% rename from actions/22x22-light/stroke-cap-square.svg rename to actions/22/stroke-cap-square.svg diff --git a/actions/22x22-light/stroke-join-bevel.svg b/actions/22/stroke-join-bevel.svg similarity index 100% rename from actions/22x22-light/stroke-join-bevel.svg rename to actions/22/stroke-join-bevel.svg diff --git a/actions/22x22-light/stroke-join-miter.svg b/actions/22/stroke-join-miter.svg similarity index 100% rename from actions/22x22-light/stroke-join-miter.svg rename to actions/22/stroke-join-miter.svg diff --git a/actions/22x22-light/stroke-join-round.svg b/actions/22/stroke-join-round.svg similarity index 100% rename from actions/22x22-light/stroke-join-round.svg rename to actions/22/stroke-join-round.svg diff --git a/actions/22x22-light/svn-commit.svg b/actions/22/svn-commit.svg similarity index 100% rename from actions/22x22-light/svn-commit.svg rename to actions/22/svn-commit.svg diff --git a/actions/22x22-light/svn-update.svg b/actions/22/svn-update.svg similarity index 100% rename from actions/22x22-light/svn-update.svg rename to actions/22/svn-update.svg diff --git a/actions/22x22-light/symbols.svg b/actions/22/symbols.svg similarity index 100% rename from actions/22x22-light/symbols.svg rename to actions/22/symbols.svg diff --git a/actions/22x22-light/system-lock-screen.svg b/actions/22/system-lock-screen.svg similarity index 100% rename from actions/22x22-light/system-lock-screen.svg rename to actions/22/system-lock-screen.svg diff --git a/actions/22x22-light/system-log-out.svg b/actions/22/system-log-out.svg similarity index 100% rename from actions/22x22-light/system-log-out.svg rename to actions/22/system-log-out.svg diff --git a/actions/22x22-light/system-reboot.svg b/actions/22/system-reboot.svg similarity index 100% rename from actions/22x22-light/system-reboot.svg rename to actions/22/system-reboot.svg diff --git a/actions/22x22-light/system-restart.svg b/actions/22/system-restart.svg similarity index 100% rename from actions/22x22-light/system-restart.svg rename to actions/22/system-restart.svg diff --git a/actions/22x22-light/system-run.svg b/actions/22/system-run.svg similarity index 100% rename from actions/22x22-light/system-run.svg rename to actions/22/system-run.svg diff --git a/actions/22x22-light/system-search.svg b/actions/22/system-search.svg similarity index 100% rename from actions/22x22-light/system-search.svg rename to actions/22/system-search.svg diff --git a/actions/22x22-light/system-shutdown.svg b/actions/22/system-shutdown.svg similarity index 100% rename from actions/22x22-light/system-shutdown.svg rename to actions/22/system-shutdown.svg diff --git a/actions/22x22-light/system-suspend-hibernate.svg b/actions/22/system-suspend-hibernate.svg similarity index 100% rename from actions/22x22-light/system-suspend-hibernate.svg rename to actions/22/system-suspend-hibernate.svg diff --git a/actions/22x22-light/system-suspend.svg b/actions/22/system-suspend.svg similarity index 100% rename from actions/22x22-light/system-suspend.svg rename to actions/22/system-suspend.svg diff --git a/actions/22x22-light/system-switch-user.svg b/actions/22/system-switch-user.svg similarity index 100% rename from actions/22x22-light/system-switch-user.svg rename to actions/22/system-switch-user.svg diff --git a/actions/22x22-light/system-upgrade.svg b/actions/22/system-upgrade.svg similarity index 100% rename from actions/22x22-light/system-upgrade.svg rename to actions/22/system-upgrade.svg diff --git a/actions/22x22-light/tab-close-other.svg b/actions/22/tab-close-other.svg similarity index 100% rename from actions/22x22-light/tab-close-other.svg rename to actions/22/tab-close-other.svg diff --git a/actions/22x22-light/tab-close.svg b/actions/22/tab-close.svg similarity index 100% rename from actions/22x22-light/tab-close.svg rename to actions/22/tab-close.svg diff --git a/actions/22x22-light/tab-detach.svg b/actions/22/tab-detach.svg similarity index 100% rename from actions/22x22-light/tab-detach.svg rename to actions/22/tab-detach.svg diff --git a/actions/22x22-light/tab-duplicate.svg b/actions/22/tab-duplicate.svg similarity index 100% rename from actions/22x22-light/tab-duplicate.svg rename to actions/22/tab-duplicate.svg diff --git a/actions/22x22-light/tab-new-background.svg b/actions/22/tab-new-background.svg similarity index 100% rename from actions/22x22-light/tab-new-background.svg rename to actions/22/tab-new-background.svg diff --git a/actions/22x22-light/tab-new.svg b/actions/22/tab-new.svg similarity index 100% rename from actions/22x22-light/tab-new.svg rename to actions/22/tab-new.svg diff --git a/actions/22x22-light/tab_new.svg b/actions/22/tab_new.svg similarity index 100% rename from actions/22x22-light/tab_new.svg rename to actions/22/tab_new.svg diff --git a/actions/22x22-light/table.svg b/actions/22/table.svg similarity index 100% rename from actions/22x22-light/table.svg rename to actions/22/table.svg diff --git a/actions/22x22-light/tag-addressbook.svg b/actions/22/tag-addressbook.svg similarity index 100% rename from actions/22x22-light/tag-addressbook.svg rename to actions/22/tag-addressbook.svg diff --git a/actions/22x22-light/tag-assigned.svg b/actions/22/tag-assigned.svg similarity index 100% rename from actions/22x22-light/tag-assigned.svg rename to actions/22/tag-assigned.svg diff --git a/actions/22x22-light/tag-delete.svg b/actions/22/tag-delete.svg similarity index 100% rename from actions/22x22-light/tag-delete.svg rename to actions/22/tag-delete.svg diff --git a/actions/22x22-light/tag-events.svg b/actions/22/tag-events.svg similarity index 100% rename from actions/22x22-light/tag-events.svg rename to actions/22/tag-events.svg diff --git a/actions/22x22-light/tag-folder.svg b/actions/22/tag-folder.svg similarity index 100% rename from actions/22x22-light/tag-folder.svg rename to actions/22/tag-folder.svg diff --git a/actions/22x22-light/tag-new.svg b/actions/22/tag-new.svg similarity index 100% rename from actions/22x22-light/tag-new.svg rename to actions/22/tag-new.svg diff --git a/actions/22x22-light/tag-people.svg b/actions/22/tag-people.svg similarity index 100% rename from actions/22x22-light/tag-people.svg rename to actions/22/tag-people.svg diff --git a/actions/22x22-light/tag-places.svg b/actions/22/tag-places.svg similarity index 100% rename from actions/22x22-light/tag-places.svg rename to actions/22/tag-places.svg diff --git a/actions/22x22-light/tag-properties.svg b/actions/22/tag-properties.svg similarity index 100% rename from actions/22x22-light/tag-properties.svg rename to actions/22/tag-properties.svg diff --git a/actions/22x22-light/tag-recents.svg b/actions/22/tag-recents.svg similarity index 100% rename from actions/22x22-light/tag-recents.svg rename to actions/22/tag-recents.svg diff --git a/actions/22x22-light/tag-reset.svg b/actions/22/tag-reset.svg similarity index 100% rename from actions/22x22-light/tag-reset.svg rename to actions/22/tag-reset.svg diff --git a/actions/22x22-light/tag.svg b/actions/22/tag.svg similarity index 100% rename from actions/22x22-light/tag.svg rename to actions/22/tag.svg diff --git a/actions/22x22-light/tags.svg b/actions/22/tags.svg similarity index 100% rename from actions/22x22-light/tags.svg rename to actions/22/tags.svg diff --git a/actions/22x22-light/task-new.svg b/actions/22/task-new.svg similarity index 100% rename from actions/22x22-light/task-new.svg rename to actions/22/task-new.svg diff --git a/actions/22x22-light/taxes-finances.svg b/actions/22/taxes-finances.svg similarity index 100% rename from actions/22x22-light/taxes-finances.svg rename to actions/22/taxes-finances.svg diff --git a/actions/22x22-light/text-field.svg b/actions/22/text-field.svg similarity index 100% rename from actions/22x22-light/text-field.svg rename to actions/22/text-field.svg diff --git a/actions/22x22-light/text-frame-link.svg b/actions/22/text-frame-link.svg similarity index 100% rename from actions/22x22-light/text-frame-link.svg rename to actions/22/text-frame-link.svg diff --git a/actions/22x22-light/text-frame-unlink.svg b/actions/22/text-frame-unlink.svg similarity index 100% rename from actions/22x22-light/text-frame-unlink.svg rename to actions/22/text-frame-unlink.svg diff --git a/actions/22x22-light/text-speak.svg b/actions/22/text-speak.svg similarity index 100% rename from actions/22x22-light/text-speak.svg rename to actions/22/text-speak.svg diff --git a/actions/22x22-light/text_letter_spacing.svg b/actions/22/text_letter_spacing.svg similarity index 100% rename from actions/22x22-light/text_letter_spacing.svg rename to actions/22/text_letter_spacing.svg diff --git a/actions/22x22-light/text_line_spacing.svg b/actions/22/text_line_spacing.svg similarity index 100% rename from actions/22x22-light/text_line_spacing.svg rename to actions/22/text_line_spacing.svg diff --git a/actions/22x22-light/text_subscript.svg b/actions/22/text_subscript.svg similarity index 100% rename from actions/22x22-light/text_subscript.svg rename to actions/22/text_subscript.svg diff --git a/actions/22x22-light/text_superscript.svg b/actions/22/text_superscript.svg similarity index 100% rename from actions/22x22-light/text_superscript.svg rename to actions/22/text_superscript.svg diff --git a/actions/22x22-light/texture.svg b/actions/22/texture.svg similarity index 100% rename from actions/22x22-light/texture.svg rename to actions/22/texture.svg diff --git a/actions/22x22-light/tool-animator.svg b/actions/22/tool-animator.svg similarity index 100% rename from actions/22x22-light/tool-animator.svg rename to actions/22/tool-animator.svg diff --git a/actions/22x22-light/tool-measure.svg b/actions/22/tool-measure.svg similarity index 100% rename from actions/22x22-light/tool-measure.svg rename to actions/22/tool-measure.svg diff --git a/actions/22x22-light/tool-node-editor.svg b/actions/22/tool-node-editor.svg similarity index 100% rename from actions/22x22-light/tool-node-editor.svg rename to actions/22/tool-node-editor.svg diff --git a/actions/22x22-light/tool-pointer.svg b/actions/22/tool-pointer.svg similarity index 100% rename from actions/22x22-light/tool-pointer.svg rename to actions/22/tool-pointer.svg diff --git a/actions/22x22-light/tool-spray.svg b/actions/22/tool-spray.svg similarity index 100% rename from actions/22x22-light/tool-spray.svg rename to actions/22/tool-spray.svg diff --git a/actions/22x22-light/tools-check-spelling.svg b/actions/22/tools-check-spelling.svg similarity index 100% rename from actions/22x22-light/tools-check-spelling.svg rename to actions/22/tools-check-spelling.svg diff --git a/actions/22x22-light/tools-media-optical-burn-image.svg b/actions/22/tools-media-optical-burn-image.svg similarity index 100% rename from actions/22x22-light/tools-media-optical-burn-image.svg rename to actions/22/tools-media-optical-burn-image.svg diff --git a/actions/22x22-light/tools-media-optical-burn.svg b/actions/22/tools-media-optical-burn.svg similarity index 100% rename from actions/22x22-light/tools-media-optical-burn.svg rename to actions/22/tools-media-optical-burn.svg diff --git a/actions/22x22-light/tools-media-optical-copy.svg b/actions/22/tools-media-optical-copy.svg similarity index 100% rename from actions/22x22-light/tools-media-optical-copy.svg rename to actions/22/tools-media-optical-copy.svg diff --git a/actions/22x22-light/tools-media-optical-erase.svg b/actions/22/tools-media-optical-erase.svg similarity index 100% rename from actions/22x22-light/tools-media-optical-erase.svg rename to actions/22/tools-media-optical-erase.svg diff --git a/actions/22x22-light/tools-media-optical-format.svg b/actions/22/tools-media-optical-format.svg similarity index 100% rename from actions/22x22-light/tools-media-optical-format.svg rename to actions/22/tools-media-optical-format.svg diff --git a/actions/22x22-light/tools-report-bug.svg b/actions/22/tools-report-bug.svg similarity index 100% rename from actions/22x22-light/tools-report-bug.svg rename to actions/22/tools-report-bug.svg diff --git a/actions/22x22-light/tools-rip-audio-cd.svg b/actions/22/tools-rip-audio-cd.svg similarity index 100% rename from actions/22x22-light/tools-rip-audio-cd.svg rename to actions/22/tools-rip-audio-cd.svg diff --git a/actions/22x22-light/tools-rip-video-cd.svg b/actions/22/tools-rip-video-cd.svg similarity index 100% rename from actions/22x22-light/tools-rip-video-cd.svg rename to actions/22/tools-rip-video-cd.svg diff --git a/actions/22x22-light/tools-rip-video-dvd.svg b/actions/22/tools-rip-video-dvd.svg similarity index 100% rename from actions/22x22-light/tools-rip-video-dvd.svg rename to actions/22/tools-rip-video-dvd.svg diff --git a/actions/22x22-light/tools-wizard.svg b/actions/22/tools-wizard.svg similarity index 100% rename from actions/22x22-light/tools-wizard.svg rename to actions/22/tools-wizard.svg diff --git a/actions/22x22-light/top.svg b/actions/22/top.svg similarity index 100% rename from actions/22x22-light/top.svg rename to actions/22/top.svg diff --git a/actions/22x22-light/tracker-search-tool.svg b/actions/22/tracker-search-tool.svg similarity index 100% rename from actions/22x22-light/tracker-search-tool.svg rename to actions/22/tracker-search-tool.svg diff --git a/actions/22x22-light/transform-crop-and-resize.svg b/actions/22/transform-crop-and-resize.svg similarity index 100% rename from actions/22x22-light/transform-crop-and-resize.svg rename to actions/22/transform-crop-and-resize.svg diff --git a/actions/22x22-light/transform-crop.svg b/actions/22/transform-crop.svg similarity index 100% rename from actions/22x22-light/transform-crop.svg rename to actions/22/transform-crop.svg diff --git a/actions/22x22-light/transform-move.svg b/actions/22/transform-move.svg similarity index 100% rename from actions/22x22-light/transform-move.svg rename to actions/22/transform-move.svg diff --git a/actions/22x22-light/transform-rotate.svg b/actions/22/transform-rotate.svg similarity index 100% rename from actions/22x22-light/transform-rotate.svg rename to actions/22/transform-rotate.svg diff --git a/actions/22x22-light/transform-scale-textbox-points.svg b/actions/22/transform-scale-textbox-points.svg similarity index 100% rename from actions/22x22-light/transform-scale-textbox-points.svg rename to actions/22/transform-scale-textbox-points.svg diff --git a/actions/22x22-light/transform-scale.svg b/actions/22/transform-scale.svg similarity index 100% rename from actions/22x22-light/transform-scale.svg rename to actions/22/transform-scale.svg diff --git a/actions/22x22-light/transform-shear-down.svg b/actions/22/transform-shear-down.svg similarity index 100% rename from actions/22x22-light/transform-shear-down.svg rename to actions/22/transform-shear-down.svg diff --git a/actions/22x22-light/transform-shear-left.svg b/actions/22/transform-shear-left.svg similarity index 100% rename from actions/22x22-light/transform-shear-left.svg rename to actions/22/transform-shear-left.svg diff --git a/actions/22x22-light/transform-shear-right.svg b/actions/22/transform-shear-right.svg similarity index 100% rename from actions/22x22-light/transform-shear-right.svg rename to actions/22/transform-shear-right.svg diff --git a/actions/22x22-light/transform-shear-up.svg b/actions/22/transform-shear-up.svg similarity index 100% rename from actions/22x22-light/transform-shear-up.svg rename to actions/22/transform-shear-up.svg diff --git a/actions/22x22-light/transform-skew-horizontal.svg b/actions/22/transform-skew-horizontal.svg similarity index 100% rename from actions/22x22-light/transform-skew-horizontal.svg rename to actions/22/transform-skew-horizontal.svg diff --git a/actions/22x22-light/transform-skew-vertical.svg b/actions/22/transform-skew-vertical.svg similarity index 100% rename from actions/22x22-light/transform-skew-vertical.svg rename to actions/22/transform-skew-vertical.svg diff --git a/actions/22x22-light/trash-empty.svg b/actions/22/trash-empty.svg similarity index 100% rename from actions/22x22-light/trash-empty.svg rename to actions/22/trash-empty.svg diff --git a/actions/22x22-light/turtle-blue.svg b/actions/22/turtle-blue.svg similarity index 100% rename from actions/22x22-light/turtle-blue.svg rename to actions/22/turtle-blue.svg diff --git a/actions/22x22-light/turtle-grey.svg b/actions/22/turtle-grey.svg similarity index 100% rename from actions/22x22-light/turtle-grey.svg rename to actions/22/turtle-grey.svg diff --git a/actions/22x22-light/underexposure.svg b/actions/22/underexposure.svg similarity index 100% rename from actions/22x22-light/underexposure.svg rename to actions/22/underexposure.svg diff --git a/actions/22x22-light/undo.svg b/actions/22/undo.svg similarity index 100% rename from actions/22x22-light/undo.svg rename to actions/22/undo.svg diff --git a/actions/22x22-light/up.svg b/actions/22/up.svg similarity index 100% rename from actions/22x22-light/up.svg rename to actions/22/up.svg diff --git a/actions/22x22-light/upcomingevents-amarok.svg b/actions/22/upcomingevents-amarok.svg similarity index 100% rename from actions/22x22-light/upcomingevents-amarok.svg rename to actions/22/upcomingevents-amarok.svg diff --git a/actions/22x22-light/upindicator.svg b/actions/22/upindicator.svg similarity index 100% rename from actions/22x22-light/upindicator.svg rename to actions/22/upindicator.svg diff --git a/actions/22x22-light/upload-media.svg b/actions/22/upload-media.svg similarity index 100% rename from actions/22x22-light/upload-media.svg rename to actions/22/upload-media.svg diff --git a/actions/22x22-light/user-group-delete.svg b/actions/22/user-group-delete.svg similarity index 100% rename from actions/22x22-light/user-group-delete.svg rename to actions/22/user-group-delete.svg diff --git a/actions/22x22-light/user-group-new.svg b/actions/22/user-group-new.svg similarity index 100% rename from actions/22x22-light/user-group-new.svg rename to actions/22/user-group-new.svg diff --git a/actions/22x22-light/user-group-properties.svg b/actions/22/user-group-properties.svg similarity index 100% rename from actions/22x22-light/user-group-properties.svg rename to actions/22/user-group-properties.svg diff --git a/actions/22x22-light/user-identity.svg b/actions/22/user-identity.svg similarity index 100% rename from actions/22x22-light/user-identity.svg rename to actions/22/user-identity.svg diff --git a/actions/22x22-light/user-properties.svg b/actions/22/user-properties.svg similarity index 100% rename from actions/22x22-light/user-properties.svg rename to actions/22/user-properties.svg diff --git a/actions/22x22-light/utilities.svg b/actions/22/utilities.svg similarity index 100% rename from actions/22x22-light/utilities.svg rename to actions/22/utilities.svg diff --git a/actions/22x22-light/videoclip-amarok.svg b/actions/22/videoclip-amarok.svg similarity index 100% rename from actions/22x22-light/videoclip-amarok.svg rename to actions/22/videoclip-amarok.svg diff --git a/actions/22x22-light/view-bank-account-checking.svg b/actions/22/view-bank-account-checking.svg similarity index 100% rename from actions/22x22-light/view-bank-account-checking.svg rename to actions/22/view-bank-account-checking.svg diff --git a/actions/22x22-light/view-bank-account-savings.svg b/actions/22/view-bank-account-savings.svg similarity index 100% rename from actions/22x22-light/view-bank-account-savings.svg rename to actions/22/view-bank-account-savings.svg diff --git a/actions/22x22-light/view-bank-account.svg b/actions/22/view-bank-account.svg similarity index 100% rename from actions/22x22-light/view-bank-account.svg rename to actions/22/view-bank-account.svg diff --git a/actions/22x22-light/view-bank.svg b/actions/22/view-bank.svg similarity index 100% rename from actions/22x22-light/view-bank.svg rename to actions/22/view-bank.svg diff --git a/actions/22x22-light/view-barcode-add.svg b/actions/22/view-barcode-add.svg similarity index 100% rename from actions/22x22-light/view-barcode-add.svg rename to actions/22/view-barcode-add.svg diff --git a/actions/22x22-light/view-barcode.svg b/actions/22/view-barcode.svg similarity index 100% rename from actions/22x22-light/view-barcode.svg rename to actions/22/view-barcode.svg diff --git a/actions/22x22-light/view-calendar-agenda.svg b/actions/22/view-calendar-agenda.svg similarity index 100% rename from actions/22x22-light/view-calendar-agenda.svg rename to actions/22/view-calendar-agenda.svg diff --git a/actions/22x22-light/view-calendar-birthday.svg b/actions/22/view-calendar-birthday.svg similarity index 100% rename from actions/22x22-light/view-calendar-birthday.svg rename to actions/22/view-calendar-birthday.svg diff --git a/actions/22x22-light/view-calendar-day.svg b/actions/22/view-calendar-day.svg similarity index 100% rename from actions/22x22-light/view-calendar-day.svg rename to actions/22/view-calendar-day.svg diff --git a/actions/22x22-light/view-calendar-holiday.svg b/actions/22/view-calendar-holiday.svg similarity index 100% rename from actions/22x22-light/view-calendar-holiday.svg rename to actions/22/view-calendar-holiday.svg diff --git a/actions/22x22-light/view-calendar-journal.svg b/actions/22/view-calendar-journal.svg similarity index 100% rename from actions/22x22-light/view-calendar-journal.svg rename to actions/22/view-calendar-journal.svg diff --git a/actions/22x22-light/view-calendar-list.svg b/actions/22/view-calendar-list.svg similarity index 100% rename from actions/22x22-light/view-calendar-list.svg rename to actions/22/view-calendar-list.svg diff --git a/actions/22x22-light/view-calendar-month.svg b/actions/22/view-calendar-month.svg similarity index 100% rename from actions/22x22-light/view-calendar-month.svg rename to actions/22/view-calendar-month.svg diff --git a/actions/22x22-light/view-calendar-special-occasion.svg b/actions/22/view-calendar-special-occasion.svg similarity index 100% rename from actions/22x22-light/view-calendar-special-occasion.svg rename to actions/22/view-calendar-special-occasion.svg diff --git a/actions/22x22-light/view-calendar-tasks.svg b/actions/22/view-calendar-tasks.svg similarity index 100% rename from actions/22x22-light/view-calendar-tasks.svg rename to actions/22/view-calendar-tasks.svg diff --git a/actions/22x22-light/view-calendar-time-spent.svg b/actions/22/view-calendar-time-spent.svg similarity index 100% rename from actions/22x22-light/view-calendar-time-spent.svg rename to actions/22/view-calendar-time-spent.svg diff --git a/actions/22x22-light/view-calendar-timeline.svg b/actions/22/view-calendar-timeline.svg similarity index 100% rename from actions/22x22-light/view-calendar-timeline.svg rename to actions/22/view-calendar-timeline.svg diff --git a/actions/22x22-light/view-calendar-upcoming-days.svg b/actions/22/view-calendar-upcoming-days.svg similarity index 100% rename from actions/22x22-light/view-calendar-upcoming-days.svg rename to actions/22/view-calendar-upcoming-days.svg diff --git a/actions/22x22-light/view-calendar-upcoming-events.svg b/actions/22/view-calendar-upcoming-events.svg similarity index 100% rename from actions/22x22-light/view-calendar-upcoming-events.svg rename to actions/22/view-calendar-upcoming-events.svg diff --git a/actions/22x22-light/view-calendar-wedding-anniversary.svg b/actions/22/view-calendar-wedding-anniversary.svg similarity index 100% rename from actions/22x22-light/view-calendar-wedding-anniversary.svg rename to actions/22/view-calendar-wedding-anniversary.svg diff --git a/actions/22x22-light/view-calendar-week.svg b/actions/22/view-calendar-week.svg similarity index 100% rename from actions/22x22-light/view-calendar-week.svg rename to actions/22/view-calendar-week.svg diff --git a/actions/22x22-light/view-calendar-whatsnext.svg b/actions/22/view-calendar-whatsnext.svg similarity index 100% rename from actions/22x22-light/view-calendar-whatsnext.svg rename to actions/22/view-calendar-whatsnext.svg diff --git a/actions/22x22-light/view-calendar-workweek.svg b/actions/22/view-calendar-workweek.svg similarity index 100% rename from actions/22x22-light/view-calendar-workweek.svg rename to actions/22/view-calendar-workweek.svg diff --git a/actions/22x22-light/view-calendar.svg b/actions/22/view-calendar.svg similarity index 100% rename from actions/22x22-light/view-calendar.svg rename to actions/22/view-calendar.svg diff --git a/actions/22x22-light/view-catalog.svg b/actions/22/view-catalog.svg similarity index 100% rename from actions/22x22-light/view-catalog.svg rename to actions/22/view-catalog.svg diff --git a/actions/22x22-light/view-categories.svg b/actions/22/view-categories.svg similarity index 100% rename from actions/22x22-light/view-categories.svg rename to actions/22/view-categories.svg diff --git a/actions/22x22-light/view-certificate-add.svg b/actions/22/view-certificate-add.svg similarity index 100% rename from actions/22x22-light/view-certificate-add.svg rename to actions/22/view-certificate-add.svg diff --git a/actions/22x22-light/view-certificate-export-secret.svg b/actions/22/view-certificate-export-secret.svg similarity index 100% rename from actions/22x22-light/view-certificate-export-secret.svg rename to actions/22/view-certificate-export-secret.svg diff --git a/actions/22x22-light/view-certificate-export-server.svg b/actions/22/view-certificate-export-server.svg similarity index 100% rename from actions/22x22-light/view-certificate-export-server.svg rename to actions/22/view-certificate-export-server.svg diff --git a/actions/22x22-light/view-certificate-export.svg b/actions/22/view-certificate-export.svg similarity index 100% rename from actions/22x22-light/view-certificate-export.svg rename to actions/22/view-certificate-export.svg diff --git a/actions/22x22-light/view-certificate-import.svg b/actions/22/view-certificate-import.svg similarity index 100% rename from actions/22x22-light/view-certificate-import.svg rename to actions/22/view-certificate-import.svg diff --git a/actions/22x22-light/view-certificate-server-configure.svg b/actions/22/view-certificate-server-configure.svg similarity index 100% rename from actions/22x22-light/view-certificate-server-configure.svg rename to actions/22/view-certificate-server-configure.svg diff --git a/actions/22x22-light/view-certificate-sign.svg b/actions/22/view-certificate-sign.svg similarity index 100% rename from actions/22x22-light/view-certificate-sign.svg rename to actions/22/view-certificate-sign.svg diff --git a/actions/22x22-light/view-certificate.svg b/actions/22/view-certificate.svg similarity index 100% rename from actions/22x22-light/view-certificate.svg rename to actions/22/view-certificate.svg diff --git a/actions/22x22-light/view-choose.svg b/actions/22/view-choose.svg similarity index 100% rename from actions/22x22-light/view-choose.svg rename to actions/22/view-choose.svg diff --git a/actions/22x22-light/view-close.svg b/actions/22/view-close.svg similarity index 100% rename from actions/22x22-light/view-close.svg rename to actions/22/view-close.svg diff --git a/actions/22x22-light/view-conversation-balloon.svg b/actions/22/view-conversation-balloon.svg similarity index 100% rename from actions/22x22-light/view-conversation-balloon.svg rename to actions/22/view-conversation-balloon.svg diff --git a/actions/22x22-light/view-file-columns.svg b/actions/22/view-file-columns.svg similarity index 100% rename from actions/22x22-light/view-file-columns.svg rename to actions/22/view-file-columns.svg diff --git a/actions/22x22-light/view-filter.svg b/actions/22/view-filter.svg similarity index 100% rename from actions/22x22-light/view-filter.svg rename to actions/22/view-filter.svg diff --git a/actions/22x22-light/view-form-action.svg b/actions/22/view-form-action.svg similarity index 100% rename from actions/22x22-light/view-form-action.svg rename to actions/22/view-form-action.svg diff --git a/actions/22x22-light/view-form.svg b/actions/22/view-form.svg similarity index 100% rename from actions/22x22-light/view-form.svg rename to actions/22/view-form.svg diff --git a/actions/22x22-light/view-fullscreen.svg b/actions/22/view-fullscreen.svg similarity index 100% rename from actions/22x22-light/view-fullscreen.svg rename to actions/22/view-fullscreen.svg diff --git a/actions/22x22-light/view-grid.svg b/actions/22/view-grid.svg similarity index 100% rename from actions/22x22-light/view-grid.svg rename to actions/22/view-grid.svg diff --git a/actions/22x22-light/view-group.svg b/actions/22/view-group.svg similarity index 100% rename from actions/22x22-light/view-group.svg rename to actions/22/view-group.svg diff --git a/actions/22x22-light/view-history.svg b/actions/22/view-history.svg similarity index 100% rename from actions/22x22-light/view-history.svg rename to actions/22/view-history.svg diff --git a/actions/22x22-light/view-left-close.svg b/actions/22/view-left-close.svg similarity index 100% rename from actions/22x22-light/view-left-close.svg rename to actions/22/view-left-close.svg diff --git a/actions/22x22-light/view-list-compact.svg b/actions/22/view-list-compact.svg similarity index 100% rename from actions/22x22-light/view-list-compact.svg rename to actions/22/view-list-compact.svg diff --git a/actions/22x22-light/view-list-details.svg b/actions/22/view-list-details.svg similarity index 100% rename from actions/22x22-light/view-list-details.svg rename to actions/22/view-list-details.svg diff --git a/actions/22x22-light/view-list-details2.svg b/actions/22/view-list-details2.svg similarity index 100% rename from actions/22x22-light/view-list-details2.svg rename to actions/22/view-list-details2.svg diff --git a/actions/22x22-light/view-list-icons.svg b/actions/22/view-list-icons.svg similarity index 100% rename from actions/22x22-light/view-list-icons.svg rename to actions/22/view-list-icons.svg diff --git a/actions/22x22-light/view-list-icons2.svg b/actions/22/view-list-icons2.svg similarity index 100% rename from actions/22x22-light/view-list-icons2.svg rename to actions/22/view-list-icons2.svg diff --git a/actions/22x22-light/view-list-text.svg b/actions/22/view-list-text.svg similarity index 100% rename from actions/22x22-light/view-list-text.svg rename to actions/22/view-list-text.svg diff --git a/actions/22x22-light/view-list-tree.svg b/actions/22/view-list-tree.svg similarity index 100% rename from actions/22x22-light/view-list-tree.svg rename to actions/22/view-list-tree.svg diff --git a/actions/22x22-light/view-list.svg b/actions/22/view-list.svg similarity index 100% rename from actions/22x22-light/view-list.svg rename to actions/22/view-list.svg diff --git a/actions/22x22-light/view-media-artist.svg b/actions/22/view-media-artist.svg similarity index 100% rename from actions/22x22-light/view-media-artist.svg rename to actions/22/view-media-artist.svg diff --git a/actions/22x22-light/view-media-equalizer.svg b/actions/22/view-media-equalizer.svg similarity index 100% rename from actions/22x22-light/view-media-equalizer.svg rename to actions/22/view-media-equalizer.svg diff --git a/actions/22x22-light/view-media-lyrics.svg b/actions/22/view-media-lyrics.svg similarity index 100% rename from actions/22x22-light/view-media-lyrics.svg rename to actions/22/view-media-lyrics.svg diff --git a/actions/22x22-light/view-media-playlist.svg b/actions/22/view-media-playlist.svg similarity index 100% rename from actions/22x22-light/view-media-playlist.svg rename to actions/22/view-media-playlist.svg diff --git a/actions/22x22-light/view-media-visualization.svg b/actions/22/view-media-visualization.svg similarity index 100% rename from actions/22x22-light/view-media-visualization.svg rename to actions/22/view-media-visualization.svg diff --git a/actions/22x22-light/view-multiple-objects.svg b/actions/22/view-multiple-objects.svg similarity index 100% rename from actions/22x22-light/view-multiple-objects.svg rename to actions/22/view-multiple-objects.svg diff --git a/actions/22x22-light/view-object-histogram-linear.svg b/actions/22/view-object-histogram-linear.svg similarity index 100% rename from actions/22x22-light/view-object-histogram-linear.svg rename to actions/22/view-object-histogram-linear.svg diff --git a/actions/22x22-light/view-object-histogram-logarithmic.svg b/actions/22/view-object-histogram-logarithmic.svg similarity index 100% rename from actions/22x22-light/view-object-histogram-logarithmic.svg rename to actions/22/view-object-histogram-logarithmic.svg diff --git a/actions/22x22-light/view-pim-calendar.svg b/actions/22/view-pim-calendar.svg similarity index 100% rename from actions/22x22-light/view-pim-calendar.svg rename to actions/22/view-pim-calendar.svg diff --git a/actions/22x22-light/view-pim-contacts.svg b/actions/22/view-pim-contacts.svg similarity index 100% rename from actions/22x22-light/view-pim-contacts.svg rename to actions/22/view-pim-contacts.svg diff --git a/actions/22x22-light/view-pim-journal.svg b/actions/22/view-pim-journal.svg similarity index 100% rename from actions/22x22-light/view-pim-journal.svg rename to actions/22/view-pim-journal.svg diff --git a/actions/22x22-light/view-pim-mail.svg b/actions/22/view-pim-mail.svg similarity index 100% rename from actions/22x22-light/view-pim-mail.svg rename to actions/22/view-pim-mail.svg diff --git a/actions/22x22-light/view-pim-news.svg b/actions/22/view-pim-news.svg similarity index 100% rename from actions/22x22-light/view-pim-news.svg rename to actions/22/view-pim-news.svg diff --git a/actions/22x22-light/view-pim-notes.svg b/actions/22/view-pim-notes.svg similarity index 100% rename from actions/22x22-light/view-pim-notes.svg rename to actions/22/view-pim-notes.svg diff --git a/actions/22x22-light/view-pim-tasks-pending.svg b/actions/22/view-pim-tasks-pending.svg similarity index 100% rename from actions/22x22-light/view-pim-tasks-pending.svg rename to actions/22/view-pim-tasks-pending.svg diff --git a/actions/22x22-light/view-pim-tasks.svg b/actions/22/view-pim-tasks.svg similarity index 100% rename from actions/22x22-light/view-pim-tasks.svg rename to actions/22/view-pim-tasks.svg diff --git a/actions/22x22-light/view-presentation.svg b/actions/22/view-presentation.svg similarity index 100% rename from actions/22x22-light/view-presentation.svg rename to actions/22/view-presentation.svg diff --git a/actions/22x22-light/view-preview.svg b/actions/22/view-preview.svg similarity index 100% rename from actions/22x22-light/view-preview.svg rename to actions/22/view-preview.svg diff --git a/actions/22x22-light/view-process-all-tree.svg b/actions/22/view-process-all-tree.svg similarity index 100% rename from actions/22x22-light/view-process-all-tree.svg rename to actions/22/view-process-all-tree.svg diff --git a/actions/22x22-light/view-process-all.svg b/actions/22/view-process-all.svg similarity index 100% rename from actions/22x22-light/view-process-all.svg rename to actions/22/view-process-all.svg diff --git a/actions/22x22-light/view-process-own.svg b/actions/22/view-process-own.svg similarity index 100% rename from actions/22x22-light/view-process-own.svg rename to actions/22/view-process-own.svg diff --git a/actions/22x22-light/view-process-system.svg b/actions/22/view-process-system.svg similarity index 100% rename from actions/22x22-light/view-process-system.svg rename to actions/22/view-process-system.svg diff --git a/actions/22x22-light/view-process-tree.svg b/actions/22/view-process-tree.svg similarity index 100% rename from actions/22x22-light/view-process-tree.svg rename to actions/22/view-process-tree.svg diff --git a/actions/22x22-light/view-process-users.svg b/actions/22/view-process-users.svg similarity index 100% rename from actions/22x22-light/view-process-users.svg rename to actions/22/view-process-users.svg diff --git a/actions/22x22-light/view-readermode-active.svg b/actions/22/view-readermode-active.svg similarity index 100% rename from actions/22x22-light/view-readermode-active.svg rename to actions/22/view-readermode-active.svg diff --git a/actions/22x22-light/view-readermode.svg b/actions/22/view-readermode.svg similarity index 100% rename from actions/22x22-light/view-readermode.svg rename to actions/22/view-readermode.svg diff --git a/actions/22x22-light/view-refresh.svg b/actions/22/view-refresh.svg similarity index 100% rename from actions/22x22-light/view-refresh.svg rename to actions/22/view-refresh.svg diff --git a/actions/22x22-light/view-resource-calendar.svg b/actions/22/view-resource-calendar.svg similarity index 100% rename from actions/22x22-light/view-resource-calendar.svg rename to actions/22/view-resource-calendar.svg diff --git a/actions/22x22-light/view-restore.svg b/actions/22/view-restore.svg similarity index 100% rename from actions/22x22-light/view-restore.svg rename to actions/22/view-restore.svg diff --git a/actions/22x22-light/view-right-close.svg b/actions/22/view-right-close.svg similarity index 100% rename from actions/22x22-light/view-right-close.svg rename to actions/22/view-right-close.svg diff --git a/actions/22x22-light/view-right-new.svg b/actions/22/view-right-new.svg similarity index 100% rename from actions/22x22-light/view-right-new.svg rename to actions/22/view-right-new.svg diff --git a/actions/22x22-light/view-services-scripted-amarok.svg b/actions/22/view-services-scripted-amarok.svg similarity index 100% rename from actions/22x22-light/view-services-scripted-amarok.svg rename to actions/22/view-services-scripted-amarok.svg diff --git a/actions/22x22-light/view-sidetree.svg b/actions/22/view-sidetree.svg similarity index 100% rename from actions/22x22-light/view-sidetree.svg rename to actions/22/view-sidetree.svg diff --git a/actions/22x22-light/view-sort-ascending.svg b/actions/22/view-sort-ascending.svg similarity index 100% rename from actions/22x22-light/view-sort-ascending.svg rename to actions/22/view-sort-ascending.svg diff --git a/actions/22x22-light/view-sort-descending.svg b/actions/22/view-sort-descending.svg similarity index 100% rename from actions/22x22-light/view-sort-descending.svg rename to actions/22/view-sort-descending.svg diff --git a/actions/22x22-light/view-split-left-right.svg b/actions/22/view-split-left-right.svg similarity index 100% rename from actions/22x22-light/view-split-left-right.svg rename to actions/22/view-split-left-right.svg diff --git a/actions/22x22-light/view-split-top-bottom.svg b/actions/22/view-split-top-bottom.svg similarity index 100% rename from actions/22x22-light/view-split-top-bottom.svg rename to actions/22/view-split-top-bottom.svg diff --git a/actions/22x22-light/view-statistics.svg b/actions/22/view-statistics.svg similarity index 100% rename from actions/22x22-light/view-statistics.svg rename to actions/22/view-statistics.svg diff --git a/actions/22x22-light/view-table-of-contents-ltr.svg b/actions/22/view-table-of-contents-ltr.svg similarity index 100% rename from actions/22x22-light/view-table-of-contents-ltr.svg rename to actions/22/view-table-of-contents-ltr.svg diff --git a/actions/22x22-light/view-table-of-contents-rtl.svg b/actions/22/view-table-of-contents-rtl.svg similarity index 100% rename from actions/22x22-light/view-table-of-contents-rtl.svg rename to actions/22/view-table-of-contents-rtl.svg diff --git a/actions/22x22-light/view-task-add.svg b/actions/22/view-task-add.svg similarity index 100% rename from actions/22x22-light/view-task-add.svg rename to actions/22/view-task-add.svg diff --git a/actions/22x22-light/view-task-child-add.svg b/actions/22/view-task-child-add.svg similarity index 100% rename from actions/22x22-light/view-task-child-add.svg rename to actions/22/view-task-child-add.svg diff --git a/actions/22x22-light/view-task-child.svg b/actions/22/view-task-child.svg similarity index 100% rename from actions/22x22-light/view-task-child.svg rename to actions/22/view-task-child.svg diff --git a/actions/22x22-light/view-task.svg b/actions/22/view-task.svg similarity index 100% rename from actions/22x22-light/view-task.svg rename to actions/22/view-task.svg diff --git a/actions/22x22-light/view-time-schedule-baselined-add.svg b/actions/22/view-time-schedule-baselined-add.svg similarity index 100% rename from actions/22x22-light/view-time-schedule-baselined-add.svg rename to actions/22/view-time-schedule-baselined-add.svg diff --git a/actions/22x22-light/view-time-schedule-baselined-remove.svg b/actions/22/view-time-schedule-baselined-remove.svg similarity index 100% rename from actions/22x22-light/view-time-schedule-baselined-remove.svg rename to actions/22/view-time-schedule-baselined-remove.svg diff --git a/actions/22x22-light/view-time-schedule-baselined.svg b/actions/22/view-time-schedule-baselined.svg similarity index 100% rename from actions/22x22-light/view-time-schedule-baselined.svg rename to actions/22/view-time-schedule-baselined.svg diff --git a/actions/22x22-light/view-time-schedule-calculus.svg b/actions/22/view-time-schedule-calculus.svg similarity index 100% rename from actions/22x22-light/view-time-schedule-calculus.svg rename to actions/22/view-time-schedule-calculus.svg diff --git a/actions/22x22-light/view-time-schedule-child-insert.svg b/actions/22/view-time-schedule-child-insert.svg similarity index 100% rename from actions/22x22-light/view-time-schedule-child-insert.svg rename to actions/22/view-time-schedule-child-insert.svg diff --git a/actions/22x22-light/view-time-schedule-edit.svg b/actions/22/view-time-schedule-edit.svg similarity index 100% rename from actions/22x22-light/view-time-schedule-edit.svg rename to actions/22/view-time-schedule-edit.svg diff --git a/actions/22x22-light/view-time-schedule-insert.svg b/actions/22/view-time-schedule-insert.svg similarity index 100% rename from actions/22x22-light/view-time-schedule-insert.svg rename to actions/22/view-time-schedule-insert.svg diff --git a/actions/22x22-light/view-time-schedule.svg b/actions/22/view-time-schedule.svg similarity index 100% rename from actions/22x22-light/view-time-schedule.svg rename to actions/22/view-time-schedule.svg diff --git a/actions/22x22-light/view-web-browser-dom-tree.svg b/actions/22/view-web-browser-dom-tree.svg similarity index 100% rename from actions/22x22-light/view-web-browser-dom-tree.svg rename to actions/22/view-web-browser-dom-tree.svg diff --git a/actions/22x22-light/view_choose.svg b/actions/22/view_choose.svg similarity index 100% rename from actions/22x22-light/view_choose.svg rename to actions/22/view_choose.svg diff --git a/actions/22x22-light/viewimage.svg b/actions/22/viewimage.svg similarity index 100% rename from actions/22x22-light/viewimage.svg rename to actions/22/viewimage.svg diff --git a/actions/22x22-light/viewmag+.svg b/actions/22/viewmag+.svg similarity index 100% rename from actions/22x22-light/viewmag+.svg rename to actions/22/viewmag+.svg diff --git a/actions/22x22-light/viewmag-.svg b/actions/22/viewmag-.svg similarity index 100% rename from actions/22x22-light/viewmag-.svg rename to actions/22/viewmag-.svg diff --git a/actions/22x22-light/viewmag1.svg b/actions/22/viewmag1.svg similarity index 100% rename from actions/22x22-light/viewmag1.svg rename to actions/22/viewmag1.svg diff --git a/actions/22x22-light/viewmagfit.svg b/actions/22/viewmagfit.svg similarity index 100% rename from actions/22x22-light/viewmagfit.svg rename to actions/22/viewmagfit.svg diff --git a/actions/22x22-light/visibility.svg b/actions/22/visibility.svg similarity index 100% rename from actions/22x22-light/visibility.svg rename to actions/22/visibility.svg diff --git a/actions/22x22-light/whitebalance.svg b/actions/22/whitebalance.svg similarity index 100% rename from actions/22x22-light/whitebalance.svg rename to actions/22/whitebalance.svg diff --git a/actions/22x22-light/window-close.svg b/actions/22/window-close.svg similarity index 100% rename from actions/22x22-light/window-close.svg rename to actions/22/window-close.svg diff --git a/actions/22x22-light/window-duplicate.svg b/actions/22/window-duplicate.svg similarity index 100% rename from actions/22x22-light/window-duplicate.svg rename to actions/22/window-duplicate.svg diff --git a/actions/22x22-light/window-fullscreen.svg b/actions/22/window-fullscreen.svg similarity index 100% rename from actions/22x22-light/window-fullscreen.svg rename to actions/22/window-fullscreen.svg diff --git a/actions/22x22-light/window-new.svg b/actions/22/window-new.svg similarity index 100% rename from actions/22x22-light/window-new.svg rename to actions/22/window-new.svg diff --git a/actions/22x22-light/window-next.svg b/actions/22/window-next.svg similarity index 100% rename from actions/22x22-light/window-next.svg rename to actions/22/window-next.svg diff --git a/actions/22x22-light/window-previous.svg b/actions/22/window-previous.svg similarity index 100% rename from actions/22x22-light/window-previous.svg rename to actions/22/window-previous.svg diff --git a/actions/22x22-light/window.svg b/actions/22/window.svg similarity index 100% rename from actions/22x22-light/window.svg rename to actions/22/window.svg diff --git a/actions/22x22-light/window_fullscreen.svg b/actions/22/window_fullscreen.svg similarity index 100% rename from actions/22x22-light/window_fullscreen.svg rename to actions/22/window_fullscreen.svg diff --git a/actions/22x22-light/window_new.svg b/actions/22/window_new.svg similarity index 100% rename from actions/22x22-light/window_new.svg rename to actions/22/window_new.svg diff --git a/actions/22x22-light/window_nofullscreen.svg b/actions/22/window_nofullscreen.svg similarity index 100% rename from actions/22x22-light/window_nofullscreen.svg rename to actions/22/window_nofullscreen.svg diff --git a/actions/22x22-light/x-clementine-artist.svg b/actions/22/x-clementine-artist.svg similarity index 100% rename from actions/22x22-light/x-clementine-artist.svg rename to actions/22/x-clementine-artist.svg diff --git a/actions/22x22-light/x-clementine-shuffle.svg b/actions/22/x-clementine-shuffle.svg similarity index 100% rename from actions/22x22-light/x-clementine-shuffle.svg rename to actions/22/x-clementine-shuffle.svg diff --git a/actions/22x22-light/x-shape-connection.svg b/actions/22/x-shape-connection.svg similarity index 100% rename from actions/22x22-light/x-shape-connection.svg rename to actions/22/x-shape-connection.svg diff --git a/actions/22x22-light/x-shape-formula.svg b/actions/22/x-shape-formula.svg similarity index 100% rename from actions/22x22-light/x-shape-formula.svg rename to actions/22/x-shape-formula.svg diff --git a/actions/22x22-light/x-shape-image.svg b/actions/22/x-shape-image.svg similarity index 100% rename from actions/22x22-light/x-shape-image.svg rename to actions/22/x-shape-image.svg diff --git a/actions/22x22-light/x-shape-text.svg b/actions/22/x-shape-text.svg similarity index 100% rename from actions/22x22-light/x-shape-text.svg rename to actions/22/x-shape-text.svg diff --git a/actions/22x22-light/x-zoom-in.svg b/actions/22/x-zoom-in.svg similarity index 100% rename from actions/22x22-light/x-zoom-in.svg rename to actions/22/x-zoom-in.svg diff --git a/actions/22x22-light/x-zoom-out.svg b/actions/22/x-zoom-out.svg similarity index 100% rename from actions/22x22-light/x-zoom-out.svg rename to actions/22/x-zoom-out.svg diff --git a/actions/22x22-light/xfce-system-exit.svg b/actions/22/xfce-system-exit.svg similarity index 100% rename from actions/22x22-light/xfce-system-exit.svg rename to actions/22/xfce-system-exit.svg diff --git a/actions/22x22-light/xfce4-appfinder.svg b/actions/22/xfce4-appfinder.svg similarity index 100% rename from actions/22x22-light/xfce4-appfinder.svg rename to actions/22/xfce4-appfinder.svg diff --git a/actions/22x22-light/xml-attribute-delete.svg b/actions/22/xml-attribute-delete.svg similarity index 100% rename from actions/22x22-light/xml-attribute-delete.svg rename to actions/22/xml-attribute-delete.svg diff --git a/actions/22x22-light/xml-element-new.svg b/actions/22/xml-element-new.svg similarity index 100% rename from actions/22x22-light/xml-element-new.svg rename to actions/22/xml-element-new.svg diff --git a/actions/22x22-light/xml-node-delete.svg b/actions/22/xml-node-delete.svg similarity index 100% rename from actions/22x22-light/xml-node-delete.svg rename to actions/22/xml-node-delete.svg diff --git a/actions/22x22-light/xml-node-duplicate.svg b/actions/22/xml-node-duplicate.svg similarity index 100% rename from actions/22x22-light/xml-node-duplicate.svg rename to actions/22/xml-node-duplicate.svg diff --git a/actions/22x22-light/xml-text-new.svg b/actions/22/xml-text-new.svg similarity index 100% rename from actions/22x22-light/xml-text-new.svg rename to actions/22/xml-text-new.svg diff --git a/actions/22x22-light/xy-curve.svg b/actions/22/xy-curve.svg similarity index 100% rename from actions/22x22-light/xy-curve.svg rename to actions/22/xy-curve.svg diff --git a/actions/22x22-light/xy-equation-curve.svg b/actions/22/xy-equation-curve.svg similarity index 100% rename from actions/22x22-light/xy-equation-curve.svg rename to actions/22/xy-equation-curve.svg diff --git a/actions/22x22-light/xy-fit-curve.svg b/actions/22/xy-fit-curve.svg similarity index 100% rename from actions/22x22-light/xy-fit-curve.svg rename to actions/22/xy-fit-curve.svg diff --git a/actions/22x22-light/y-zoom-in.svg b/actions/22/y-zoom-in.svg similarity index 100% rename from actions/22x22-light/y-zoom-in.svg rename to actions/22/y-zoom-in.svg diff --git a/actions/22x22-light/y-zoom-out.svg b/actions/22/y-zoom-out.svg similarity index 100% rename from actions/22x22-light/y-zoom-out.svg rename to actions/22/y-zoom-out.svg diff --git a/actions/22x22-light/zoom-1-to-2.svg b/actions/22/zoom-1-to-2.svg similarity index 100% rename from actions/22x22-light/zoom-1-to-2.svg rename to actions/22/zoom-1-to-2.svg diff --git a/actions/22x22-light/zoom-2-to-1.svg b/actions/22/zoom-2-to-1.svg similarity index 100% rename from actions/22x22-light/zoom-2-to-1.svg rename to actions/22/zoom-2-to-1.svg diff --git a/actions/22x22-light/zoom-best-fit.svg b/actions/22/zoom-best-fit.svg similarity index 100% rename from actions/22x22-light/zoom-best-fit.svg rename to actions/22/zoom-best-fit.svg diff --git a/actions/22x22-light/zoom-double-size.svg b/actions/22/zoom-double-size.svg similarity index 100% rename from actions/22x22-light/zoom-double-size.svg rename to actions/22/zoom-double-size.svg diff --git a/actions/22x22-light/zoom-draw.svg b/actions/22/zoom-draw.svg similarity index 100% rename from actions/22x22-light/zoom-draw.svg rename to actions/22/zoom-draw.svg diff --git a/actions/22x22-light/zoom-fit-best.svg b/actions/22/zoom-fit-best.svg similarity index 100% rename from actions/22x22-light/zoom-fit-best.svg rename to actions/22/zoom-fit-best.svg diff --git a/actions/22x22-light/zoom-fit-drawing.svg b/actions/22/zoom-fit-drawing.svg similarity index 100% rename from actions/22x22-light/zoom-fit-drawing.svg rename to actions/22/zoom-fit-drawing.svg diff --git a/actions/22x22-light/zoom-fit-height.svg b/actions/22/zoom-fit-height.svg similarity index 100% rename from actions/22x22-light/zoom-fit-height.svg rename to actions/22/zoom-fit-height.svg diff --git a/actions/22x22-light/zoom-fit-page.svg b/actions/22/zoom-fit-page.svg similarity index 100% rename from actions/22x22-light/zoom-fit-page.svg rename to actions/22/zoom-fit-page.svg diff --git a/actions/22x22-light/zoom-fit-selection.svg b/actions/22/zoom-fit-selection.svg similarity index 100% rename from actions/22x22-light/zoom-fit-selection.svg rename to actions/22/zoom-fit-selection.svg diff --git a/actions/22x22-light/zoom-fit-width.svg b/actions/22/zoom-fit-width.svg similarity index 100% rename from actions/22x22-light/zoom-fit-width.svg rename to actions/22/zoom-fit-width.svg diff --git a/actions/22x22-light/zoom-fit.svg b/actions/22/zoom-fit.svg similarity index 100% rename from actions/22x22-light/zoom-fit.svg rename to actions/22/zoom-fit.svg diff --git a/actions/22x22-light/zoom-half-size.svg b/actions/22/zoom-half-size.svg similarity index 100% rename from actions/22x22-light/zoom-half-size.svg rename to actions/22/zoom-half-size.svg diff --git a/actions/22x22-light/zoom-in-x.svg b/actions/22/zoom-in-x.svg similarity index 100% rename from actions/22x22-light/zoom-in-x.svg rename to actions/22/zoom-in-x.svg diff --git a/actions/22x22-light/zoom-in-y.svg b/actions/22/zoom-in-y.svg similarity index 100% rename from actions/22x22-light/zoom-in-y.svg rename to actions/22/zoom-in-y.svg diff --git a/actions/22x22-light/zoom-in.svg b/actions/22/zoom-in.svg similarity index 100% rename from actions/22x22-light/zoom-in.svg rename to actions/22/zoom-in.svg diff --git a/actions/22x22-light/zoom-next.svg b/actions/22/zoom-next.svg similarity index 100% rename from actions/22x22-light/zoom-next.svg rename to actions/22/zoom-next.svg diff --git a/actions/22x22-light/zoom-original.svg b/actions/22/zoom-original.svg similarity index 100% rename from actions/22x22-light/zoom-original.svg rename to actions/22/zoom-original.svg diff --git a/actions/22x22-light/zoom-out-x.svg b/actions/22/zoom-out-x.svg similarity index 100% rename from actions/22x22-light/zoom-out-x.svg rename to actions/22/zoom-out-x.svg diff --git a/actions/22x22-light/zoom-out-y.svg b/actions/22/zoom-out-y.svg similarity index 100% rename from actions/22x22-light/zoom-out-y.svg rename to actions/22/zoom-out-y.svg diff --git a/actions/22x22-light/zoom-out.svg b/actions/22/zoom-out.svg similarity index 100% rename from actions/22x22-light/zoom-out.svg rename to actions/22/zoom-out.svg diff --git a/actions/22x22-light/zoom-previous.svg b/actions/22/zoom-previous.svg similarity index 100% rename from actions/22x22-light/zoom-previous.svg rename to actions/22/zoom-previous.svg diff --git a/actions/22x22-light/zoom-select-fit.svg b/actions/22/zoom-select-fit.svg similarity index 100% rename from actions/22x22-light/zoom-select-fit.svg rename to actions/22/zoom-select-fit.svg diff --git a/actions/22x22-light/zoom-select-x.svg b/actions/22/zoom-select-x.svg similarity index 100% rename from actions/22x22-light/zoom-select-x.svg rename to actions/22/zoom-select-x.svg diff --git a/actions/22x22-light/zoom-select-y.svg b/actions/22/zoom-select-y.svg similarity index 100% rename from actions/22x22-light/zoom-select-y.svg rename to actions/22/zoom-select-y.svg diff --git a/actions/22x22-light/zoom-select.svg b/actions/22/zoom-select.svg similarity index 100% rename from actions/22x22-light/zoom-select.svg rename to actions/22/zoom-select.svg diff --git a/actions/22x22-light/zoom.svg b/actions/22/zoom.svg similarity index 100% rename from actions/22x22-light/zoom.svg rename to actions/22/zoom.svg