diff --git a/data/styles/10-buttons.otui b/data/styles/10-buttons.otui
index 8457df93..8e1607e1 100644
--- a/data/styles/10-buttons.otui
+++ b/data/styles/10-buttons.otui
@@ -6,7 +6,7 @@ Button < UIButton
   image-source: /images/ui/button_rounded
   image-color: white
   image-clip: 0 0 20 20
-  image-border: 2
+  image-border: 3
   padding: 5 10 5 10
 
   $hover !disabled:
@@ -24,7 +24,7 @@ TabButton < UIButton
   image-source: /images/ui/tabbutton_rounded
   image-color: white
   image-clip: 0 0 20 20
-  image-border: 1
+  image-border: 3
   icon-color: white
   color: #aaaaaa
 
diff --git a/modules/game_console/console.lua b/modules/game_console/console.lua
index 94006ec5..5038636a 100644
--- a/modules/game_console/console.lua
+++ b/modules/game_console/console.lua
@@ -401,7 +401,7 @@ function addTabText(text, speaktype, tab, creatureName)
       label:setText(text)
 
       -- Calculate the positions of the highlighted text and fill with string.char(127) [Width: 1]
-      local drawText = label:getText()
+      local drawText = label:getDrawText()
       local tmpText = ""
       for i = 1, #highlightData / 3 do
         local dataBlock = { _start = highlightData[(i-1)*3+1], _end = highlightData[(i-1)*3+2], words = highlightData[(i-1)*3+3] }
diff --git a/src/framework/ui/uitextedit.cpp b/src/framework/ui/uitextedit.cpp
index e6e6ca51..98b5d831 100644
--- a/src/framework/ui/uitextedit.cpp
+++ b/src/framework/ui/uitextedit.cpp
@@ -123,6 +123,7 @@ void UITextEdit::update(bool focusCursor)
         return;
 
     std::string text = getDisplayedText();
+    m_drawText = text;
     int textLength = text.length();
 
     // prevent glitches