diff --git a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.form b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.form
index b0ee1e42eb87..96720321c9fe 100644
--- a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.form
+++ b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.form
@@ -71,6 +71,7 @@
               <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <margin top="2" left="0" bottom="2" right="3"/>
               <text resource-bundle="messages/IdeBundle" key="unscramble.use.unscrambler.checkbox"/>
             </properties>
           </component>
@@ -81,11 +82,12 @@
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <margin top="2" left="0" bottom="2" right="3"/>
           <text value="Automatically detect and analyze thread dumps copied to the clipboard outside of IntelliJ IDEA"/>
         </properties>
       </component>
       <grid id="28646" binding="myBottomPanel" custom-create="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
+        <margin top="0" left="3" bottom="0" right="0"/>
         <constraints>
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java
index 4463eef17b8e..bb1eb46a9e1c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java
@@ -60,11 +60,13 @@ public class VcsContentAnnotationConfigurable implements Configurable {
   public JComponent createComponent() {
     JPanel wrapper = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
     myHighlightRecentlyChanged = new JCheckBox("Show changed in last");
-    myHighlightRecentlyChanged.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+    myHighlightRecentlyChanged.setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 1));
     myHighlightInterval = new JSpinner(new SpinnerNumberModel(1, 1, VcsContentAnnotationSettings.ourMaxDays, 1));
     wrapper.add(myHighlightRecentlyChanged);
     wrapper.add(myHighlightInterval);
-    wrapper.add(new JLabel("days"));
+    final JLabel days = new JLabel("days");
+    days.setBorder(BorderFactory.createEmptyBorder(0, 1, 0, 1));
+    wrapper.add(days);
 
     myHighlightRecentlyChanged.addActionListener(new ActionListener() {
       @Override