Reorganized images in subfolders

As per @daenyth’s comment:
https://github.com/Cockatrice/Cockatrice/pull/792#issuecomment-76593730

cockatrice/cockatrice.qrc

@@ -1,62 +1,56 @@
 <RCC>
   <qresource prefix="/" >
     <file>resources/back.svg</file>
-    <file>resources/lock.svg</file>
-    <file>resources/icon_delete.svg</file>
-    <file>resources/icon_tab_changed.svg</file>
-    <file>resources/icon_config_general.svg</file>
-    <file>resources/icon_config_appearance.svg</file>
-    <file>resources/icon_config_interface.svg</file>
-    <file>resources/icon_config_messages.svg</file>
-    <file>resources/icon_config_deckeditor.svg</file>
-    <file>resources/icon_config_sound.svg</file>
-    <file>resources/phases/icon_phase_untap.svg</file>
-    <file>resources/phases/icon_phase_upkeep.svg</file>
-    <file>resources/phases/icon_phase_draw.svg</file>
-    <file>resources/phases/icon_phase_main1.svg</file>
-    <file>resources/phases/icon_phase_combat_start.svg</file>
-    <file>resources/phases/icon_phase_combat_attackers.svg</file>
-    <file>resources/phases/icon_phase_combat_blockers.svg</file>
-    <file>resources/phases/icon_phase_combat_damage.svg</file>
-    <file>resources/phases/icon_phase_combat_end.svg</file>
-    <file>resources/phases/icon_phase_main2.svg</file>
-    <file>resources/phases/icon_phase_cleanup.svg</file>
-    <file>resources/phases/icon_phase_nextturn.svg</file>
-    <file>resources/icon_settings.svg</file>
+    <file>resources/cockatrice.svg</file>
     <file>resources/hand.svg</file>
-    <file>resources/pencil.svg</file>
-    <file>resources/icon_search_black.svg</file>
-    <file>resources/icon_clearsearch.svg</file>
-    <file>resources/icon_update.png</file>
-    <file>resources/icon_view.svg</file>
     <file>resources/hr.jpg</file>
-    <file alias="resources/appicon.svg">resources/cockatrice.svg</file>
-    
-    <file>resources/add_to_sideboard.svg</file>
-    <file>resources/decrement.svg</file>
-    <file>resources/increment.svg</file>
-    <file>resources/remove_row.svg</file>
-    <file>resources/arrow_left_green.svg</file>
-    <file>resources/arrow_right_green.svg</file>
 
-    <file>resources/arrow_top_green.svg</file>
-    <file>resources/arrow_up_green.svg</file>
-    <file>resources/arrow_down_green.svg</file>
-    <file>resources/arrow_bottom_green.svg</file>
-    
-    <file>resources/icon_ready_start.svg</file>
-    <file>resources/icon_not_ready_start.svg</file>
-    <file>resources/icon_conceded.svg</file>
-    <file>resources/icon_player.svg</file>
-    <file>resources/icon_spectator.svg</file>
+    <file>resources/icons/arrow_bottom_green.svg</file>
+    <file>resources/icons/arrow_down_green.svg</file>
+    <file>resources/icons/arrow_left_green.svg</file>
+    <file>resources/icons/arrow_right_blue.svg</file>
+    <file>resources/icons/arrow_right_green.svg</file>
+    <file>resources/icons/arrow_top_green.svg</file>
+    <file>resources/icons/arrow_up_green.svg</file>
+    <file>resources/icons/clearsearch.svg</file>
+    <file>resources/icons/conceded.svg</file>
+    <file>resources/icons/decrement.svg</file>
+    <file>resources/icons/delete.svg</file>
+    <file>resources/icons/increment.svg</file>
+    <file>resources/icons/lock.svg</file>
+    <file>resources/icons/not_ready_start.svg</file>
+    <file>resources/icons/pencil.svg</file>
+    <file>resources/icons/player.svg</file>
+    <file>resources/icons/ready_start.svg</file>
+    <file>resources/icons/remove_row.svg</file>
+    <file>resources/icons/search.svg</file>
+    <file>resources/icons/settings.svg</file>
+    <file>resources/icons/spectator.svg</file>
+    <file>resources/icons/tab_changed.svg</file>
+    <file>resources/icons/update.png</file>
+    <file>resources/icons/view.svg</file>
 
