diff --git a/src/java/org/jivesoftware/spark/ChatAreaSendField.java b/src/java/org/jivesoftware/spark/ChatAreaSendField.java
index 51a8eb42..0d429dc7 100644
--- a/src/java/org/jivesoftware/spark/ChatAreaSendField.java
+++ b/src/java/org/jivesoftware/spark/ChatAreaSendField.java
@@ -44,7 +44,7 @@ public class ChatAreaSendField extends JPanel {
 
         textField = new ChatInputEditor();
         textField.setBorder(null);
-        setBorder(BorderFactory.createMatteBorder(1, 0, 1, 0, Color.lightGray));
+        setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, Color.lightGray));
         button = new JButton();
 
         if (Spark.isMac()) {
diff --git a/src/java/org/jivesoftware/spark/component/BackgroundPanel.java b/src/java/org/jivesoftware/spark/component/BackgroundPanel.java
index 48625d19..2b9ab49a 100644
--- a/src/java/org/jivesoftware/spark/component/BackgroundPanel.java
+++ b/src/java/org/jivesoftware/spark/component/BackgroundPanel.java
@@ -33,7 +33,7 @@ public class BackgroundPanel extends JPanel {
 
 
     public void paintComponent(Graphics g) {
-        final Image backgroundImage = Default.getImageIcon(Default.SECONDARY_BACKGROUND_IMAGE).getImage();
+        final Image backgroundImage = Default.getImageIcon(Default.TOP_BOTTOM_BACKGROUND_IMAGE).getImage();
         double scaleX = getWidth() / (double)backgroundImage.getWidth(null);
         double scaleY = getHeight() / (double)backgroundImage.getHeight(null);
         AffineTransform xform = AffineTransform.getScaleInstance(scaleX, scaleY);
diff --git a/src/java/org/jivesoftware/spark/ui/ChatRoom.java b/src/java/org/jivesoftware/spark/ui/ChatRoom.java
index 0155afdc..5491f840 100644
--- a/src/java/org/jivesoftware/spark/ui/ChatRoom.java
+++ b/src/java/org/jivesoftware/spark/ui/ChatRoom.java
@@ -205,7 +205,7 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
         getTranscriptWindow().setTransferHandler(transferHandler);
         getChatInputEditor().setTransferHandler(transferHandler);
 
-        add(toolbar, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
+        add(toolbar, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 5), 0, 0));
 
         // Add Connection Listener
         SparkManager.getConnection().addConnectionListener(this);
@@ -215,13 +215,12 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
     private void init() {
         setLayout(new GridBagLayout());
 
-
         add(splitPane, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
-        //   add(notificationLabel, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 2, 5, 0), 0, 0));
 
         // Remove Default Beveled Borders
         splitPane.setBorder(null);
         verticalSplit.setBorder(null);
+        verticalSplit.setOneTouchExpandable(false);
         splitPane.setLeftComponent(verticalSplit);
 
         textScroller.setAutoscrolls(true);
@@ -236,7 +235,7 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
         chatWindowPanel.setOpaque(false);
 
         // Layout Components
-        chatPanel.add(chatWindowPanel, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 2, 0, 2), 0, 0));
+        chatPanel.add(chatWindowPanel, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 5, 0, 5), 0, 0));
 
         // Add edit buttons to Chat Room
         editorBar.setOpaque(false);
@@ -248,8 +247,8 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
         bottomPanel.setOpaque(false);
         splitPane.setOpaque(false);
         bottomPanel.setLayout(new GridBagLayout());
-        bottomPanel.add(chatAreaButton, new GridBagConstraints(0, 1, 5, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 15));
-        bottomPanel.add(editorBar, new GridBagConstraints(0, 0, 5, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
+        bottomPanel.add(chatAreaButton, new GridBagConstraints(0, 1, 5, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 5, 5, 5), 0, 15));
+        bottomPanel.add(editorBar, new GridBagConstraints(0, 0, 5, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 5), 0, 0));
         verticalSplit.setOpaque(false);
 
         verticalSplit.setTopComponent(chatPanel);