Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rf8e37a0cbb537edceebee7a7c5f2676f497d1e26 -ra55a5d0085432ac2a18fae315476d03990b1cabb
--- sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision f8e37a0cbb537edceebee7a7c5f2676f497d1e26)
+++ sources/gui/qml/components/HeaderBar.qml	(.../HeaderBar.qml)	(revision a55a5d0085432ac2a18fae315476d03990b1cabb)
@@ -26,7 +26,6 @@
             margins : 10
         }
         Column { id: _dateTimeColumn
-            spacing : 0
             anchors.fill: parent
             Text { id: _timeText
                 color   : Colors.textMain
@@ -121,61 +120,61 @@
         anchors {
             verticalCenter: parent.verticalCenter
             right       : parent.right
-            rightMargin :  Variables.defaultMargin * 2
+            rightMargin :  _headerButtonRow.spacing
         }
 
         IconButton { id  : _prescriptionButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iPrescription"
-            extraSpace      : Variables.defaultMargin * 2
+            extraSpace      : _headerButtonRow.spacing
 
             onPressed: print("Prescription button pressed!")
         }
 
         IconButton { id  : _wifiButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iWifi"
-            extraSpace      : Variables.defaultMargin * 2
+            extraSpace      : _headerButtonRow.spacing
 
             onPressed: print("Wifi button pressed!")
         }
 
         IconButton { id  : _bluetoothButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iBluetooth"
-            extraSpace      : Variables.defaultMargin * 2
+            extraSpace      : _headerButtonRow.spacing
 
             onPressed: print("Bluetooth button pressed!")
         }
 
         IconButton { id  : _cloudSyncButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iCloudSync"
-            extraSpace      : Variables.defaultMargin * 2
+            extraSpace      : _headerButtonRow.spacing
 
             onPressed: print("CloudSync button pressed!")
         }
 
         IconButton { id  : _storageButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iStorage"
-            extraSpace      : Variables.defaultMargin * 2
+            extraSpace      : _headerButtonRow.spacing
 
             onPressed: print("Storage button pressed!")
         }
 
         IconButton { id  : _settingsButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iSettings"
-            extraSpace      : Variables.defaultMargin * 2
+            extraSpace      : _headerButtonRow.spacing
 
             onPressed: print("Settings button pressed!")
         }
 
         IconButton { id  : _informationButton
             iconSize        : Variables.headerIconDiameter
             iconImageSource : "qrc:/images/iInformation"
-            extraSpace      : Variables.defaultMargin * 2
+            extraSpace      : _headerButtonRow.spacing
 
             onPressed: print("Information button pressed!")
         }