-    <file>resources/replay_start.svg</file>
-    <file>resources/replay_fastforward.svg</file>
-    <file>resources/replay_pause.svg</file>
+    <file>resources/config/general.svg</file>
+    <file>resources/config/appearance.svg</file>
+    <file>resources/config/interface.svg</file>
+    <file>resources/config/messages.svg</file>
+    <file>resources/config/deckeditor.svg</file>
+    <file>resources/config/sound.svg</file>
 
-    <file>resources/genders/male.svg</file>
-    <file>resources/genders/female.svg</file>
-    <file>resources/genders/unknown.svg</file>
+    <file>resources/counters/w.svg</file>
+    <file>resources/counters/w_highlight.svg</file>
+    <file>resources/counters/u.svg</file>
+    <file>resources/counters/u_highlight.svg</file>
+    <file>resources/counters/b.svg</file>
+    <file>resources/counters/b_highlight.svg</file>
+    <file>resources/counters/r.svg</file>
+    <file>resources/counters/r_highlight.svg</file>
+    <file>resources/counters/g.svg</file>
+    <file>resources/counters/g_highlight.svg</file>
+    <file>resources/counters/storm.svg</file>
+    <file>resources/counters/storm_highlight.svg</file>
+    <file>resources/counters/general.svg</file>
+    <file>resources/counters/general_highlight.svg</file>
 
     <file>resources/countries/ad.svg</file>
     <file>resources/countries/ae.svg</file>
@@ -308,20 +302,26 @@
     <file>resources/countries/zm.svg</file>
     <file>resources/countries/zw.svg</file>
 
-    <file>resources/counters/w.svg</file>
-    <file>resources/counters/w_highlight.svg</file>
-    <file>resources/counters/u.svg</file>
-    <file>resources/counters/u_highlight.svg</file>
-    <file>resources/counters/b.svg</file>
-    <file>resources/counters/b_highlight.svg</file>
-    <file>resources/counters/r.svg</file>
-    <file>resources/counters/r_highlight.svg</file>
-    <file>resources/counters/g.svg</file>
-    <file>resources/counters/g_highlight.svg</file>
-    <file>resources/counters/storm.svg</file>
-    <file>resources/counters/storm_highlight.svg</file>
-    <file>resources/counters/general.svg</file>
-    <file>resources/counters/general_highlight.svg</file>
+    <file>resources/genders/male.svg</file>
+    <file>resources/genders/female.svg</file>
+    <file>resources/genders/unknown.svg</file>
+
+    <file>resources/phases/untap.svg</file>
+    <file>resources/phases/upkeep.svg</file>
+    <file>resources/phases/draw.svg</file>
+    <file>resources/phases/main1.svg</file>
+    <file>resources/phases/combat_start.svg</file>
+    <file>resources/phases/combat_attackers.svg</file>
+    <file>resources/phases/combat_blockers.svg</file>
+    <file>resources/phases/combat_damage.svg</file>
+    <file>resources/phases/combat_end.svg</file>
+    <file>resources/phases/main2.svg</file>
+    <file>resources/phases/cleanup.svg</file>
+    <file>resources/phases/nextturn.svg</file>
+
+    <file>resources/replay/start.svg</file>
+    <file>resources/replay/fastforward.svg</file>
+    <file>resources/replay/pause.svg</file>
 
     <file>resources/userlevels/normal.svg</file>
     <file>resources/userlevels/registered.svg</file>
@@ -330,8 +330,5 @@
     <file>resources/userlevels/moderator_buddy.svg</file>
     <file>resources/userlevels/admin.svg</file>
     <file>resources/userlevels/admin_buddy.svg</file>
-
-    <file>resources/news/exclamation_mark.svg</file>
-    <file>resources/news/question_mark.svg</file>
   </qresource>
 </RCC>

