diff --git a/src/main/scala/li/cil/oc/client/gui/Robot.scala b/src/main/scala/li/cil/oc/client/gui/Robot.scala
index 984c77696..7a34c5413 100644
--- a/src/main/scala/li/cil/oc/client/gui/Robot.scala
+++ b/src/main/scala/li/cil/oc/client/gui/Robot.scala
@@ -10,7 +10,7 @@ import li.cil.oc.common.container.StaticComponentSlot
 import li.cil.oc.common.{container, tileentity}
 import li.cil.oc.server.driver
 import li.cil.oc.util.RenderState
-import li.cil.oc.{Localization, api}
+import li.cil.oc.{Settings, Localization, api}
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiButton
 import net.minecraft.client.renderer.Tessellator
@@ -52,8 +52,8 @@ class Robot(playerInventory: InventoryPlayer, val robot: tileentity.Robot) exten
   private val maxBufferWidth = 240.0
   private val maxBufferHeight = 140.0
 
-  private def bufferWidth = math.min(maxBufferWidth, TextBufferRenderCache.renderer.charRenderWidth * 48.0)
-  private def bufferHeight = math.min(maxBufferHeight, TextBufferRenderCache.renderer.charRenderHeight * 14.0)
+  private def bufferWidth = math.min(maxBufferWidth, TextBufferRenderCache.renderer.charRenderWidth * Settings.screenResolutionsByTier(0)._1)
+  private def bufferHeight = math.min(maxBufferHeight, TextBufferRenderCache.renderer.charRenderHeight * Settings.screenResolutionsByTier(0)._2)
   override protected def bufferX = (8 + (maxBufferWidth - bufferWidth) / 2).toInt
   override protected def bufferY = (8 + (maxBufferHeight - bufferHeight) / 2).toInt
 
@@ -102,7 +102,7 @@ class Robot(playerInventory: InventoryPlayer, val robot: tileentity.Robot) exten
       GL11.glTranslatef(bufferX, bufferY, 0)
       RenderState.disableLighting()
       GL11.glPushMatrix()
-      GL11.glTranslatef(-2, -2, 0)
+      GL11.glTranslatef(-3, -3, 0)
       BufferRenderer.drawBackground()
       GL11.glPopMatrix()
       RenderState.makeItBlend()
@@ -115,7 +115,7 @@ class Robot(playerInventory: InventoryPlayer, val robot: tileentity.Robot) exten
       else if (scaleY > scale) {
         GL11.glTranslated(0, buffer.renderHeight * (scaleY - scale) / 2, 0)
       }
-//      GL11.glScaled(scale, scale, scale)
+      GL11.glScaled(scale, scale, scale)
       GL11.glScaled(this.scale, this.scale, 1)
       BufferRenderer.drawText(buffer)
     }
diff --git a/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
index b95332f43..5e7cf6583 100644
--- a/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
@@ -39,7 +39,7 @@ object BufferRenderer {
 
       GL11.glBegin(GL11.GL_QUADS)
 
-      val margin = if (forRobot) 1 else 7
+      val margin = if (forRobot) 2 else 7
       val (c0, c1, c2, c3) = if (forRobot) (5, 7, 9, 11) else (0, 7, 9, 16)
 
       // Top border (left corner, middle bar, right corner).
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
index 03d747094..43da71fc3 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
@@ -471,7 +471,6 @@ class Robot extends traits.Computer with traits.PowerInformation with api.machin
     super.connectItemNode(node)
     if (node != null) node.host match {
       case buffer: api.component.TextBuffer =>
-        buffer.setMaximumResolution(48, 14)
         for (slot <- componentSlots) {
           getComponentInSlot(slot) match {
             case keyboard: api.component.Keyboard => buffer.node.connect(keyboard.node)