--- a/calendar/base/content/calendar-views.xul
+++ b/calendar/base/content/calendar-views.xul
@@ -95,17 +95,17 @@
                <tab id="calendar-month-view-button"
                     label="&calendar.month.button.label;"
                     tooltiptext="&calendar.month.button.tooltip;"
                     calview="month"
                     observes="calendar_month-view_command"/>
              </tabs>
            <box class="navigation-bottombox" type="end"/>
          </vbox>
-         <vbox>
+         <vbox class="view-scrollbarspacer">
            <scrollbar style="visibility:hidden;max-height:1px;height:1px" orient="vertical"/>
          </vbox>
        </hbox>
        <deck flex="1"
             id="view-deck"
             persist="selectedIndex"
             ondraggesture="nsDragAndDrop.startDrag(event, calendarViewDNDObserver);"
             ondragover="nsDragAndDrop.dragOver(event, calendarViewDNDObserver);"

--- a/calendar/base/themes/pinstripe/calendar-unifinder.css
+++ b/calendar/base/themes/pinstripe/calendar-unifinder.css
@@ -63,21 +63,16 @@
 }
 
 /* restyle splitter-border to match Thunderbird's layout */
 #calendar-view-splitter {
     border: none;
     min-height: 5px;
 }
 
-/* add view-deck-border to match Thunderbird's layout */
-#view-deck {
-    border: 1px solid ThreeDShadow;
-}
-
 /* added for new id ..... search box ..... */
 #unifinder-searchBox {
     border-top: 1px solid ThreeDHighlight;
     height: 30px;
     background-color: transparent;
 }
 
 .unifinder-closebutton {

--- a/calendar/base/themes/pinstripe/calendar-views.css
+++ b/calendar/base/themes/pinstripe/calendar-views.css
@@ -622,16 +622,28 @@ calendar-event-box[invitation-status="DE
 calendar-editable-item[invitation-status="DECLINED"],
 calendar-month-day-box-item[invitation-status="DECLINED"] {
     opacity: 0.3;
 }
 
 /* Navigation controls for the views */
 #calendar-nav-control {
     background-color: white;
+    border: solid ThreeDShadow;
+    border-width: 1px 1px 0;
+}
+
+#view-deck {
+    border: solid ThreeDShadow;
+    border-width: 0 1px;
+}
+
+.view-scrollbarspacer {
+    border-bottom: 1px solid #D2D2D2;
+    margin-bottom: 4px;
 }
 
 .tabs-left,
 .tabs-right {
     border-bottom: 2px solid #D2D2D2;
 }
 
 .calview-tabs {

--- a/calendar/base/themes/winstripe/calendar-unifinder.css
+++ b/calendar/base/themes/winstripe/calendar-unifinder.css
@@ -63,21 +63,16 @@
 }
 
 /* restyle splitter-border to match Thunderbird's layout */
 #calendar-view-splitter {
     border: none;
     min-height: 5px;
 }
 
-/* add view-deck-border to match Thunderbird's layout */
-#view-deck {
-    border: 1px solid ThreeDShadow;
-}
-
 /* added for new id ..... search box ..... */
 #unifinder-searchBox {
     border-top: 1px solid ThreeDHighlight;
     height: 30px;
     background-color: transparent;
 }
 
 #bottom-events-box {

--- a/calendar/base/themes/winstripe/calendar-views.css
+++ b/calendar/base/themes/winstripe/calendar-views.css
@@ -624,16 +624,28 @@ calendar-event-box[invitation-status="DE
 calendar-editable-item[invitation-status="DECLINED"],
 calendar-month-day-box-item[invitation-status="DECLINED"] {
     opacity: 0.3;
 }
 
 /* Navigation controls for the views */
 #calendar-nav-control {
     background-color: white;
+    border: solid ThreeDShadow;
+    border-width: 1px 1px 0;
+}
+
+#view-deck {
+    border: solid ThreeDShadow;
+    border-width: 0 1px;
+}
+
+.view-scrollbarspacer {
+    border-bottom: 1px solid #D2D2D2;
+    margin-bottom: 4px;
 }
 
 .tabs-left,
 .tabs-right {
     border-bottom: 2px solid #D2D2D2;
 }
 
 tab[calview] {