cockatrice/resources/news/exclamation_mark.svg

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2858"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="icon_tab_changed.svg">
-  <defs
-     id="defs2860">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2866" />
-    <inkscape:perspective
-       id="perspective2853"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5"
-     inkscape:cx="4.1"
-     inkscape:cy="49.523097"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="949"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2863">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <path
-       style="font-size:253.89010620000001950px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#e50000;fill-opacity:1;stroke:#000000;stroke-width:2.39700006999999982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Century Schoolbook L;-inkscape-font-specification:Century Schoolbook L Medium"
-       d="m 53.225642,1018.5513 c 0.486911,-13.2677 1.704142,-22.64046 4.016877,-30.55249 3.895149,-13.38951 4.138607,-14.48503 4.138607,-19.23224 0,-7.66855 -4.260334,-12.17232 -11.320268,-12.17232 -7.181659,0 -11.441984,4.50377 -11.441984,12.17232 0,3.16481 0.60863,7.18167 1.704135,10.83336 4.868924,16.06746 5.720972,21.30157 6.45134,38.95137 l 6.451293,0 m -3.286511,6.8165 c -6.207884,0 -11.320257,5.1124 -11.320257,11.3204 0,6.2079 5.112373,11.4419 11.198528,11.4419 6.451342,0 11.563724,-5.1124 11.563724,-11.4419 0,-6.208 -5.112382,-11.3204 -11.441995,-11.3204"
-       id="text3838" />
-  </g>
-</svg>

cockatrice/resources/news/question_mark.svg

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
-   height="100"
-   id="svg2858"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="exclamation_mark.svg">
-  <defs
-     id="defs2860">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3795">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3797" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3799" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2866" />
-    <inkscape:perspective
-       id="perspective2853"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3795"
-       id="linearGradient3801"
-       x1="29.834375"
-       y1="999.20284"
-       x2="72.173357"
-       y2="999.20284"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5"
-     inkscape:cx="24.413577"
-     inkscape:cy="49.523097"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="949"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2863">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-952.36218)">
-    <text
-       xml:space="preserve"
-       style="font-size:129.98471069px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e00000;fill-opacity:1;stroke:#000000;stroke-width:1.78699994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Rachana;-inkscape-font-specification:Rachana"
-       x="18.646267"
-       y="1045.775"
-       id="text3791"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3793"
-         x="18.646267"
-         y="1045.775"
-         style="fill:#e00000;fill-opacity:1;stroke-width:1.78699994;stroke-miterlimit:4;stroke-dasharray:none">?</tspan></text>
-  </g>
-</svg>

cockatrice/resources/replay_stop.svg

@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32px"
-   height="32px"
-   id="svg3320"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="replay_stop.svg">
-  <defs
-     id="defs3322">
-    <linearGradient
-       id="linearGradient2237">
-      <stop
-         style="stop-color:#006000;stop-opacity:1;"
-         offset="0"
-         id="stop2239" />
-      <stop
-         style="stop-color:#48ff00;stop-opacity:1;"
-         offset="1"
-         id="stop2241" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3207"
-       id="linearGradient3998"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8996584,0,0,0.8996584,543.08369,-117.97095)"
-       x1="293.33597"
-       y1="423.03891"
-       x2="330.00668"
-       y2="472.74878" />
-    <linearGradient
-       id="linearGradient3207">
-      <stop
-         id="stop3209"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3211"
-         offset="1"
-         style="stop-color:#48ff00;stop-opacity:0;" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.395604"
-     inkscape:cx="12.669812"
-     inkscape:cy="27.464311"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1099"
-     inkscape:window-height="800"
-     inkscape:window-x="128"
-     inkscape:window-y="20"
-     inkscape:window-maximized="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2990" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3325">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#b60000;fill-opacity:1;fill-rule:nonzero;stroke:#3f0000;stroke-opacity:1;stroke-width:0.8;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect2994"
-       width="20.271835"
-       height="20.271835"
-       x="5.8940139"
-       y="5.2983313" />
-  </g>
-</svg>

cockatrice/src/dlg_edit_tokens.cpp

