diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js
index 664a20c98..d2f7efe7e 100644
--- a/core/renderers/common/info.js
+++ b/core/renderers/common/info.js
@@ -451,6 +451,12 @@ Blockly.blockRendering.RenderInfo.prototype.addElemSpacing_ = function() {
  * @protected
  */
 Blockly.blockRendering.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
+  if (!prev) {
+    // Statement input padding.
+    if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
+      return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
+    }
+  }
   // Between inputs and the end of the row.
   if (prev && Blockly.blockRendering.Types.isInput(prev) && !next) {
     if (Blockly.blockRendering.Types.isExternalInput(prev)) {
diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js
index a75255ff4..22909763b 100644
--- a/core/renderers/zelos/constants.js
+++ b/core/renderers/zelos/constants.js
@@ -41,6 +41,26 @@ Blockly.zelos.ConstantProvider = function() {
 
   this.GRID_UNIT = 4;
 
+  /**
+   * @override
+   */
+  this.SMALL_PADDING = this.GRID_UNIT;
+
+  /**
+   * @override
+   */
+  this.MEDIUM_PADDING = 2 * this.GRID_UNIT;
+
+  /**
+   * @override
+   */
+  this.MEDIUM_LARGE_PADDING = 3 * this.GRID_UNIT;
+
+  /**
+   * @override
+   */
+  this.LARGE_PADDING = 4 * this.GRID_UNIT;
+
   /**
    * @override
    */
@@ -76,10 +96,21 @@ Blockly.zelos.ConstantProvider = function() {
    */
   this.STATEMENT_BOTTOM_SPACER = -this.NOTCH_HEIGHT;
 
+  /**
+   * Minimum statement input spacer width.
+   * @type {number}
+   */
+  this.STATEMENT_INPUT_SPACER_MIN_WIDTH = 30 * this.GRID_UNIT;
+
   /**
    * @override
    */
-  this.AFTER_STATEMENT_BOTTOM_ROW_MIN_HEIGHT = this.LARGE_PADDING * 2;
+  this.STATEMENT_INPUT_PADDING_LEFT = 4 * this.GRID_UNIT;
+
+  /**
+   * @override
+   */
+  this.AFTER_STATEMENT_BOTTOM_ROW_MIN_HEIGHT = 7 * this.GRID_UNIT;
 
   /**
    * @override
@@ -91,6 +122,11 @@ Blockly.zelos.ConstantProvider = function() {
    */
   this.EMPTY_INLINE_INPUT_HEIGHT = 8 * this.GRID_UNIT;
 
+  /**
+   * @override
+   */
+  this.DUMMY_INPUT_MIN_HEIGHT = 6 * this.GRID_UNIT;
+
   /**
    * The ID of the highlight glow filter, or the empty string if no filter is
    * set.
diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js
index e272bea3e..4060fbdbb 100644
--- a/core/renderers/zelos/info.js
+++ b/core/renderers/zelos/info.js
@@ -109,148 +109,6 @@ Blockly.zelos.RenderInfo.prototype.computeBounds_ = function() {
   }
 };
 
-/**
- * @override
- */
-Blockly.zelos.RenderInfo.prototype.getInRowSpacing_ = function(prev, next) {
-  if (!prev || !next) {
-    // No need for padding at the beginning or end of the row if the
-    // output shape is dynamic.
-    if (this.outputConnection && this.outputConnection.isDynamicShape) {
-      return this.constants_.NO_PADDING;
-    }
-  }
-  if (!prev) {
-    // Between an editable field and the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isField(next) && next.isEditable) {
-      return this.constants_.MEDIUM_PADDING;
-    }
-    // Inline input at the beginning of the row.
-    if (next && Blockly.blockRendering.Types.isInlineInput(next)) {
-      return this.constants_.MEDIUM_LARGE_PADDING;
-    }
-    if (next && Blockly.blockRendering.Types.isStatementInput(next)) {
-      return this.constants_.STATEMENT_INPUT_PADDING_LEFT;
-    }
-    // Anything else at the beginning of the row.
-    return this.constants_.LARGE_PADDING;
-  }
-
-  // Spacing between a non-input and the end of the row.
-  if (!Blockly.blockRendering.Types.isInput(prev) && !next) {
-    // Between an editable field and the end of the row.
-    if (Blockly.blockRendering.Types.isField(prev) && prev.isEditable) {
-      return this.constants_.MEDIUM_PADDING;
-    }
-    // Padding at the end of an icon-only row to make the block shape clearer.
-    if (Blockly.blockRendering.Types.isIcon(prev)) {
-      return (this.constants_.LARGE_PADDING * 2) + 1;
-    }
-    if (Blockly.blockRendering.Types.isHat(prev)) {
-      return this.constants_.NO_PADDING;
-    }
-    // Establish a minimum width for a block with a previous or next connection.
-    if (Blockly.blockRendering.Types.isPreviousOrNextConnection(prev)) {
-      return this.constants_.LARGE_PADDING;
-    }
-    // Between rounded corner and the end of the row.
-    if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev)) {
-      return this.constants_.MIN_BLOCK_WIDTH;
-    }
-    // Between a jagged edge and the end of the row.
-    if (Blockly.blockRendering.Types.isJaggedEdge(prev)) {
-      return this.constants_.NO_PADDING;
-    }
-    // Between noneditable fields and icons and the end of the row.
-    return this.constants_.LARGE_PADDING;
-  }
-
-  // Between inputs and the end of the row.
-  if (Blockly.blockRendering.Types.isInput(prev) && !next) {
-    if (Blockly.blockRendering.Types.isExternalInput(prev)) {
-      return this.constants_.NO_PADDING;
-    } else if (Blockly.blockRendering.Types.isInlineInput(prev)) {
-      return this.constants_.LARGE_PADDING;
-    } else if (Blockly.blockRendering.Types.isStatementInput(prev)) {
-      return this.constants_.NO_PADDING;
-    }
-  }
-
-  // Spacing between a non-input and an input.
-  if (!Blockly.blockRendering.Types.isInput(prev) &&
-      next && Blockly.blockRendering.Types.isInput(next)) {
-    // Between an editable field and an input.
-    if (prev.isEditable) {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
-        return this.constants_.MEDIUM_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
-        return this.constants_.MEDIUM_PADDING;
-      }
-    } else {
-      if (Blockly.blockRendering.Types.isInlineInput(next)) {
-        return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isExternalInput(next)) {
-        return this.constants_.MEDIUM_LARGE_PADDING;
-      } else if (Blockly.blockRendering.Types.isStatementInput(next)) {
-        return this.constants_.LARGE_PADDING;
-      }
-    }
-    return this.constants_.LARGE_PADDING - 1;
-  }
-
-  // Spacing between an icon and an icon or field.
-  if (Blockly.blockRendering.Types.isIcon(prev) &&
-      next && !Blockly.blockRendering.Types.isInput(next)) {
-    return this.constants_.LARGE_PADDING;
-  }
-
-  // Spacing between an inline input and a field.
-  if (Blockly.blockRendering.Types.isInlineInput(prev) &&
-      next && !Blockly.blockRendering.Types.isInput(next)) {
-    // Editable field after inline input.
-    if (next.isEditable) {
-      return this.constants_.MEDIUM_PADDING;
-    } else {
-      // Noneditable field after inline input.
-      return this.constants_.LARGE_PADDING;
-    }
-  }
-
-  if (Blockly.blockRendering.Types.isLeftSquareCorner(prev) && next) {
-    // Spacing between a hat and a corner
-    if (Blockly.blockRendering.Types.isHat(next)) {
-      return this.constants_.NO_PADDING;
-    }
-    // Spacing between a square corner and a previous or next connection
-    if (Blockly.blockRendering.Types.isPreviousConnection(next) ||
-        Blockly.blockRendering.Types.isNextConnection(next)) {
-      return next.notchOffset;
-    }
-  }
-
-  // Spacing between a rounded corner and a previous or next connection.
-  if (Blockly.blockRendering.Types.isLeftRoundedCorner(prev) && next) {
-    if (Blockly.blockRendering.Types.isPreviousConnection(next) ||
-        Blockly.blockRendering.Types.isNextConnection(next)) {
-      return next.notchOffset - this.constants_.CORNER_RADIUS;
-    }
-  }
-
-  // Spacing between two fields of the same editability.
-  if (!Blockly.blockRendering.Types.isInput(prev) &&
-      next && !Blockly.blockRendering.Types.isInput(next) &&
-      (prev.isEditable == next.isEditable)) {
-    return this.constants_.LARGE_PADDING;
-  }
-
-  // Spacing between anything and a jagged edge.
-  if (next && Blockly.blockRendering.Types.isJaggedEdge(next)) {
-    return this.constants_.LARGE_PADDING;
-  }
-
-  return this.constants_.MEDIUM_PADDING;
-};
-
 /**
  * @override
  */
@@ -291,10 +149,10 @@ Blockly.zelos.RenderInfo.prototype.getSpacerRowHeight_ = function(
     return this.constants_.EMPTY_BLOCK_SPACER_HEIGHT;
   }
   // Top and bottom rows act as a spacer so we don't need any extra padding.
-  if ((Blockly.blockRendering.Types.isTopRow(prev) && !prev.hasPreviousConnection)) {
+  if ((Blockly.blockRendering.Types.isTopRow(prev))) {
     return this.constants_.NO_PADDING;
   }
-  if ((Blockly.blockRendering.Types.isBottomRow(next) && !next.hasNextConnection)) {
+  if ((Blockly.blockRendering.Types.isBottomRow(next))) {
     return this.constants_.NO_PADDING;
   }
   return this.constants_.MEDIUM_PADDING;