diff --git a/arts/edit.kra b/arts/edit.kra
new file mode 100644
index 00000000..1c811352
Binary files /dev/null and b/arts/edit.kra differ
diff --git a/src/View/ui/BoundaryConditions.ui b/src/View/ui/BoundaryConditions.ui
index c34f898b..9f2f1b99 100644
--- a/src/View/ui/BoundaryConditions.ui
+++ b/src/View/ui/BoundaryConditions.ui
@@ -108,7 +108,7 @@
    </property>
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -123,7 +123,7 @@
   <action name="action_del">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
    </property>
    <property name="text">
     <string>Delete</string>
@@ -153,7 +153,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+     <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset>
    </property>
    <property name="text">
     <string>Sort</string>
diff --git a/src/View/ui/CheckList.ui b/src/View/ui/CheckList.ui
index 001d9230..816c9097 100644
--- a/src/View/ui/CheckList.ui
+++ b/src/View/ui/CheckList.ui
@@ -67,7 +67,7 @@
         </property>
         <property name="icon">
          <iconset>
-          <normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset>
+          <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset>
         </property>
        </widget>
       </item>
diff --git a/src/View/ui/ConfigureDialog.ui b/src/View/ui/ConfigureDialog.ui
index 60dc9354..590d0ca2 100644
--- a/src/View/ui/ConfigureDialog.ui
+++ b/src/View/ui/ConfigureDialog.ui
@@ -58,7 +58,16 @@
                </property>
                <property name="icon">
                 <iconset>
-                 <normaloff>ressources/gtk_add.png</normaloff>ressources/gtk_add.png</iconset>
+                 <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
+               </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+               <property name="flat">
+                <bool>true</bool>
                </property>
               </widget>
              </item>
@@ -71,6 +80,15 @@
                 <iconset>
                  <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
                </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
               </widget>
              </item>
              <item>
@@ -82,6 +100,15 @@
                 <iconset>
                  <normaloff>ressources/edit.png</normaloff>ressources/edit.png</iconset>
                </property>
+               <property name="iconSize">
+                <size>
+                 <width>24</width>
+                 <height>24</height>
+                </size>
+               </property>
+               <property name="flat">
+                <bool>true</bool>
+               </property>
               </widget>
              </item>
              <item>
@@ -171,7 +198,7 @@
                   </time>
                  </property>
                  <property name="currentSection">
-                  <enum>QDateTimeEdit::MinuteSection</enum>
+                  <enum>QDateTimeEdit::HourSection</enum>
                  </property>
                  <property name="displayFormat">
                   <string>HH:mm:ss</string>
@@ -223,7 +250,16 @@
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+               <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>24</width>
+               <height>24</height>
+              </size>
+             </property>
+             <property name="flat">
+              <bool>true</bool>
              </property>
             </widget>
            </item>
@@ -236,6 +272,15 @@
               <iconset>
                <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
              </property>
+             <property name="iconSize">
+              <size>
+               <width>24</width>
+               <height>24</height>
+              </size>
+             </property>
+             <property name="flat">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item>
@@ -245,7 +290,16 @@
              </property>
              <property name="icon">
               <iconset>
-               <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+               <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>24</width>
+               <height>24</height>
+              </size>
+             </property>
+             <property name="flat">
+              <bool>true</bool>
              </property>
             </widget>
            </item>
diff --git a/src/View/ui/DebugRepl.ui b/src/View/ui/DebugRepl.ui
index c060c1c0..db4d069e 100644
--- a/src/View/ui/DebugRepl.ui
+++ b/src/View/ui/DebugRepl.ui
@@ -27,7 +27,13 @@
         </property>
         <property name="icon">
          <iconset>
-          <normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset>
+          <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>24</width>
+          <height>24</height>
+         </size>
         </property>
         <property name="shortcut">
          <string>Ctrl+Return</string>
diff --git a/src/View/ui/EditBoundaryConditions.ui b/src/View/ui/EditBoundaryConditions.ui
index e5fba32b..bfcf9505 100644
--- a/src/View/ui/EditBoundaryConditions.ui
+++ b/src/View/ui/EditBoundaryConditions.ui
@@ -80,7 +80,7 @@
    </property>
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -95,7 +95,7 @@
   <action name="action_del">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
    </property>
    <property name="text">
     <string>Delete</string>
@@ -110,7 +110,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+     <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset>
    </property>
    <property name="text">
     <string>Sort</string>
diff --git a/src/View/ui/EditLateralContribution.ui b/src/View/ui/EditLateralContribution.ui
index 37d8128e..02e14bcb 100644
--- a/src/View/ui/EditLateralContribution.ui
+++ b/src/View/ui/EditLateralContribution.ui
@@ -73,7 +73,7 @@
    </property>
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -88,7 +88,7 @@
   <action name="action_del">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
    </property>
    <property name="text">
     <string>Delete</string>
@@ -103,7 +103,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+     <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset>
    </property>
    <property name="text">
     <string>Sort</string>