@@ -83,10 +83,10 @@ DlgEditTokens::DlgEditTokens(CardDatabaseModel *_cardDatabaseModel, QWidget *par
     connect(chooseTokenView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, SLOT(tokenSelectionChanged(QModelIndex, QModelIndex)));
     
     QAction *aAddToken = new QAction(tr("Add token"), this);
-    aAddToken->setIcon(QIcon("theme:increment.svg"));
+    aAddToken->setIcon(QIcon("theme:icons/increment.svg"));
     connect(aAddToken, SIGNAL(triggered()), this, SLOT(actAddToken()));
     QAction *aRemoveToken = new QAction(tr("Remove token"), this);
-    aRemoveToken->setIcon(QIcon("theme:decrement.svg"));
+    aRemoveToken->setIcon(QIcon("theme:icons/decrement.svg"));
     connect(aRemoveToken, SIGNAL(triggered()), this, SLOT(actRemoveToken()));
     
     QToolBar *databaseToolBar = new QToolBar;

cockatrice/src/dlg_settings.cpp

@@ -468,10 +468,10 @@ MessagesSettingsPage::MessagesSettingsPage()
         messageList->addItem(settings.value(QString("msg%1").arg(i)).toString());
     
     aAdd = new QAction(this);
-    aAdd->setIcon(QIcon("theme:increment.svg"));
+    aAdd->setIcon(QIcon("theme:icons/increment.svg"));
     connect(aAdd, SIGNAL(triggered()), this, SLOT(actAdd()));
     aRemove = new QAction(this);
-    aRemove->setIcon(QIcon("theme:decrement.svg"));
+    aRemove->setIcon(QIcon("theme:icons/decrement.svg"));
     connect(aRemove, SIGNAL(triggered()), this, SLOT(actRemove()));
 
     QToolBar *messageToolBar = new QToolBar;
@@ -559,7 +559,7 @@ void MessagesSettingsPage::retranslateUi()
 
 SoundSettingsPage::SoundSettingsPage()
 {
-    QIcon deleteIcon("theme:icon_delete.svg");
+    QIcon deleteIcon("theme:icons/delete.svg");
 
     soundEnabledCheckBox.setChecked(settingsCache->getSoundEnabled());
     connect(&soundEnabledCheckBox, SIGNAL(stateChanged(int)), settingsCache, SLOT(setSoundEnabled(int)));
@@ -695,32 +695,32 @@ void DlgSettings::createIcons()
     generalButton = new QListWidgetItem(contentsWidget);
     generalButton->setTextAlignment(Qt::AlignHCenter);
     generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    generalButton->setIcon(QIcon("theme:icon_config_general.svg"));
+    generalButton->setIcon(QIcon("theme:config/general.svg"));
     
     appearanceButton = new QListWidgetItem(contentsWidget);
     appearanceButton->setTextAlignment(Qt::AlignHCenter);
     appearanceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    appearanceButton->setIcon(QIcon("theme:icon_config_appearance.svg"));
+    appearanceButton->setIcon(QIcon("theme:config/appearance.svg"));
     
     userInterfaceButton = new QListWidgetItem(contentsWidget);
     userInterfaceButton->setTextAlignment(Qt::AlignHCenter);
     userInterfaceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    userInterfaceButton->setIcon(QIcon("theme:icon_config_interface.svg"));
+    userInterfaceButton->setIcon(QIcon("theme:config/interface.svg"));
     
     deckEditorButton = new QListWidgetItem(contentsWidget);
     deckEditorButton->setTextAlignment(Qt::AlignHCenter);
     deckEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    deckEditorButton->setIcon(QIcon("theme:icon_config_deckeditor.svg"));
+    deckEditorButton->setIcon(QIcon("theme:config/deckeditor.svg"));
     
     messagesButton = new QListWidgetItem(contentsWidget);
     messagesButton->setTextAlignment(Qt::AlignHCenter);
     messagesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    messagesButton->setIcon(QIcon("theme:icon_config_messages.svg"));
+    messagesButton->setIcon(QIcon("theme:config/messages.svg"));
 
     soundButton = new QListWidgetItem(contentsWidget);
     soundButton->setTextAlignment(Qt::AlignHCenter);
     soundButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    soundButton->setIcon(QIcon("theme:icon_config_sound.svg"));
+    soundButton->setIcon(QIcon("theme:config/sound.svg"));
     
     connect(contentsWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem *)));
 }

cockatrice/src/gameselector.cpp

@@ -60,10 +60,10 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup
     gameListView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
 #endif
     filterButton = new QPushButton;
-    filterButton->setIcon(QIcon("theme:icon_search_black.svg"));
+    filterButton->setIcon(QIcon("theme:icons/search.svg"));
     connect(filterButton, SIGNAL(clicked()), this, SLOT(actSetFilter()));
     clearFilterButton = new QPushButton;
