diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index d8f8727a7..9f64f897c 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -47,7 +47,10 @@
             <img const:alt="*" id="splash" rsrc:src="img/sogo-full.svg"/>
           </div>
 
-          <form name="loginForm" layout="column" ng-controller="loginController" ng-submit="login(creds)">
+          <form name="loginForm" layout="column"
+                ng-cloak="ng-cloak"
+                ng-controller="loginController"
+                ng-submit="login(creds)">
             <var:if condition="hasLoginSuffix">
               <input type="hidden" ng-model="creds.loginSuffix" var:value="loginSuffix"/>
             </var:if>
@@ -111,12 +114,30 @@
             </div>
           </form>
           <div layout="row"  layout-align="end end">
-            <md-button class="iconButton" ng-click="showAbout()">
-              <i class="md-icon-info" ng-style="{'color': '#aaa'}"><!-- about --></i>
+            <md-button class="iconButton fg-sogoPaper-500"
+                       label:aria-label="About"
+                       ng-click="showAbout()">
+              <i class="md-icon-info"><!-- about --></i>
             </md-button>
           </div>
         </div>
       </div>
     </md-content>
   </main>
+
+  <script type="text/ng-template" id="aboutBox.html">
+    <md-dialog flex="50">
+      <md-dialog-content>
+        <p><a href="http://sogo.nu/" target="_new">sogo.nu</a></p>
+        <p>Version <var:string value="version"/> (<var:string value="buildDate" />)</p>
+        <br/>
+        <p><var:string label:value="AboutBox" const:escapeHTML="NO"/></p>
+        <!--<img class="full-image" const:alt="Inverse" rsrc:src="img/inverse.png"/>-->
+      </md-dialog-content>
+      <div class="md-actions">
+        <md-button ng-click="closeDialog()"><var:string label:value="Close"/></md-button>
+      </div>
+    </md-dialog>
+  </script>
+
 </var:component>
diff --git a/UI/WebServerResources/js/Main.app.js b/UI/WebServerResources/js/Main.app.js
index ca84585d4..2f5bf51a1 100644
--- a/UI/WebServerResources/js/Main.app.js
+++ b/UI/WebServerResources/js/Main.app.js
@@ -21,18 +21,18 @@
         });
       return false;
     };
-    $scope.showAbout = function() {
-      var alert;
-      alert = $mdDialog.alert({
-        title: 'About SOGo',
-        content: 'This is SOGo v3!',
-        ok: 'OK'
+    $scope.showAbout = function($event) {
+      $mdDialog.show({
+        targetEvent: $event,
+        templateUrl: 'aboutBox.html',
+        controller: AboutDialogController
       });
-      $mdDialog
-        .show( alert )
-        .finally(function() {
-          alert = undefined;
-        });
+      AboutDialogController.$inject = ['scope', '$mdDialog'];
+      function AboutDialogController(scope, $mdDialog) {
+        scope.closeDialog = function() {
+          $mdDialog.hide();
+        };
+      }
     };
   }
 })();
diff --git a/UI/WebServerResources/scss/components/button/button.scss b/UI/WebServerResources/scss/components/button/button.scss
index e25c9ae98..e56b77824 100644
--- a/UI/WebServerResources/scss/components/button/button.scss
+++ b/UI/WebServerResources/scss/components/button/button.scss
@@ -73,7 +73,7 @@ $button-fab-height: 56px;
   overflow: hidden;
   //padding: $iconButton-padding 0;
   border-radius: 50%;
-  color: inherit;
+  //color: inherit;
   min-width: $iconButton-size;
   transition: $iconButton-transition;
 
diff --git a/UI/WebServerResources/scss/core/angular.scss b/UI/WebServerResources/scss/core/angular.scss
new file mode 100644
index 000000000..4cc13d626
--- /dev/null
+++ b/UI/WebServerResources/scss/core/angular.scss
@@ -0,0 +1,6 @@
+/// styles.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*-
+
+// ngCloak directive
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+  display: none !important;
+}
\ No newline at end of file
diff --git a/UI/WebServerResources/scss/styles.scss b/UI/WebServerResources/scss/styles.scss
index 20d56f745..24c944b66 100755
--- a/UI/WebServerResources/scss/styles.scss
+++ b/UI/WebServerResources/scss/styles.scss
@@ -13,6 +13,7 @@
 // CORE elements
 // ------------------------------------------------------------------------------
 @import 'core/functions';
+@import 'core/angular';
 
 /* Local overrides from angular-material src */
 // fixme : refactor all this to meet our practices