3 files changed, 18 insertions, 15 deletions
diff --git a/launcher/ui/widgets/InfoFrame.cpp b/launcher/ui/widgets/InfoFrame.cpp
index 1f03f9ea..69f72fea 100644
--- a/launcher/ui/widgets/InfoFrame.cpp
+++ b/launcher/ui/widgets/InfoFrame.cpp
@@ -158,12 +158,12 @@ QString InfoFrame::renderColorCodes(QString input)
     //
     // TODO: Wrap links inside <a> tags
 
-    // https://minecraft.fandom.com/wiki/Formatting_codes#Color_codes
+    // https://minecraft.wiki/w/Formatting_codes#Color_codes
     const QMap<QChar, QString> color_codes_map = { { '0', "#000000" }, { '1', "#0000AA" }, { '2', "#00AA00" }, { '3', "#00AAAA" },
                                                    { '4', "#AA0000" }, { '5', "#AA00AA" }, { '6', "#FFAA00" }, { '7', "#AAAAAA" },
                                                    { '8', "#555555" }, { '9', "#5555FF" }, { 'a', "#55FF55" }, { 'b', "#55FFFF" },
                                                    { 'c', "#FF5555" }, { 'd', "#FF55FF" }, { 'e', "#FFFF55" }, { 'f', "#FFFFFF" } };
-    // https://minecraft.fandom.com/wiki/Formatting_codes#Formatting_codes
+    // https://minecraft.wiki/w/Formatting_codes#Formatting_codes
     const QMap<QChar, QString> formatting_codes_map = { { 'l', "b" }, { 'm', "s" }, { 'n', "u" }, { 'o', "i" } };
 
     QString html("<html>");
diff --git a/launcher/ui/widgets/JavaSettingsWidget.cpp b/launcher/ui/widgets/JavaSettingsWidget.cpp
index 42279a66..d2d92191 100644
--- a/launcher/ui/widgets/JavaSettingsWidget.cpp
+++ b/launcher/ui/widgets/JavaSettingsWidget.cpp
@@ -186,12 +186,20 @@ QString JavaSettingsWidget::javaPath() const
 
 int JavaSettingsWidget::maxHeapSize() const
 {
-    return m_maxMemSpinBox->value();
+    auto min = m_minMemSpinBox->value();
+    auto max = m_maxMemSpinBox->value();
+    if (max < min)
+        max = min;
+    return max;
 }
 
 int JavaSettingsWidget::minHeapSize() const
 {
-    return m_minMemSpinBox->value();
+    auto min = m_minMemSpinBox->value();
+    auto max = m_maxMemSpinBox->value();
+    if (min > max)
+        min = max;
+    return min;
 }
 
 bool JavaSettingsWidget::permGenEnabled() const
@@ -214,17 +222,9 @@ void JavaSettingsWidget::memoryValueChanged(int)
     if (obj == m_minMemSpinBox && min != observedMinMemory) {
         observedMinMemory = min;
         actuallyChanged = true;
-        if (min > max) {
-            observedMaxMemory = min;
-            m_maxMemSpinBox->setValue(min);
-        }
     } else if (obj == m_maxMemSpinBox && max != observedMaxMemory) {
         observedMaxMemory = max;
         actuallyChanged = true;
-        if (min > max) {
-            observedMinMemory = max;
-            m_minMemSpinBox->setValue(max);
-        }
     } else if (obj == m_permGenSpinBox && permgen != observedPermGenMemory) {
         observedPermGenMemory = permgen;
         actuallyChanged = true;
@@ -361,8 +361,8 @@ void JavaSettingsWidget::checkJavaPath(const QString& path)
     setJavaStatus(JavaStatus::Pending);
     m_checker.reset(new JavaChecker());
     m_checker->m_path = path;
-    m_checker->m_minMem = m_minMemSpinBox->value();
-    m_checker->m_maxMem = m_maxMemSpinBox->value();
+    m_checker->m_minMem = minHeapSize();
+    m_checker->m_maxMem = maxHeapSize();
     if (m_permGenSpinBox->isVisible()) {
         m_checker->m_permGen = m_permGenSpinBox->value();
     }
@@ -415,6 +415,9 @@ void JavaSettingsWidget::updateThresholds()
     } else if (observedMaxMemory > (m_availableMemory * 0.9)) {
         iconName = "status-yellow";
         m_labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity."));
+    } else if (observedMaxMemory < observedMinMemory) {
+        iconName = "status-yellow";
+        m_labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation is smaller than the minimum value"));
     } else {
         iconName = "status-good";
         m_labelMaxMemIcon->setToolTip("");
diff --git a/launcher/ui/widgets/ProjectItem.cpp b/launcher/ui/widgets/ProjectItem.cpp
index 1481c1b6..60b92b28 100644
--- a/launcher/ui/widgets/ProjectItem.cpp
+++ b/launcher/ui/widgets/ProjectItem.cpp
@@ -34,8 +34,8 @@ void ProjectItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& o
             icon_width = icon_size.width();
             icon_height = icon_size.height();
 
-            icon_x_margin = (rect.height() - icon_width) / 2;
             icon_y_margin = (rect.height() - icon_height) / 2;
+            icon_x_margin = icon_y_margin;  // use same margins for consistency
         }
 
         // Centralize icon with a margin to separate from the other elements