-    clearFilterButton->setIcon(QIcon("theme:icon_clearsearch.svg"));
+    clearFilterButton->setIcon(QIcon("theme:icons/clearsearch.svg"));
     clearFilterButton->setEnabled(true);
     connect(clearFilterButton, SIGNAL(clicked()), this, SLOT(actClearFilter()));
 

cockatrice/src/main.cpp

@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
         MainWindow ui;
         qDebug("main(): MainWindow constructor finished");
 
-        QIcon icon("theme:appicon.svg");
+        QIcon icon("theme:cockatrice.svg");
         ui.setWindowIcon(icon);
 
         ui.show();

cockatrice/src/pixmapgenerator.cpp

@@ -16,7 +16,7 @@ QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name)
     if (pmCache.contains(key))
         return pmCache.value(key);
     
-    QSvgRenderer svg(QString("theme:phases/icon_phase_" + name + ".svg"));
+    QSvgRenderer svg(QString("theme:phases/" + name + ".svg"));
     
     QPixmap pixmap(height, height);
     pixmap.fill(Qt::transparent);
@@ -175,7 +175,7 @@ QPixmap LockPixmapGenerator::generatePixmap(int height)
     if (pmCache.contains(key))
         return pmCache.value(key);
 
-    QSvgRenderer svg(QString("theme:lock.svg"));
+    QSvgRenderer svg(QString("theme:icons/lock.svg"));
     int width = (int) round(height * (double) svg.defaultSize().width() / (double) svg.defaultSize().height());
     QPixmap pixmap(width, height);
     pixmap.fill(Qt::transparent);

cockatrice/src/playerlistwidget.cpp

