diff --git a/src/LTMTool.cpp b/src/LTMTool.cpp
index f32e5b3dc..8b3c87fe8 100644
--- a/src/LTMTool.cpp
+++ b/src/LTMTool.cpp
@@ -287,19 +287,33 @@ LTMTool::LTMTool(Context *context, LTMSettings *settings) : QWidget(context->mai
     addCustomButton = new QPushButton("+");
     connect(addCustomButton, SIGNAL(clicked()), this, SLOT(addMetric()));
 
-    deleteCustomButton = new QPushButton("- ");
+    deleteCustomButton = new QPushButton("-");
     connect(deleteCustomButton, SIGNAL(clicked()), this, SLOT(deleteMetric()));
 
     usePreset = new QCheckBox(tr("Use sidebar chart settings"));
     usePreset->setChecked(false);
 
 #ifndef Q_OS_MAC
+    upCustomButton = new QToolButton(this);
+    downCustomButton = new QToolButton(this);
+    upCustomButton->setArrowType(Qt::UpArrow);
+    downCustomButton->setArrowType(Qt::DownArrow);
+    upCustomButton->setFixedSize(20,20);
+    downCustomButton->setFixedSize(20,20);
     addCustomButton->setFixedSize(20,20);
     deleteCustomButton->setFixedSize(20,20);
+#else
+    upCustomButton = new QPushButton(tr("Up"));
+    downCustomButton = new QPushButton(tr("Down"));
 #endif
+    connect(upCustomButton, SIGNAL(clicked()), this, SLOT(moveMetricUp()));
+    connect(downCustomButton, SIGNAL(clicked()), this, SLOT(moveMetricDown()));
+
+
     QHBoxLayout *customButtons = new QHBoxLayout;
     customButtons->setSpacing(2);
-    customButtons->addWidget(usePreset);
+    customButtons->addWidget(upCustomButton);
+    customButtons->addWidget(downCustomButton);
     customButtons->addStretch();
     customButtons->addWidget(editCustomButton);
     customButtons->addStretch();
@@ -307,6 +321,9 @@ LTMTool::LTMTool(Context *context, LTMSettings *settings) : QWidget(context->mai
     customButtons->addWidget(deleteCustomButton);
     customLayout->addLayout(customButtons);
 
+    // use seperate line to to distinguish from the operational buttons for the Table View
+    customLayout->addWidget(usePreset);
+
     tabs->addTab(basicsettings, tr("Basic"));
     tabs->addTab(basic, tr("Preset"));
     tabs->addTab(custom, tr("Curves"));
@@ -1182,6 +1199,10 @@ LTMTool::usePresetChanged()
     editCustomButton->setEnabled(!usePreset->isChecked());
     addCustomButton->setEnabled(!usePreset->isChecked());
     deleteCustomButton->setEnabled(!usePreset->isChecked());
+    upCustomButton->setEnabled(!usePreset->isChecked());
+    downCustomButton->setEnabled(!usePreset->isChecked());
+
+
 }
 
 void
@@ -1202,7 +1223,7 @@ LTMTool::presetsChanged()
 }
 
 void
-LTMTool::refreshCustomTable()
+LTMTool::refreshCustomTable(int indexSelectedItem)
 {
     // clear then repopulate custom table settings to reflect
     // the current LTMSettings.
@@ -1213,6 +1234,7 @@ LTMTool::refreshCustomTable()
     header << tr("Type") << tr("Details"); 
     customTable->setHorizontalHeaderLabels(header);
 
+    QTableWidgetItem *selected = new QTableWidgetItem();
     // now lets add a row for each metric
     customTable->setRowCount(settings->metrics.count());
     int i=0;
@@ -1242,8 +1264,18 @@ LTMTool::refreshCustomTable()
         t->setFlags(t->flags() & (~Qt::ItemIsEditable));
         customTable->setItem(i,1,t);
 
+        // keep the selected item from previous step (relevant for moving up/down)
+        if (indexSelectedItem == i) {
+            selected = t;
+        }
+
         i++;
     }
+
+    if (selected) {
+      customTable->setCurrentItem(selected);
+    }
+
 }
 
 void
@@ -1315,6 +1347,40 @@ LTMTool::addMetric()
     }
 }
 
+void
+LTMTool::moveMetricUp()
+{
+    QList<QTableWidgetItem*> items = customTable->selectedItems();
+    if (items.count() < 1) return;
+
+    int index = customTable->row(items.first());
+
+    if (index > 0) {
+        settings->metrics.swap(index, index-1);
+         // refresh
+        refreshCustomTable(index-1);
+        curvesChanged();
+    }
+}
+
+void
+LTMTool::moveMetricDown()
+{
+    QList<QTableWidgetItem*> items = customTable->selectedItems();
+    if (items.count() < 1) return;
+
+    int index = customTable->row(items.first());
+
+    if (index+1 <  settings->metrics.size()) {
+        settings->metrics.swap(index, index+1);
+         // refresh
+        refreshCustomTable(index+1);
+        curvesChanged();
+    }
+}
+
+
+
 void
 LTMTool::applySettings()
 {
diff --git a/src/LTMTool.h b/src/LTMTool.h
index 5493d9c2a..396822927 100644
--- a/src/LTMTool.h
+++ b/src/LTMTool.h
@@ -111,6 +111,8 @@ class LTMTool : public QWidget
         void doubleClicked( int row, int column );
         void addMetric();
         void deleteMetric();
+        void moveMetricUp();
+        void moveMetricDown();
 
         void clearFilter();
         void setFilter(QStringList);
@@ -152,7 +154,12 @@ class LTMTool : public QWidget
         // custom tab:
         QTableWidget *customTable;
         QPushButton *editCustomButton, *addCustomButton, *deleteCustomButton;
-        void refreshCustomTable(); // refreshes the table from LTMSettings
+#ifndef Q_OS_MAC
+        QToolButton *upCustomButton, *downCustomButton;
+#else
+        QPushButton *upCustomButton, *downCustomButton;
+#endif
+        void refreshCustomTable(int indexSelectedItem = -1); // refreshes the table from LTMSettings
 };
 
 class EditMetricDetailDialog : public QDialog