diff --git a/src/View/ui/Frictions.ui b/src/View/ui/Frictions.ui
index 356766ee..e219bf73 100644
--- a/src/View/ui/Frictions.ui
+++ b/src/View/ui/Frictions.ui
@@ -68,7 +68,7 @@
   <action name="action_add">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -77,7 +77,7 @@
   <action name="action_del">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
    </property>
    <property name="text">
     <string>delete</string>
@@ -86,7 +86,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+     <normaloff>ressources/sort_1-9.png</normaloff>ressources/sort_1-9.png</iconset>
    </property>
    <property name="text">
     <string>Sort</string>
diff --git a/src/View/ui/InitialConditions.ui b/src/View/ui/InitialConditions.ui
index 83a9b843..94a180dc 100644
--- a/src/View/ui/InitialConditions.ui
+++ b/src/View/ui/InitialConditions.ui
@@ -88,7 +88,7 @@
   <action name="action_add">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -100,7 +100,7 @@
   <action name="action_del">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
    </property>
    <property name="text">
     <string>delete</string>
@@ -112,7 +112,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+     <normaloff>ressources/sort_1-9.png</normaloff>ressources/sort_1-9.png</iconset>
    </property>
    <property name="text">
     <string>sort</string>
diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
index 7e310e96..9545197a 100644
--- a/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
+++ b/src/View/ui/InitialConditions_Dialog_Generator_Discharge.ui
@@ -22,7 +22,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Discharge</string>
+        <string>Discharge (m³/s)</string>
        </property>
       </widget>
      </item>
diff --git a/src/View/ui/InitialConditions_Dialog_Generator_Height.ui b/src/View/ui/InitialConditions_Dialog_Generator_Height.ui
index 3c13935a..573734c8 100644
--- a/src/View/ui/InitialConditions_Dialog_Generator_Height.ui
+++ b/src/View/ui/InitialConditions_Dialog_Generator_Height.ui
@@ -22,7 +22,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Height</string>
+        <string>Height (m)</string>
        </property>
       </widget>
      </item>
diff --git a/src/View/ui/LateralContributions.ui b/src/View/ui/LateralContributions.ui
index 11ffa52a..d8d81b79 100644
--- a/src/View/ui/LateralContributions.ui
+++ b/src/View/ui/LateralContributions.ui
@@ -108,7 +108,7 @@
    </property>
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -123,7 +123,7 @@
   <action name="action_del">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
    </property>
    <property name="text">
     <string>Delete</string>
@@ -153,7 +153,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+     <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset>
    </property>
    <property name="text">
     <string>Sort</string>
diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui
index f687d918..3926aff2 100644
--- a/src/View/ui/Results.ui
+++ b/src/View/ui/Results.ui
@@ -245,7 +245,7 @@
   <action name="action_add">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -260,6 +260,10 @@
    </property>
   </action>
   <action name="action_export">
+   <property name="icon">
+    <iconset>
+     <normaloff>ressources/export.png</normaloff>ressources/export.png</iconset>
+   </property>
    <property name="text">
     <string>Export</string>
    </property>
diff --git a/src/View/ui/SelectSolver.ui b/src/View/ui/SelectSolver.ui
index 7d5bd578..265c42ae 100644
--- a/src/View/ui/SelectSolver.ui
+++ b/src/View/ui/SelectSolver.ui
@@ -42,7 +42,7 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>ressources/player_play.png</normaloff>ressources/player_play.png</iconset>
+         <normaloff>ressources/run.png</normaloff>ressources/run.png</iconset>
        </property>
       </widget>
      </item>
diff --git a/src/View/ui/Stricklers.ui b/src/View/ui/Stricklers.ui
index 67939f79..a7dbd8e9 100644
--- a/src/View/ui/Stricklers.ui
+++ b/src/View/ui/Stricklers.ui
@@ -64,7 +64,7 @@
   <action name="action_add">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/add.png</normaloff>ressources/gtk-add.png</iconset>
+     <normaloff>ressources/add.png</normaloff>ressources/add.png</iconset>
    </property>
    <property name="text">
     <string>Add</string>
@@ -76,7 +76,7 @@
   <action name="action_del">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/del.png</normaloff>ressources/gtk-remove.png</iconset>
+     <normaloff>ressources/del.png</normaloff>ressources/del.png</iconset>
    </property>
    <property name="text">
     <string>Delete</string>
@@ -88,7 +88,7 @@
   <action name="action_sort">
    <property name="icon">
     <iconset>
-     <normaloff>ressources/gtk-sort-ascending.png</normaloff>ressources/gtk-sort-ascending.png</iconset>
+     <normaloff>ressources/sort_A-Z.png</normaloff>ressources/sort_A-Z.png</iconset>
    </property>
    <property name="text">
     <string>Sort</string>
diff --git a/src/View/ui/ressources/edit.png b/src/View/ui/ressources/edit.png
index 1c5d322a..d95ebb9c 100644
Binary files a/src/View/ui/ressources/edit.png and b/src/View/ui/ressources/edit.png differ