@@ -51,12 +51,12 @@ bool PlayerListTWI::operator<(const QTreeWidgetItem &other) const
 PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient *_client, TabGame *_game, QWidget *parent)
     : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false)
 {
-    readyIcon = QIcon("theme:icon_ready_start.svg");
-    notReadyIcon = QIcon("theme:icon_not_ready_start.svg");
-    concededIcon = QIcon("theme:icon_conceded.svg");
-    playerIcon = QIcon("theme:icon_player.svg");
-    spectatorIcon = QIcon("theme:icon_spectator.svg");
-    lockIcon = QIcon("theme:lock.svg");
+    readyIcon = QIcon("theme:icons/ready_start.svg");
+    notReadyIcon = QIcon("theme:icons/not_ready_start.svg");
+    concededIcon = QIcon("theme:icons/conceded.svg");
+    playerIcon = QIcon("theme:icons/player.svg");
+    spectatorIcon = QIcon("theme:icons/spectator.svg");
+    lockIcon = QIcon("theme:icons/lock.svg");
     
     if (tabSupervisor) {
         itemDelegate = new PlayerListItemDelegate(this);

cockatrice/src/remotereplaylist_treewidget.cpp

@@ -35,7 +35,7 @@ RemoteReplayList_TreeModel::RemoteReplayList_TreeModel(AbstractClient *_client,
     QFileIconProvider fip;
     dirIcon = fip.icon(QFileIconProvider::Folder);
     fileIcon = fip.icon(QFileIconProvider::File);
-    lockIcon = QIcon("theme:lock.svg");
+    lockIcon = QIcon("theme:icons/lock.svg");
 
     refreshTree();
 }

cockatrice/src/tab_deck_editor.cpp

@@ -51,16 +51,16 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
     : Tab(_tabSupervisor, parent), modified(false)
 {
     aClearFilterAll = new QAction(QString(), this);
-    aClearFilterAll->setIcon(QIcon("theme:icon_clearsearch.svg"));
+    aClearFilterAll->setIcon(QIcon("theme:icons/clearsearch.svg"));
     connect(aClearFilterAll, SIGNAL(triggered()), this, SLOT(actClearFilterAll()));
 
     aClearFilterOne = new QAction(QString(), this);
-    aClearFilterOne->setIcon(QIcon("theme:decrement.svg"));
+    aClearFilterOne->setIcon(QIcon("theme:icons/decrement.svg"));
     connect(aClearFilterOne, SIGNAL(triggered()), this, SLOT(actClearFilterOne()));
 
     searchEdit = new SearchLineEdit;
 #if QT_VERSION >= 0x050300
-    searchEdit->addAction(QIcon("theme:icon_search_black.svg"), QLineEdit::LeadingPosition);
+    searchEdit->addAction(QIcon("theme:icons/search.svg"), QLineEdit::LeadingPosition);
 #endif
     searchEdit->setObjectName("searchEdit");
     
@@ -193,7 +193,7 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
 
     /* Update price
     aUpdatePrices = new QAction(QString(), this);
-    aUpdatePrices->setIcon(QIcon("theme:icon_update.png"));
+    aUpdatePrices->setIcon(QIcon("theme:icons/update.png"));
     connect(aUpdatePrices, SIGNAL(triggered()), this, SLOT(actUpdatePrices()));
     if (!settingsCache->getPriceTagFeature())
         aUpdatePrices->setVisible(false);
@@ -282,19 +282,19 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
     addTabMenu(dbMenu);
 
     aAddCard = new QAction(QString(), this);
-    aAddCard->setIcon(QIcon("theme:arrow_right_green.svg"));
+    aAddCard->setIcon(QIcon("theme:icons/arrow_right_green.svg"));
     connect(aAddCard, SIGNAL(triggered()), this, SLOT(actAddCard()));
     aAddCardToSideboard = new QAction(QString(), this);
-    aAddCardToSideboard->setIcon(QIcon("theme:add_to_sideboard.svg"));
+    aAddCardToSideboard->setIcon(QIcon("theme:icons/arrow_right_blue.svg"));
     connect(aAddCardToSideboard, SIGNAL(triggered()), this, SLOT(actAddCardToSideboard()));
     aRemoveCard = new QAction(QString(), this);
-    aRemoveCard->setIcon(QIcon("theme:remove_row.svg"));
+    aRemoveCard->setIcon(QIcon("theme:icons/remove_row.svg"));
     connect(aRemoveCard, SIGNAL(triggered()), this, SLOT(actRemoveCard()));
     aIncrement = new QAction(QString(), this);
-    aIncrement->setIcon(QIcon("theme:increment.svg"));
+    aIncrement->setIcon(QIcon("theme:icons/increment.svg"));
     connect(aIncrement, SIGNAL(triggered()), this, SLOT(actIncrement()));
     aDecrement = new QAction(QString(), this);
-    aDecrement->setIcon(QIcon("theme:decrement.svg"));
+    aDecrement->setIcon(QIcon("theme:icons/decrement.svg"));
     connect(aDecrement, SIGNAL(triggered()), this, SLOT(actDecrement()));
 
     deckEditToolBar->addAction(aAddCard);

cockatrice/src/tab_deck_storage.cpp

@@ -80,25 +80,25 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_c
     hbox->addWidget(rightGroupBox);
     
     aOpenLocalDeck = new QAction(this);
-    aOpenLocalDeck->setIcon(QIcon("theme:pencil.svg"));
+    aOpenLocalDeck->setIcon(QIcon("theme:icons/pencil.svg"));
     connect(aOpenLocalDeck, SIGNAL(triggered()), this, SLOT(actOpenLocalDeck()));
     aUpload = new QAction(this);
-    aUpload->setIcon(QIcon("theme:arrow_right_green.svg"));
+    aUpload->setIcon(QIcon("theme:icons/arrow_right_green.svg"));
     connect(aUpload, SIGNAL(triggered()), this, SLOT(actUpload()));
     aDeleteLocalDeck = new QAction(this);
-    aDeleteLocalDeck->setIcon(QIcon("theme:remove_row.svg"));
+    aDeleteLocalDeck->setIcon(QIcon("theme:icons/remove_row.svg"));
     connect(aDeleteLocalDeck, SIGNAL(triggered()), this, SLOT(actDeleteLocalDeck()));
     aOpenRemoteDeck = new QAction(this);
-    aOpenRemoteDeck->setIcon(QIcon("theme:pencil.svg"));
+    aOpenRemoteDeck->setIcon(QIcon("theme:icons/pencil.svg"));
     connect(aOpenRemoteDeck, SIGNAL(triggered()), this, SLOT(actOpenRemoteDeck()));
     aDownload = new QAction(this);
-    aDownload->setIcon(QIcon("theme:arrow_left_green.svg"));
+    aDownload->setIcon(QIcon("theme:icons/arrow_left_green.svg"));
     connect(aDownload, SIGNAL(triggered()), this, SLOT(actDownload()));
     aNewFolder = new QAction(this);
     aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewFolder, SIGNAL(triggered()), this, SLOT(actNewFolder()));
     aDeleteRemoteDeck = new QAction(this);
-    aDeleteRemoteDeck->setIcon(QIcon("theme:remove_row.svg"));
+    aDeleteRemoteDeck->setIcon(QIcon("theme:icons/remove_row.svg"));
     connect(aDeleteRemoteDeck, SIGNAL(triggered()), this, SLOT(actDeleteRemoteDeck()));
     
     leftToolBar->addAction(aOpenLocalDeck);

cockatrice/src/tab_game.cpp

@@ -305,17 +305,17 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
     
     replayStartButton = new QToolButton;
     replayStartButton->setIconSize(QSize(32, 32));
-    replayStartButton->setIcon(QIcon("theme:replay_start.svg"));
+    replayStartButton->setIcon(QIcon("theme:replay/start.svg"));
     connect(replayStartButton, SIGNAL(clicked()), this, SLOT(replayStartButtonClicked()));
     replayPauseButton = new QToolButton;
     replayPauseButton->setIconSize(QSize(32, 32));
     replayPauseButton->setEnabled(false);
-    replayPauseButton->setIcon(QIcon("theme:replay_pause.svg"));
+    replayPauseButton->setIcon(QIcon("theme:replay/pause.svg"));
     connect(replayPauseButton, SIGNAL(clicked()), this, SLOT(replayPauseButtonClicked()));
     replayFastForwardButton = new QToolButton;
     replayFastForwardButton->setIconSize(QSize(32, 32));
     replayFastForwardButton->setEnabled(false);
-    replayFastForwardButton->setIcon(QIcon("theme:replay_fastforward.svg"));
+    replayFastForwardButton->setIcon(QIcon("theme:replay/fastforward.svg"));
     replayFastForwardButton->setCheckable(true);
     connect(replayFastForwardButton, SIGNAL(toggled(bool)), this, SLOT(replayFastForwardButtonToggled(bool)));
     

cockatrice/src/tab_replays.cpp

@@ -78,22 +78,22 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client)
     hbox->addWidget(rightGroupBox);
     
     aOpenLocalReplay = new QAction(this);
-    aOpenLocalReplay->setIcon(QIcon("theme:icon_view.svg"));
+    aOpenLocalReplay->setIcon(QIcon("theme:icons/view.svg"));
     connect(aOpenLocalReplay, SIGNAL(triggered()), this, SLOT(actOpenLocalReplay()));
     aDeleteLocalReplay = new QAction(this);
-    aDeleteLocalReplay->setIcon(QIcon("theme:remove_row.svg"));
+    aDeleteLocalReplay->setIcon(QIcon("theme:icons/remove_row.svg"));
     connect(aDeleteLocalReplay, SIGNAL(triggered()), this, SLOT(actDeleteLocalReplay()));
     aOpenRemoteReplay = new QAction(this);
-    aOpenRemoteReplay->setIcon(QIcon("theme:icon_view.svg"));
+    aOpenRemoteReplay->setIcon(QIcon("theme:icons/view.svg"));
     connect(aOpenRemoteReplay, SIGNAL(triggered()), this, SLOT(actOpenRemoteReplay()));
     aDownload = new QAction(this);
-    aDownload->setIcon(QIcon("theme:arrow_left_green.svg"));
+    aDownload->setIcon(QIcon("theme:icons/arrow_left_green.svg"));
     connect(aDownload, SIGNAL(triggered()), this, SLOT(actDownload()));
     aKeep = new QAction(this);
-    aKeep->setIcon(QIcon("theme:lock.svg"));
+    aKeep->setIcon(QIcon("theme:icons/lock.svg"));
     connect(aKeep, SIGNAL(triggered()), this, SLOT(actKeepRemoteReplay()));
     aDeleteRemoteReplay = new QAction(this);
-    aDeleteRemoteReplay->setIcon(QIcon("theme:remove_row.svg"));
+    aDeleteRemoteReplay->setIcon(QIcon("theme:icons/remove_row.svg"));
     connect(aDeleteRemoteReplay, SIGNAL(triggered()), this, SLOT(actDeleteRemoteReplay()));
     
     leftToolBar->addAction(aOpenLocalReplay);

cockatrice/src/tab_room.cpp

@@ -68,7 +68,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, AbstractClient *_client, ServerI
     connect(aOpenChatSettings, SIGNAL(triggered()), this, SLOT(actOpenChatSettings()));
 
     QToolButton *chatSettingsButton = new QToolButton;
-    chatSettingsButton->setIcon(QIcon("theme:icon_settings.svg"));
+    chatSettingsButton->setIcon(QIcon("theme:icons/settings.svg"));
     chatSettingsButton->setMenu(chatSettingsMenu);
     chatSettingsButton->setPopupMode(QToolButton::InstantPopup);
 

cockatrice/src/tab_supervisor.cpp

@@ -79,7 +79,7 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/)
 TabSupervisor::TabSupervisor(AbstractClient *_client, QWidget *parent)
     : QTabWidget(parent), userInfo(0), client(_client), tabServer(0), tabUserLists(0), tabDeckStorage(0), tabReplays(0), tabAdmin(0)
 {
-    tabChangedIcon = new QIcon("theme:icon_tab_changed.svg");
+    tabChangedIcon = new QIcon("theme:icons/tab_changed.svg");
     setElideMode(Qt::ElideRight);
     setMovable(true);
     setIconSize(QSize(15, 15));

cockatrice/src/window_main.cpp

@@ -561,7 +561,7 @@ void MainWindow::createTrayIcon() {
     
     trayIcon = new QSystemTrayIcon(this);
     trayIcon->setContextMenu(trayIconMenu);
-    trayIcon->setIcon(QIcon("theme:appicon.svg"));
+    trayIcon->setIcon(QIcon("theme:cockatrice.svg"));
     trayIcon->show();
 
     connect(trayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this,

cockatrice/src/window_sets.cpp

@@ -24,28 +24,28 @@ WndSets::WndSets(QWidget *parent)
     setsEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
     aTop = new QAction(QString(), this);
-    aTop->setIcon(QIcon("theme:arrow_top_green.svg"));
+    aTop->setIcon(QIcon("theme:icons/arrow_top_green.svg"));
     aTop->setToolTip(tr("Move selected set to the top"));
     aTop->setEnabled(false);
     connect(aTop, SIGNAL(triggered()), this, SLOT(actTop()));
     setsEditToolBar->addAction(aTop);
 
     aUp = new QAction(QString(), this);
-    aUp->setIcon(QIcon("theme:arrow_up_green.svg"));
+    aUp->setIcon(QIcon("theme:icons/arrow_up_green.svg"));
     aUp->setToolTip(tr("Move selected set up"));
     aUp->setEnabled(false);
     connect(aUp, SIGNAL(triggered()), this, SLOT(actUp()));
     setsEditToolBar->addAction(aUp);
 
     aDown = new QAction(QString(), this);
-    aDown->setIcon(QIcon("theme:arrow_down_green.svg"));
+    aDown->setIcon(QIcon("theme:icons/arrow_down_green.svg"));
     aDown->setToolTip(tr("Move selected set down"));
     aDown->setEnabled(false);
     connect(aDown, SIGNAL(triggered()), this, SLOT(actDown()));
     setsEditToolBar->addAction(aDown);
 
     aBottom = new QAction(QString(), this);
-    aBottom->setIcon(QIcon("theme:arrow_bottom_green.svg"));
+    aBottom->setIcon(QIcon("theme:icons/arrow_bottom_green.svg"));
     aBottom->setToolTip(tr("Move selected set to the bottom"));
     aBottom->setEnabled(false);
     connect(aBottom, SIGNAL(triggered()), this, SLOT(actBottom()));

cockatrice/src/zoneviewwidget.cpp

@@ -250,5 +250,5 @@ void ZoneViewWidget::zoneDeleted()
 void ZoneViewWidget::initStyleOption(QStyleOption *option) const {
     QStyleOptionTitleBar *titleBar = qstyleoption_cast<QStyleOptionTitleBar *>(option);
     if (titleBar)
-        titleBar->icon = QIcon("theme:appicon.svg");
+        titleBar->icon = QIcon("theme:cockatrice.svg");
 }