diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 30a440b58..3fbe44f95 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -203,9 +203,20 @@ namespace
             int cancelLeft = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left;
             int cancelRight = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left + getWidget<MyGUI::Widget>(CancelBTN)->getSize().width;
 
-            getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(cancelLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
             getWidget<MyGUI::Widget>(QuestsBTN)->setPosition(cancelRight, getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().top);
 
+            // Usually Topics, Quests, and Cancel buttons have the 64px width, so we can place the Topics left-up from the Cancel button, and the Quests right-up from the Cancel button.
+            // But in some installations, e.g. German one, the Topics button has the 128px width, so we should place it exactly left from the Quests button.
+            if (getWidget<MyGUI::Widget>(TopicsBTN)->getSize().width == 64)
+            {
+                getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(cancelLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
+            }
+            else
+            {
+                int questLeft = getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().left;
+                getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(questLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
+            }
+
             mQuestMode = false;
             mAllQuests = false;
             mOptionsMode = false;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 3b50eeaa6..f7009d0df 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -541,6 +541,7 @@ namespace MWGui
         delete mDragAndDrop;
         delete mSoulgemDialog;
         delete mCursorManager;
+        delete mToolTips;
 
         cleanupGarbage();
 
diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
index 25105f1e2..4f2be8c42 100644
--- a/cmake/FindSDL2.cmake
+++ b/cmake/FindSDL2.cmake
@@ -70,10 +70,10 @@ endif()
 libfind_pkg_detect(SDL2 sdl2
     FIND_PATH SDL.h
         HINTS $ENV{SDL2DIR}
-        PATH_SUFFIXES include SDL2
+        PATH_SUFFIXES include SDL2 include/SDL2
     FIND_LIBRARY SDL2
         HINTS $ENV{SDL2DIR}
-        PATH_SUFFIXES ${_sdl_lib_suffix}
+        PATH_SUFFIXES lib ${_sdl_lib_suffix}
 )
 libfind_version_n_header(SDL2 NAMES SDL_version.h DEFINES SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_PATCHLEVEL)
 
@@ -85,7 +85,7 @@ IF(NOT SDL2_BUILDING_LIBRARY AND NOT APPLE)
     libfind_pkg_detect(SDL2MAIN sdl2
         FIND_LIBRARY SDL2main
             HINTS $ENV{SDL2DIR}
-            PATH_SUFFIXES ${_sdl_lib_suffix}
+            PATH_SUFFIXES lib ${_sdl_lib_suffix}
     )
     set(SDL2MAIN_FIND_QUIETLY TRUE)
     libfind_process(SDL2MAIN)
diff --git a/components/widgets/numericeditbox.cpp b/components/widgets/numericeditbox.cpp
index 6e884a091..ee2c30a7b 100644
--- a/components/widgets/numericeditbox.cpp
+++ b/components/widgets/numericeditbox.cpp
@@ -87,7 +87,7 @@ namespace Gui
             setValue(std::max(mValue-1, mMinValue));
             eventValueChanged(mValue);
         }
-        else
+        else if (character == 0 || (character >= '0' && character <= '9'))
             Base::onKeyButtonPressed(key, character);
     }
 
diff --git a/files/mygui/openmw_alchemy_window.layout b/files/mygui/openmw_alchemy_window.layout
index 8a1bf1347..a8e5431fb 100644
--- a/files/mygui/openmw_alchemy_window.layout
+++ b/files/mygui/openmw_alchemy_window.layout
@@ -76,9 +76,7 @@
 
         <Widget type="HBox" skin="" position="110 374 452 24" align="Bottom Right">
 
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
 
             <Widget type="AutoSizedButton" skin="MW_Button" name="CreateButton">
                 <Property key="Caption" value="#{sCreate}"/>
diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index d93249c03..a137d83d1 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -17,9 +17,7 @@
 
         <!-- Dialog buttons -->
         <Widget type="HBox" position="0 338 511 24">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index d875fae22..98c8e4fde 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -74,9 +74,7 @@
 
         <!-- Dialog buttons -->
         <Widget type="HBox" position="0 276 475 24">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index e2920c742..c04cfe064 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -75,9 +75,7 @@
 
         <!-- Dialog buttons -->
         <Widget type="HBox" position="0 158 482 24">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="DescriptionButton">
                 <Property key="Caption" value="#{sCreateClassMenu1}"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index 04bd9cc53..31f0436d5 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -76,9 +76,7 @@
 
         <!-- Dialog buttons -->
         <Widget type="HBox" position="0 393 572 24">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
 
             <Widget type="AutoSizedButton" skin="MW_Button" position="471 397 53 23" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
diff --git a/files/mygui/openmw_chargen_review.layout b/files/mygui/openmw_chargen_review.layout
index 1099fcd3b..927296fad 100644
--- a/files/mygui/openmw_chargen_review.layout
+++ b/files/mygui/openmw_chargen_review.layout
@@ -112,9 +112,7 @@
 
         <!-- Dialogue Buttons -->
         <Widget type="HBox" position="0 388 525 24">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
                 <Property key="Caption" value="#{sBack}"/>
             </Widget>
diff --git a/files/mygui/openmw_edit_effect.layout b/files/mygui/openmw_edit_effect.layout
index 376e87efa..c2429d24b 100644
--- a/files/mygui/openmw_edit_effect.layout
+++ b/files/mygui/openmw_edit_effect.layout
@@ -94,9 +94,7 @@
         </Widget>
 
         <Widget type="HBox" position="8 266 336 24">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
 
             <Widget type="AutoSizedButton" skin="MW_Button" name="DeleteButton">
                 <Property key="Caption" value="#{sDelete}"/>
diff --git a/files/mygui/openmw_edit_note.layout b/files/mygui/openmw_edit_note.layout
index 7039c719e..edf53bde7 100644
--- a/files/mygui/openmw_edit_note.layout
+++ b/files/mygui/openmw_edit_note.layout
@@ -16,9 +16,7 @@
 
         <Widget type="HBox" position="13 200 303 24">
             <Property key="Spacing" value="6"/>
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" name="DeleteButton">
                 <Property key="Caption" value="#{sDelete}"/>
             </Widget>
diff --git a/files/mygui/openmw_enchanting_dialog.layout b/files/mygui/openmw_enchanting_dialog.layout
index 6a08e6fd0..ed3cfb03e 100644
--- a/files/mygui/openmw_enchanting_dialog.layout
+++ b/files/mygui/openmw_enchanting_dialog.layout
@@ -36,9 +36,7 @@
             <Widget type="ItemWidget" skin="MW_ItemIconBox" position="0 0 50 50" name="ItemBox">
             </Widget>
 
-            <Widget type="Widget" position="0 0 8 0">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
 
             <Widget type="AutoSizedTextBox" skin="NormalText">
                 <Property key="Caption" value="#{sSoulGem}"/>
@@ -141,9 +139,7 @@
                 <UserString key="Caption_Text" value="#{sEnchantmentHelp7}"/>
             </Widget>
 
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
 
             <Widget type="AutoSizedTextBox" skin="NormalText" name="PriceTextLabel">
                 <Property key="Caption" value="#{sBarterDialog7}"/>
diff --git a/files/mygui/openmw_levelup_dialog.layout b/files/mygui/openmw_levelup_dialog.layout
index 66855373a..7849d507f 100644
--- a/files/mygui/openmw_levelup_dialog.layout
+++ b/files/mygui/openmw_levelup_dialog.layout
@@ -156,9 +156,7 @@
 
         <Widget type="HBox" skin="" position="0 0 330 24">
             <UserString key="HStretch" value="true"/>
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
             <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 0 24" name="OkButton">
                 <Property key="Caption" value="#{sOk}"/>
             </Widget>
diff --git a/files/mygui/openmw_recharge_dialog.layout b/files/mygui/openmw_recharge_dialog.layout
index 200d345e3..626039065 100644
--- a/files/mygui/openmw_recharge_dialog.layout
+++ b/files/mygui/openmw_recharge_dialog.layout
@@ -27,9 +27,7 @@
                     </Widget>
                 </Widget>
 
-               <Widget type="Widget">
-                   <UserString key="HStretch" value="true"/>
-               </Widget>
+               <Widget type="Spacer"/>
 
                <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
                    <Property key="Caption" value="#{sCancel}"/>
diff --git a/files/mygui/openmw_repair.layout b/files/mygui/openmw_repair.layout
index abc429594..bf58b6c81 100644
--- a/files/mygui/openmw_repair.layout
+++ b/files/mygui/openmw_repair.layout
@@ -34,9 +34,7 @@
                     </Widget>
                 </Widget>
                 
-               <Widget type="Widget">
-                   <UserString key="HStretch" value="true"/>
-               </Widget>
+               <Widget type="Spacer"/>
 
                <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
                    <Property key="Caption" value="#{sCancel}"/>
diff --git a/files/mygui/openmw_spellcreation_dialog.layout b/files/mygui/openmw_spellcreation_dialog.layout
index e14674ad6..e7c27655d 100644
--- a/files/mygui/openmw_spellcreation_dialog.layout
+++ b/files/mygui/openmw_spellcreation_dialog.layout
@@ -68,9 +68,7 @@
         <Widget type="HBox" position="0 336 558 60">
             <Property key="Padding" value="16"/>
 
-            <Widget type="Widget" position="0 0 0 0">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
 
             <Widget type="AutoSizedTextBox" skin="NormalText">
                 <Property key="Caption" value="#{sBarterDialog7}"/>
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index c038066f1..bdc224ecd 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -103,9 +103,7 @@
             <Widget type="VBox">
                 <UserString key="VStretch" value="true"/>
                 <Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="HandToHandImage"/>
-                <Widget type="Widget">
-                    <UserString key="VStretch" value="true"/>
-                </Widget>
+                <Widget type="Spacer"/>
             </Widget>
 
             <Widget type="AutoSizedTextBox" skin="SandText" position="44 8 248 284" align="Left Top" name="HandToHandText">
@@ -122,9 +120,7 @@
             <Widget type="VBox">
                 <UserString key="VStretch" value="true"/>
                 <Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="HealthImage"/>
-                <Widget type="Widget">
-                    <UserString key="VStretch" value="true"/>
-                </Widget>
+                <Widget type="Spacer"/>
             </Widget>
 
             <Widget type="AutoSizedEditBox" skin="SandText" position="44 8 392 0" align="Left Top" name="HealthDescription">
diff --git a/files/mygui/openmw_trade_window.layout b/files/mygui/openmw_trade_window.layout
index ebfe9b30f..0af9d59fe 100644
--- a/files/mygui/openmw_trade_window.layout
+++ b/files/mygui/openmw_trade_window.layout
@@ -3,7 +3,7 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 600 360" name="_Main">
         <Property key="Visible" value="false"/>
-        <Property key="MinSize" value="380 245"/>
+        <Property key="MinSize" value="428 245"/>
 
         <!-- Categories -->
         <Widget type="HBox" position="8 8 566 24" align="Left Top HStretch" name="Categories">
@@ -34,32 +34,39 @@
         </Widget>
 
         <Widget type="Widget" skin="" position="8 231 566 92" name="BottomPane" align="Left Bottom HStretch">
-            <Widget type="TextBox" skin="SandText" position="192 0 374 24" name="PlayerGold" align="Left Top HStretch">
-                <Property key="TextAlign" value="Right"/>
-            </Widget>
-            <Widget type="TextBox" skin="SandText" position="192 28 374 24" name="MerchantGold" align="Left Top HStretch">
-                <Property key="TextAlign" value="Right"/>
-            </Widget>
-
-            <Widget type="Button" skin="MW_Button" position="0 0 40 24" name="IncreaseButton" align="Left Top">
-                <Property key="Caption" value="+"/>
-            </Widget>
-            <Widget type="Button" skin="MW_Button" position="0 28 40 24" name="DecreaseButton" align="Left Top">
-                <Property key="Caption" value="-"/>
+            <Widget type="HBox" position="0 0 566 24" align="Left Top HStretch">
+                <Widget type="Button" skin="MW_Button" position="0 0 40 24" name="IncreaseButton" align="Left Top">
+                    <Property key="Caption" value="+"/>
+                    <Property key="NeedKey" value="false"/>
+                </Widget>
+                <Widget type="AutoSizedTextBox" skin="SandText" position="48 0 140 24" name="TotalBalanceLabel" align="Left Top">
+                    <Property key="TextAlign" value="Left VCenter"/>
+                </Widget>
+                <Widget type="Spacer" />
+                <Widget type="AutoSizedTextBox" skin="SandText" position="0 0 374 24" name="PlayerGold" align="Right Top">
+                    <Property key="TextAlign" value="Right"/>
+                </Widget>
             </Widget>
 
-            <Widget type="TextBox" skin="SandText" position="48 0 140 24" name="TotalBalanceLabel" align="Left Top "/>
-            <Widget type="NumericEditBox" skin="MW_TextEdit" position="48 28 140 24" name="TotalBalance" align="Left Top">
-                <Property key="TextAlign" value="Center"/>
+            <Widget type="HBox" position="0 28 566 24" align="Left Top HStretch">
+                <Widget type="Button" skin="MW_Button" position="0 0 40 24" name="DecreaseButton" align="Left Top">
+                    <Property key="Caption" value="-"/>
+                    <Property key="NeedKey" value="false"/>
+                </Widget>
+                <Widget type="NumericEditBox" skin="MW_TextEdit" position="48 0 140 24" name="TotalBalance" align="Left Top">
+                    <Property key="TextAlign" value="Center"/>
+                </Widget>
+                <Widget type="Spacer" />
+                <Widget type="AutoSizedTextBox" skin="SandText" position="0 0 374 24" name="MerchantGold" align="Right Top">
+                    <Property key="TextAlign" value="Right"/>
+                </Widget>
             </Widget>
 
             <Widget type="HBox" position="0 60 566 24" align="Left Bottom HStretch">
                 <Widget type="AutoSizedButton" skin="MW_Button" name="MaxSaleButton">
                     <Property key="Caption" value="#{sMaxSale}"/>
                 </Widget>
-                <Widget type="Widget">
-                    <UserString key="HStretch" value="true"/>
-                </Widget>
+                <Widget type="Spacer" />
                 <Widget type="AutoSizedButton" skin="MW_Button" name="OfferButton">
                     <Property key="Caption" value="#{sBarterDialog8}"/>
                 </Widget>
diff --git a/files/mygui/openmw_wait_dialog.layout b/files/mygui/openmw_wait_dialog.layout
index 4bc60ceb4..b02db3764 100644
--- a/files/mygui/openmw_wait_dialog.layout
+++ b/files/mygui/openmw_wait_dialog.layout
@@ -26,9 +26,7 @@
 
         <Widget type="HBox">
             <UserString key="HStretch" value="true"/>
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
+            <Widget type="Spacer"/>
 
             <Widget type="AutoSizedButton" skin="MW_Button" name="UntilHealedButton">
                 <Property key="Caption" value="#{sUntilHealed}"/>