diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf
new file mode 100644
index 0000000000..daac0d1f79
Binary files /dev/null and b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/FiraSans.ttf differ
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/OFL.txt b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/OFL.txt
new file mode 100644
index 0000000000..4f9e17ed29
--- /dev/null
+++ b/Plugins/org.blueberry.ui.qt/resources/fonts/FiraSans/OFL.txt
@@ -0,0 +1,92 @@
+Copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/Roboto/LICENSE.txt b/Plugins/org.blueberry.ui.qt/resources/fonts/Roboto/LICENSE.txt
new file mode 100644
index 0000000000..75b52484ea
--- /dev/null
+++ b/Plugins/org.blueberry.ui.qt/resources/fonts/Roboto/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/Roboto/Roboto.ttf b/Plugins/org.blueberry.ui.qt/resources/fonts/Roboto/Roboto.ttf
new file mode 100644
index 0000000000..b0d268840f
Binary files /dev/null and b/Plugins/org.blueberry.ui.qt/resources/fonts/Roboto/Roboto.ttf differ
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/xkcd/license.txt b/Plugins/org.blueberry.ui.qt/resources/fonts/xkcd/license.txt
new file mode 100644
index 0000000000..7f182a3bf3
--- /dev/null
+++ b/Plugins/org.blueberry.ui.qt/resources/fonts/xkcd/license.txt
@@ -0,0 +1,335 @@
+Creative Commons Legal Code
+
+Attribution-NonCommercial 3.0 Unported
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
+    DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+    other pre-existing works, such as a translation, adaptation,
+    derivative work, arrangement of music or other alterations of a
+    literary or artistic work, or phonogram or performance and includes
+    cinematographic adaptations or any other form in which the Work may be
+    recast, transformed, or adapted including in any form recognizably
+    derived from the original, except that a work that constitutes a
+    Collection will not be considered an Adaptation for the purpose of
+    this License. For the avoidance of doubt, where the Work is a musical
+    work, performance or phonogram, the synchronization of the Work in
+    timed-relation with a moving image ("synching") will be considered an
+    Adaptation for the purpose of this License.
+ b. "Collection" means a collection of literary or artistic works, such as
+    encyclopedias and anthologies, or performances, phonograms or
+    broadcasts, or other works or subject matter other than works listed
+    in Section 1(f) below, which, by reason of the selection and
+    arrangement of their contents, constitute intellectual creations, in
+    which the Work is included in its entirety in unmodified form along
+    with one or more other contributions, each constituting separate and
+    independent works in themselves, which together are assembled into a
+    collective whole. A work that constitutes a Collection will not be
+    considered an Adaptation (as defined above) for the purposes of this
+    License.
+ c. "Distribute" means to make available to the public the original and
+    copies of the Work or Adaptation, as appropriate, through sale or
+    other transfer of ownership.
+ d. "Licensor" means the individual, individuals, entity or entities that
+    offer(s) the Work under the terms of this License.
+ e. "Original Author" means, in the case of a literary or artistic work,
+    the individual, individuals, entity or entities who created the Work
+    or if no individual or entity can be identified, the publisher; and in
+    addition (i) in the case of a performance the actors, singers,
+    musicians, dancers, and other persons who act, sing, deliver, declaim,
+    play in, interpret or otherwise perform literary or artistic works or
+    expressions of folklore; (ii) in the case of a phonogram the producer
+    being the person or legal entity who first fixes the sounds of a
+    performance or other sounds; and, (iii) in the case of broadcasts, the
+    organization that transmits the broadcast.
+ f. "Work" means the literary and/or artistic work offered under the terms
+    of this License including without limitation any production in the
+    literary, scientific and artistic domain, whatever may be the mode or
+    form of its expression including digital form, such as a book,
+    pamphlet and other writing; a lecture, address, sermon or other work
+    of the same nature; a dramatic or dramatico-musical work; a
+    choreographic work or entertainment in dumb show; a musical
+    composition with or without words; a cinematographic work to which are
+    assimilated works expressed by a process analogous to cinematography;
+    a work of drawing, painting, architecture, sculpture, engraving or
+    lithography; a photographic work to which are assimilated works
+    expressed by a process analogous to photography; a work of applied
+    art; an illustration, map, plan, sketch or three-dimensional work
+    relative to geography, topography, architecture or science; a
+    performance; a broadcast; a phonogram; a compilation of data to the
+    extent it is protected as a copyrightable work; or a work performed by
+    a variety or circus performer to the extent it is not otherwise
+    considered a literary or artistic work.
+ g. "You" means an individual or entity exercising rights under this
+    License who has not previously violated the terms of this License with
+    respect to the Work, or who has received express permission from the
+    Licensor to exercise rights under this License despite a previous
+    violation.
+ h. "Publicly Perform" means to perform public recitations of the Work and
+    to communicate to the public those public recitations, by any means or
+    process, including by wire or wireless means or public digital
+    performances; to make available to the public Works in such a way that
+    members of the public may access these Works from a place and at a
+    place individually chosen by them; to perform the Work to the public
+    by any means or process and the communication to the public of the
+    performances of the Work, including by public digital performance; to
+    broadcast and rebroadcast the Work by any means including signs,
+    sounds or images.
+ i. "Reproduce" means to make copies of the Work by any means including
+    without limitation by sound or visual recordings and the right of
+    fixation and reproducing fixations of the Work, including storage of a
+    protected performance or phonogram in digital form or other electronic
+    medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+limit, or restrict any uses free from copyright or rights arising from
+limitations or exceptions that are provided for in connection with the
+copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License,
+Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+perpetual (for the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+ a. to Reproduce the Work, to incorporate the Work into one or more
+    Collections, and to Reproduce the Work as incorporated in the
+    Collections;
+ b. to create and Reproduce Adaptations provided that any such Adaptation,
+    including any translation in any medium, takes reasonable steps to
+    clearly label, demarcate or otherwise identify that changes were made
+    to the original Work. For example, a translation could be marked "The
+    original work was translated from English to Spanish," or a
+    modification could indicate "The original work has been modified.";
+ c. to Distribute and Publicly Perform the Work including as incorporated
+    in Collections; and,
+ d. to Distribute and Publicly Perform Adaptations.
+
+The above rights may be exercised in all media and formats whether now
+known or hereafter devised. The above rights include the right to make
+such modifications as are technically necessary to exercise the rights in
+other media and formats. Subject to Section 8(f), all rights not expressly
+granted by Licensor are hereby reserved, including but not limited to the
+rights set forth in Section 4(d).
+
+4. Restrictions. The license granted in Section 3 above is expressly made
+subject to and limited by the following restrictions:
+
+ a. You may Distribute or Publicly Perform the Work only under the terms
+    of this License. You must include a copy of, or the Uniform Resource
+    Identifier (URI) for, this License with every copy of the Work You
+    Distribute or Publicly Perform. You may not offer or impose any terms
+    on the Work that restrict the terms of this License or the ability of
+    the recipient of the Work to exercise the rights granted to that
+    recipient under the terms of the License. You may not sublicense the
+    Work. You must keep intact all notices that refer to this License and
+    to the disclaimer of warranties with every copy of the Work You
+    Distribute or Publicly Perform. When You Distribute or Publicly
+    Perform the Work, You may not impose any effective technological
+    measures on the Work that restrict the ability of a recipient of the
+    Work from You to exercise the rights granted to that recipient under
+    the terms of the License. This Section 4(a) applies to the Work as
+    incorporated in a Collection, but this does not require the Collection
+    apart from the Work itself to be made subject to the terms of this
+    License. If You create a Collection, upon notice from any Licensor You
+    must, to the extent practicable, remove from the Collection any credit
+    as required by Section 4(c), as requested. If You create an
+    Adaptation, upon notice from any Licensor You must, to the extent
+    practicable, remove from the Adaptation any credit as required by
+    Section 4(c), as requested.
+ b. You may not exercise any of the rights granted to You in Section 3
+    above in any manner that is primarily intended for or directed toward
+    commercial advantage or private monetary compensation. The exchange of
+    the Work for other copyrighted works by means of digital file-sharing
+    or otherwise shall not be considered to be intended for or directed
+    toward commercial advantage or private monetary compensation, provided
+    there is no payment of any monetary compensation in connection with
+    the exchange of copyrighted works.
+ c. If You Distribute, or Publicly Perform the Work or any Adaptations or
+    Collections, You must, unless a request has been made pursuant to
+    Section 4(a), keep intact all copyright notices for the Work and
+    provide, reasonable to the medium or means You are utilizing: (i) the
+    name of the Original Author (or pseudonym, if applicable) if supplied,
+    and/or if the Original Author and/or Licensor designate another party
+    or parties (e.g., a sponsor institute, publishing entity, journal) for
+    attribution ("Attribution Parties") in Licensor's copyright notice,
+    terms of service or by other reasonable means, the name of such party
+    or parties; (ii) the title of the Work if supplied; (iii) to the
+    extent reasonably practicable, the URI, if any, that Licensor
+    specifies to be associated with the Work, unless such URI does not
+    refer to the copyright notice or licensing information for the Work;
+    and, (iv) consistent with Section 3(b), in the case of an Adaptation,
+    a credit identifying the use of the Work in the Adaptation (e.g.,
+    "French translation of the Work by Original Author," or "Screenplay
+    based on original Work by Original Author"). The credit required by
+    this Section 4(c) may be implemented in any reasonable manner;
+    provided, however, that in the case of a Adaptation or Collection, at
+    a minimum such credit will appear, if a credit for all contributing
+    authors of the Adaptation or Collection appears, then as part of these
+    credits and in a manner at least as prominent as the credits for the
+    other contributing authors. For the avoidance of doubt, You may only
+    use the credit required by this Section for the purpose of attribution
+    in the manner set out above and, by exercising Your rights under this
+    License, You may not implicitly or explicitly assert or imply any
+    connection with, sponsorship or endorsement by the Original Author,
+    Licensor and/or Attribution Parties, as appropriate, of You or Your
+    use of the Work, without the separate, express prior written
+    permission of the Original Author, Licensor and/or Attribution
+    Parties.
+ d. For the avoidance of doubt:
+
+     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme cannot be waived, the Licensor
+        reserves the exclusive right to collect such royalties for any
+        exercise by You of the rights granted under this License;
+    ii. Waivable Compulsory License Schemes. In those jurisdictions in
+        which the right to collect royalties through any statutory or
+        compulsory licensing scheme can be waived, the Licensor reserves
+        the exclusive right to collect such royalties for any exercise by
+        You of the rights granted under this License if Your exercise of
+        such rights is for a purpose or use which is otherwise than
+        noncommercial as permitted under Section 4(b) and otherwise waives
+        the right to collect royalties through any statutory or compulsory
+        licensing scheme; and,
+   iii. Voluntary License Schemes. The Licensor reserves the right to
+        collect royalties, whether individually or, in the event that the
+        Licensor is a member of a collecting society that administers
+        voluntary licensing schemes, via that society, from any exercise
+        by You of the rights granted under this License that is for a
+        purpose or use which is otherwise than noncommercial as permitted
+        under Section 4(c).
+ e. Except as otherwise agreed in writing by the Licensor or as may be
+    otherwise permitted by applicable law, if You Reproduce, Distribute or
+    Publicly Perform the Work either by itself or as part of any
+    Adaptations or Collections, You must not distort, mutilate, modify or
+    take other derogatory action in relation to the Work which would be
+    prejudicial to the Original Author's honor or reputation. Licensor
+    agrees that in those jurisdictions (e.g. Japan), in which any exercise
+    of the right granted in Section 3(b) of this License (the right to
+    make Adaptations) would be deemed to be a distortion, mutilation,
+    modification or other derogatory action prejudicial to the Original
+    Author's honor and reputation, the Licensor will waive or not assert,
+    as appropriate, this Section, to the fullest extent permitted by the
+    applicable national law, to enable You to reasonably exercise Your
+    right under Section 3(b) of this License (right to make Adaptations)
+    but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
+OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+ a. This License and the rights granted hereunder will terminate
+    automatically upon any breach by You of the terms of this License.
+    Individuals or entities who have received Adaptations or Collections
+    from You under this License, however, will not have their licenses
+    terminated provided such individuals or entities remain in full
+    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+    survive any termination of this License.
+ b. Subject to the above terms and conditions, the license granted here is
+    perpetual (for the duration of the applicable copyright in the Work).
+    Notwithstanding the above, Licensor reserves the right to release the
+    Work under different license terms or to stop distributing the Work at
+    any time; provided, however that any such election will not serve to
+    withdraw this License (or any other license that has been, or is
+    required to be, granted under the terms of this License), and this
+    License will continue in full force and effect unless terminated as
+    stated above.
+
+8. Miscellaneous
+
+ a. Each time You Distribute or Publicly Perform the Work or a Collection,
+    the Licensor offers to the recipient a license to the Work on the same
+    terms and conditions as the license granted to You under this License.
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+    offers to the recipient a license to the original Work on the same
+    terms and conditions as the license granted to You under this License.
+ c. If any provision of this License is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this License, and without further action
+    by the parties to this agreement, such provision shall be reformed to
+    the minimum extent necessary to make such provision valid and
+    enforceable.
+ d. No term or provision of this License shall be deemed waived and no
+    breach consented to unless such waiver or consent shall be in writing
+    and signed by the party to be charged with such waiver or consent.
+ e. This License constitutes the entire agreement between the parties with
+    respect to the Work licensed here. There are no understandings,
+    agreements or representations with respect to the Work not specified
+    here. Licensor shall not be bound by any additional provisions that
+    may appear in any communication from You. This License may not be
+    modified without the mutual written agreement of the Licensor and You.
+ f. The rights granted under, and the subject matter referenced, in this
+    License were drafted utilizing the terminology of the Berne Convention
+    for the Protection of Literary and Artistic Works (as amended on
+    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
+    and the Universal Copyright Convention (as revised on July 24, 1971).
+    These rights and subject matter take effect in the relevant
+    jurisdiction in which the License terms are sought to be enforced
+    according to the corresponding provisions of the implementation of
+    those treaty provisions in the applicable national law. If the
+    standard suite of rights granted under applicable copyright law
+    includes additional rights not granted under this License, such
+    additional rights are deemed to be included in the License; this
+    License is not intended to restrict the license of any rights under
+    applicable law.
+
+
+Creative Commons Notice
+
+    Creative Commons is not a party to this License, and makes no warranty
+    whatsoever in connection with the Work. Creative Commons will not be
+    liable to You or any party on any legal theory for any damages
+    whatsoever, including without limitation any general, special,
+    incidental or consequential damages arising in connection to this
+    license. Notwithstanding the foregoing two (2) sentences, if Creative
+    Commons has expressly identified itself as the Licensor hereunder, it
+    shall have all rights and obligations of Licensor.
+
+    Except for the limited purpose of indicating to the public that the
+    Work is licensed under the CCPL, Creative Commons does not authorize
+    the use by either party of the trademark "Creative Commons" or any
+    related trademark or logo of Creative Commons without the prior
+    written consent of Creative Commons. Any permitted use will be in
+    compliance with Creative Commons' then-current trademark usage
+    guidelines, as may be published on its website or otherwise made
+    available upon request from time to time. For the avoidance of doubt,
+    this trademark restriction does not form part of the License.
+
+    Creative Commons may be contacted at http://creativecommons.org/.
+
diff --git a/Plugins/org.blueberry.ui.qt/resources/fonts/xkcd/xkcd.ttf b/Plugins/org.blueberry.ui.qt/resources/fonts/xkcd/xkcd.ttf
new file mode 100644
index 0000000000..f0eeaeecab
Binary files /dev/null and b/Plugins/org.blueberry.ui.qt/resources/fonts/xkcd/xkcd.ttf differ
diff --git a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
index 5f4399509b..34b9334a3a 100755
--- a/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
+++ b/Plugins/org.blueberry.ui.qt/resources/org_blueberry_ui_qt.qrc
@@ -1,62 +1,66 @@
 <!DOCTYPE RCC><RCC version="1.0">
   <qresource prefix="/org.blueberry.ui.qt">
     <file>cursor_bottom.xpm</file>
     <file>cursor_center.xpm</file>
     <file>cursor_left.xpm</file>
     <file>cursor_offscreen.xpm</file>
     <file>cursor_right.xpm</file>
     <file>cursor_top.xpm</file>
     <file>dialog-error.svg</file>
     <file>icon_missing.png</file>
     <file>tab_close_icon.png</file>
     <file>tab_close_icon-active.png</file>
 
     <file>defaultstyle.qss</file>
     <file>defaultstyle-activetab.qss</file>
     <file>defaultstyle-tab.qss</file>
 
     <file>dark/up_arrow_disabled.png</file>
     <file>dark/Hmovetoolbar.png</file>
     <file>dark/stylesheet-branch-end.png</file>
     <file>dark/branch_closed-on.png</file>
     <file>dark/stylesheet-vline.png</file>
     <file>dark/branch_closed.png</file>
     <file>dark/branch_open-on.png</file>
     <file>dark/transparent.png</file>
     <file>dark/right_arrow_disabled.png</file>
     <file>dark/sizegrip.png</file>
     <file>dark/close.png</file>
     <file>dark/close-hover.png</file>
     <file>dark/close-pressed.png</file>
     <file>dark/down_arrow.png</file>
     <file>dark/Vmovetoolbar.png</file>
     <file>dark/left_arrow.png</file>
     <file>dark/stylesheet-branch-more.png</file>
     <file>dark/up_arrow.png</file>
     <file>dark/right_arrow.png</file>
     <file>dark/left_arrow_disabled.png</file>
     <file>dark/Hsepartoolbar.png</file>
     <file>dark/branch_open.png</file>
     <file>dark/Vsepartoolbar.png</file>
     <file>dark/down_arrow_disabled.png</file>
     <file>dark/undock.png</file>
     <file>dark/checkbox_checked_disabled.png</file>
     <file>dark/checkbox_checked_focus.png</file>
     <file>dark/checkbox_checked.png</file>
     <file>dark/checkbox_indeterminate.png</file>
     <file>dark/checkbox_indeterminate_focus.png</file>
     <file>dark/checkbox_unchecked_disabled.png</file>
     <file>dark/checkbox_unchecked_focus.png</file>
     <file>dark/checkbox_unchecked.png</file>
     <file>dark/radio_checked_disabled.png</file>
     <file>dark/radio_checked_focus.png</file>
     <file>dark/radio_checked.png</file>
     <file>dark/radio_unchecked_disabled.png</file>
     <file>dark/radio_unchecked_focus.png</file>
     <file>dark/radio_unchecked.png</file>
 
     <file>darkStyle2017.qss</file>
     <file>darkStyle2017-tab.qss</file>
     <file>darkStyle2017-activetab.qss</file>
+
+    <file>fonts/FiraSans/FiraSans.ttf</file>
+    <file>fonts/Roboto/Roboto.ttf</file>
+    <file>fonts/xkcd/xkcd.ttf</file>
   </qresource>
 </RCC>
diff --git a/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h b/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h
index 32e66e76d4..3c011d72a2 100644
--- a/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h
+++ b/Plugins/org.blueberry.ui.qt/src/berryIQtStyleManager.h
@@ -1,109 +1,113 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYIQTSTYLEMANAGER_H_
 #define BERRYIQTSTYLEMANAGER_H_
 
 #include <QString>
 #include <QList>
 #include <QtPlugin>
 
 #include <org_blueberry_ui_qt_Export.h>
 
 namespace berry {
 
 struct BERRY_UI_QT IQtStyleManager
 {
 
   struct Style {
     QString name;
     QString fileName;
 
     Style() {}
 
     Style(const QString& name, const QString& fn)
     : name(name), fileName(fn) {}
 
     Style& operator=(const Style& s)
     {
       this->name = s.name;
       this->fileName = s.fileName;
       return *this;
     }
 
     bool operator<(const Style& s) const
     { return name < s.name; }
 
     bool operator==(const Style& s) const
     { return name == s.name; }
   };
 
   struct IconTheme {
     QString name;
 
     IconTheme() {}
 
     IconTheme(const QString& name)
     : name(name) {}
 
     IconTheme& operator=(const IconTheme& s)
     {
       this->name = s.name;
       return *this;
     }
 
     bool operator<(const IconTheme& s) const
     { return name < s.name; }
 
     bool operator==(const IconTheme& s) const
     { return name == s.name; }
   };
 
   typedef QList<Style> StyleList;
   typedef QList<IconTheme> IconThemeList;
 
   virtual ~IQtStyleManager();
 
   virtual Style GetStyle() const = 0;
   virtual QString GetStylesheet() const = 0;
   virtual QString GetActiveTabStylesheet() const = 0;
   virtual QString GetTabStylesheet() const = 0;
+  virtual QString GetFont() const = 0;
 
   virtual void AddStyle(const QString& styleFileName, const QString& styleName = QString()) = 0;
   virtual void AddStyles(const QString& path) = 0;
   virtual void RemoveStyle(const QString& styleFileName) = 0;
   virtual void RemoveStyles(const QString& repository = QString()) = 0;
 
   virtual void GetStyles(StyleList& styles) const = 0;
   virtual void SetStyle(const QString& fileName) = 0;
 
+  virtual void GetFonts(QStringList& fontNames) const = 0;
+  virtual void SetFont(const QString& fontName) = 0;
+
   virtual Style GetDefaultStyle() const = 0;
   virtual void SetDefaultStyle() = 0;
 
   virtual void GetIconThemes(IconThemeList& iconThemes) const = 0;
 
   virtual void SetIconTheme(const QString& themeName) = 0;
 
   virtual bool Contains(const QString& fileName) const = 0;
 
 };
 
 }
 
 Q_DECLARE_INTERFACE(berry::IQtStyleManager, "org.blueberry.service.IQtStyleManager")
 
 #endif /* BERRYIQTSTYLEMANAGER_H_ */
diff --git a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp
index 2a999c75a0..40cab297f6 100644
--- a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp
+++ b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.cpp
@@ -1,347 +1,391 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtStyleManager.h"
 
 #include <QApplication>
 #include <QFile>
 #include <QTextStream>
 #include <QFileInfo>
 #include <QStringList>
 #include <QDirIterator>
+#include <QFont>
+#include <QFontDatabase>
 #include <QIcon>
 
 #include <berryLog.h>
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 #include <berryIPreferencesService.h>
 #include <berryIPreferences.h>
 
 #include "berryQtPreferences.h"
 #include "berryWorkbenchPlugin.h"
 
 namespace berry
 {
 
 QtStyleManager::QtStyleManager()
 {
   AddDefaultStyle();
+  AddDefaultFonts();
   ReadPreferences();
 }
 
 void QtStyleManager::ReadPreferences()
 {
   IPreferencesService* prefService = WorkbenchPlugin::GetDefault()->GetPreferencesService();
   IPreferences::Pointer stylePref = prefService->GetSystemPreferences()->Node(QtPreferences::QT_STYLES_NODE);
 
   QString paths = stylePref->Get(QtPreferences::QT_STYLE_SEARCHPATHS, "");
   QStringList pathList = paths.split(";", QString::SkipEmptyParts);
   QStringListIterator it(pathList);
   while (it.hasNext())
   {
     AddStyles(it.next());
   }
 
   QString styleName = stylePref->Get(QtPreferences::QT_STYLE_NAME, "");
   // if a style is contributed via the Qt resource mechanism, it may not be
   // registered yet.
   if (Contains(styleName))
     // do not update the style in the QApplication instance,
     // since it might not be created yet
     SetStyle(styleName, false);
   else
     SetDefaultStyle(false);
 }
 
 QtStyleManager::~QtStyleManager()
 {
   for (FileNameToStyleMap::const_iterator i = styles.begin(); i != styles.end(); ++i)
   {
     delete i.value();
   }
 }
 
 void QtStyleManager::AddDefaultStyle()
 {
 #ifndef _APPLE_
   AddStyle(":/org.blueberry.ui.qt/defaultstyle.qss", "Default");
   AddStyle(":/org.blueberry.ui.qt/darkStyle2017.qss", "Dark");
   defaultStyle = styles[":/org.blueberry.ui.qt/defaultstyle.qss"];
 #endif
 }
 
+void QtStyleManager::AddDefaultFonts()
+{
+  m_customFontNames.append(QString("<<system>>"));
+  AddFont(QString(":/org.blueberry.ui.qt/fonts/FiraSans/FiraSans.ttf"), QString("Fira Sans"));
+  AddFont(QString(":/org.blueberry.ui.qt/fonts/Roboto/Roboto.ttf"), QString("Roboto"));
+  AddFont(QString(":/org.blueberry.ui.qt/fonts/xkcd/xkcd.ttf"), QString("xkcd"));
+}
+
 void QtStyleManager::ClearStyles()
 {
   for (FileNameToStyleMap::iterator i = styles.begin(); i != styles.end(); )
   {
     if (!i.value()->fileName.startsWith(':'))
     {
       delete i.value();
       i = styles.erase(i);
     }
     else ++i;
   }
   SetDefaultStyle();
 }
 
 QtStyleManager::Style QtStyleManager::GetStyle() const
 {
   return Style(currentStyle->name, currentStyle->fileName);
 }
 
 QString QtStyleManager::GetStylesheet() const
 {
   return currentStyle->stylesheet;
 }
 
 QString QtStyleManager::GetActiveTabStylesheet() const
 {
   return currentStyle->activeTabStylesheet;
 }
 
 QString QtStyleManager::GetTabStylesheet() const
 {
   return currentStyle->tabStylesheet;
 }
 
 void QtStyleManager::AddStyle(const QString& styleFileName,
     const QString& styleName)
 {
-  auto   newStyle = new ExtStyle();
+  auto newStyle = new ExtStyle();
 
   if (styleName.isEmpty())
   {
     QFileInfo info(styleFileName);
     newStyle->name = info.completeBaseName();
   }
   else
   {
     newStyle->name = styleName;
   }
 
   newStyle->fileName = styleFileName;
 
   styles.insert(newStyle->fileName, newStyle);
 }
 
+void QtStyleManager::AddFont(const QString& fontFilePath,
+    const QString& fontName)
+{
+  QFontDatabase::addApplicationFont(fontFilePath);
+  m_customFontNames.push_back(fontName);
+}
+
+void QtStyleManager::GetFonts(QStringList& fontNames) const
+{
+  fontNames = m_customFontNames;
+}
+
+QString QtStyleManager::GetFont() const
+{
+  return currentFont;
+}
+
 void QtStyleManager::AddStyles(const QString& path)
 {
   QDirIterator dirIt(path);
   while (dirIt.hasNext())
   {
     QString current = dirIt.next();
     QFileInfo info = dirIt.fileInfo();
     if (info.isFile() && info.isReadable())
     {
       QString fileName = info.fileName();
       if (fileName.endsWith("-tab.qss") || fileName.endsWith("-activetab.qss"))
         continue;
 
       if (fileName.endsWith(".qss"))
         AddStyle(current);
     }
   }
 }
 
 void QtStyleManager::ReadStyleData(ExtStyle* style)
 {
   QString tabStyleFileName(style->fileName);
   QString activeTabStyleFileName(style->fileName);
 
   int index = style->fileName.lastIndexOf(".qss");
   tabStyleFileName.replace(index, 4, "-tab.qss");
   activeTabStyleFileName.replace(index, 4, "-activetab.qss");
 
   QFile styleFile(style->fileName);
   if (styleFile.open(QIODevice::ReadOnly))
   {
     QTextStream in(&styleFile);
     style->stylesheet = in.readAll();
   }
   else
   {
     BERRY_WARN << "Could not read " << style->fileName.toStdString();
   }
 
   QFile tabStyleFile(tabStyleFileName);
   if (tabStyleFile.open(QIODevice::ReadOnly))
   {
     QTextStream in(&tabStyleFile);
     style->tabStylesheet = in.readAll();
   }
   else
   {
     BERRY_WARN << "Could not read " << tabStyleFileName.toStdString();
   }
 
   QFile activeTabStyleFile(activeTabStyleFileName);
   if (activeTabStyleFile.open(QIODevice::ReadOnly))
   {
     QTextStream in(&activeTabStyleFile);
     style->activeTabStylesheet = in.readAll();
   }
   else
   {
     BERRY_WARN << "Could not read " << activeTabStyleFileName.toStdString();
   }
 }
 
 void QtStyleManager::RemoveStyle(const QString& styleFileName)
 {
   if (currentStyle->fileName == styleFileName)
   {
     SetDefaultStyle();
   }
 
   delete styles.take(styleFileName);
 }
 
 void QtStyleManager::RemoveStyles(const QString& repo)
 {
   if (repo.isEmpty())
   {
     ClearStyles();
     return;
   }
 
   for (FileNameToStyleMap::iterator i = styles.begin(); i != styles.end();)
   {
     ExtStyle* style = i.value();
     QFileInfo info(style->fileName);
     if (info.absolutePath() == repo)
     {
       if (style->name == currentStyle->name)
       {
         SetDefaultStyle();
       }
 
       i = styles.erase(i);
       delete style;
     }
     else
     {
       ++i;
     }
   }
 }
 
 void QtStyleManager::GetStyles(StyleList& styleNames) const
 {
   for (FileNameToStyleMap::const_iterator i = styles.begin(); i != styles.end(); ++i)
     styleNames.push_back(Style(i.value()->name, i.value()->fileName));
 }
 
 void QtStyleManager::GetIconThemes(IconThemeList& iconThemes) const
 {
   iconThemes.clear();
   iconThemes.push_back(IconTheme(QString( "<<default>>" )));
 
   QStringList iconSearchPaths = QIcon::themeSearchPaths();
 
   for(QStringList::Iterator pathIt = iconSearchPaths.begin(); pathIt != iconSearchPaths.end(); ++pathIt)
   {
     QDirIterator dirIt(*pathIt);
     while (dirIt.hasNext())
     {
       QString current = dirIt.next();
       QFileInfo info = dirIt.fileInfo();
       if (info.isDir() && info.isReadable())
       {
         QFileInfo themeFile( info.filePath() + QString("/index.theme") );
         if( themeFile.exists() && themeFile.isFile() && themeFile.isReadable() )
         {
           QString fileName = info.fileName();
           iconThemes.push_back( IconTheme(fileName) );
         }
       }
     }
   }
 }
 
 void QtStyleManager::SetStyle(const QString& fileName)
 {
   SetStyle(fileName, true);
 }
 
 void QtStyleManager::SetStyle(const QString& fileName, bool update)
 {
   if (fileName.isEmpty())
   {
     SetDefaultStyle();
     return;
   }
 
   FileNameToStyleMap::const_iterator i = styles.find(fileName);
 
   ExtStyle* style = nullptr;
   if (i == styles.end())
   {
     BERRY_WARN << "Style " + fileName.toStdString() << " does not exist";
     style = defaultStyle;
   }
   else
   {
     style = i.value();
   }
   currentStyle = style;
 
   ReadStyleData(style);
 
   if (update)
   {
     qApp->setStyleSheet(currentStyle->stylesheet);
     PlatformUI::GetWorkbench()->UpdateTheme();
   }
 }
 
+void QtStyleManager::SetFont(const QString& fontName)
+{
+  if( fontName == QString( "<<system>>" ) ||  fontName == QString( "" ))
+  {
+    qApp->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
+  }
+  else
+  {
+    QFont font(fontName, 11);
+    qApp->setFont(font);
+  }
+  currentFont = fontName;
+  qApp->setStyleSheet(currentStyle->stylesheet);
+  PlatformUI::GetWorkbench()->UpdateTheme();
+}
+
 void QtStyleManager::SetIconTheme(const QString& themeName)
 {
   if( themeName == QString( "<<default>>" ) )
   {
     SetIconTheme( QString("tango"), true);
   }
   else
   {
     SetIconTheme(themeName, true);
   }
 }
 
 void QtStyleManager::SetIconTheme(const QString& themeName, bool /*update*/)
 {
   QIcon::setThemeName( themeName );
 }
 
 QtStyleManager::Style QtStyleManager::GetDefaultStyle() const
 {
   return Style(defaultStyle->name, defaultStyle->fileName);
 }
 
 void QtStyleManager::SetDefaultStyle()
 {
   SetDefaultStyle(true);
 }
 
 void QtStyleManager::SetDefaultStyle(bool update)
 {
   SetStyle(defaultStyle->fileName, update);
 }
 
 bool QtStyleManager::Contains(const QString& fileName) const
 {
   return styles.contains(fileName);
 }
 
 }
diff --git a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h
index bcbde675c4..0b7c6c9c8f 100644
--- a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h
+++ b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStyleManager.h
@@ -1,91 +1,102 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTSTYLEMANAGER_H_
 #define BERRYQTSTYLEMANAGER_H_
 
 #include "berryIQtStyleManager.h"
 
 #include <QHash>
 
 namespace berry {
 
 class QtStyleManager : public QObject, public IQtStyleManager
 {
   Q_OBJECT
   Q_INTERFACES(berry::IQtStyleManager)
 
 public:
 
   QtStyleManager();
   ~QtStyleManager();
 
   Style GetStyle() const override;
   QString GetStylesheet() const override;
   QString GetActiveTabStylesheet() const override;
   QString GetTabStylesheet() const override;
+  QString GetFont() const override;
 
-  void AddStyle(const QString& styleFileName, const QString& styleName = QString()) override;
+  void AddStyle(const QString& styleFileName,
+                const QString& styleName = QString()) override;
   void AddStyles(const QString& path) override;
   void RemoveStyle(const QString& styleFileName) override;
   void RemoveStyles(const QString& path = QString()) override;
 
   void GetStyles(StyleList& styles) const override;
   void SetStyle(const QString& fileName) override;
 
+  void AddFont(const QString& fontFilePath,
+               const QString& fontName);
+
+  void GetFonts(QStringList& fontNames) const override;
+  void SetFont(const QString& fontName) override;
+
   Style GetDefaultStyle() const override;
   void SetDefaultStyle() override;
 
   void GetIconThemes(IconThemeList& iconThemes) const override;
 
   void SetIconTheme(const QString& themeName) override;
 
   bool Contains(const QString& fileName) const override;
 
   bool IsA( const std::type_info& type ) const;
   const std::type_info& GetType() const;
 
 private:
 
   void AddDefaultStyle();
+  void AddDefaultFonts();
   void ClearStyles();
   void ReadPreferences();
 
   void SetStyle(const QString& fileName, bool update);
   void SetDefaultStyle(bool update);
 
   void SetIconTheme(const QString& themeName, bool update);
 
   struct ExtStyle : public Style
   {
     QString stylesheet;
     QString tabStylesheet;
     QString activeTabStylesheet;
   };
 
+  QStringList m_customFontNames;
   void ReadStyleData(ExtStyle* style);
 
   typedef QHash<QString, ExtStyle*> FileNameToStyleMap;
   FileNameToStyleMap styles;
 
+  QString currentFont;
   ExtStyle const* currentStyle;
   ExtStyle* defaultStyle;
 
 };
 }
 
 #endif /* BERRYQTSTYLEMANAGER_H_ */
diff --git a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
index 7f8a7186c3..839928566e 100644
--- a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
+++ b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.cpp
@@ -1,247 +1,269 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "berryQtStylePreferencePage.h"
 
 #include <berryIPreferencesService.h>
 #include <berryQtPreferences.h>
 
 #include "berryWorkbenchPlugin.h"
 
 #include <QFileDialog>
 #include <QDirIterator>
+#include <QFontDatabase>
 
 namespace berry
 {
 
 QtStylePreferencePage::QtStylePreferencePage()
 {
 
 }
 
 void QtStylePreferencePage::Init(IWorkbench::Pointer )
 {
 
 }
 
 void QtStylePreferencePage::CreateQtControl(QWidget* parent)
 {
   mainWidget = new QWidget(parent);
   controls.setupUi(mainWidget);
 
   berry::IPreferencesService* prefService = berry::WorkbenchPlugin::GetDefault()->GetPreferencesService();
 
   ctkPluginContext* context = berry::WorkbenchPlugin::GetDefault()->GetPluginContext();
   ctkServiceReference styleManagerRef = context->getServiceReference<berry::IQtStyleManager>();
   if (styleManagerRef)
   {
     styleManager = context->getService<berry::IQtStyleManager>(styleManagerRef);
   }
 
   m_StylePref = prefService->GetSystemPreferences()->Node(berry::QtPreferences::QT_STYLES_NODE);
 
   Update();
 
   connect(controls.m_StylesCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(StyleChanged(int)));
+  connect(controls.m_FontComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(FontChanged(int)));
   connect(controls.m_IconThemeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(IconThemeChanged(int)));
   connect(controls.m_PathList, SIGNAL(itemSelectionChanged()), this, SLOT(UpdatePathListButtons()));
   connect(controls.m_AddButton, SIGNAL(clicked(bool)), this, SLOT(AddPathClicked(bool)));
   connect(controls.m_EditButton, SIGNAL(clicked(bool)), this, SLOT(EditPathClicked(bool)));
   connect(controls.m_RemoveButton, SIGNAL(clicked(bool)), this, SLOT(RemovePathClicked(bool)));
 }
 
 void QtStylePreferencePage::FillStyleCombo(const berry::IQtStyleManager::Style& currentStyle)
 {
   controls.m_StylesCombo->clear();
   styles.clear();
   styleManager->GetStyles(styles);
 
   qSort(styles);
   for (int i = 0; i < styles.size(); ++i)
   {
     controls.m_StylesCombo->addItem(styles.at(i).name, QVariant(styles.at(i).fileName));
   }
   controls.m_StylesCombo->setCurrentIndex(styles.indexOf(currentStyle));
 }
 
+void QtStylePreferencePage::FillFontCombo(const QString& currentFont)
+{
+  controls.m_FontComboBox->clear();
+  QStringList fonts;
+  styleManager->GetFonts(fonts);
+
+  for (int i = 0; i < fonts.size(); ++i)
+  {
+    controls.m_FontComboBox->addItem(fonts.at(i));
+  }
+  controls.m_FontComboBox->setCurrentIndex(fonts.indexOf(currentFont));
+}
+
 void QtStylePreferencePage::FillIconThemeComboBox(const QString currentIconTheme)
 {
   controls.m_IconThemeComboBox->clear();
   berry::IQtStyleManager::IconThemeList iconThemes;
   styleManager->GetIconThemes(iconThemes);
 
   qSort(iconThemes);
   for (int i = 0; i < iconThemes.size(); ++i)
   {
     controls.m_IconThemeComboBox->addItem(iconThemes.at(i).name);
   }
 
   QString currentTheme = currentIconTheme;
 
   if(currentTheme == QString(""))
   {
     currentTheme = QString("<<default>>");
   }
 
   controls.m_IconThemeComboBox->setCurrentIndex(iconThemes.indexOf( currentTheme ));
 }
 
 void QtStylePreferencePage::AddPath(const QString& path, bool updateCombo)
 {
   if (!controls.m_PathList->findItems(path, Qt::MatchCaseSensitive).isEmpty()) return;
 
   new QListWidgetItem(path, controls.m_PathList);
 
   styleManager->AddStyles(path);
 
   if (updateCombo)
     FillStyleCombo(oldStyle);
 }
 
 void QtStylePreferencePage::StyleChanged(int /*index*/)
 {
   QString fileName = controls.m_StylesCombo->itemData(controls.m_StylesCombo->currentIndex()).toString();
   styleManager->SetStyle(fileName);
 }
 
+void QtStylePreferencePage::FontChanged(int /*index*/)
+{
+  QString fontName = controls.m_FontComboBox->currentText();
+  styleManager->SetFont(fontName);
+}
+
 void QtStylePreferencePage::IconThemeChanged(int /*index*/)
 {
   QString themeName = controls.m_IconThemeComboBox->currentText();
   styleManager->SetIconTheme(themeName);
 }
 
 void QtStylePreferencePage::AddPathClicked(bool /*checked*/)
 {
   QListWidgetItem* item = controls.m_PathList->currentItem();
   QString initialDir;
   if (item) initialDir = item->text();
   QString dir = QFileDialog::getExistingDirectory(mainWidget, "", initialDir);
 
   if (!dir.isEmpty()) this->AddPath(dir, true);
 }
 
 void QtStylePreferencePage::RemovePathClicked(bool /*checked*/)
 {
   QList<QListWidgetItem*> selection = controls.m_PathList->selectedItems();
   QListIterator<QListWidgetItem*> it(selection);
   while (it.hasNext())
   {
     QListWidgetItem* item = it.next();
     QString dir = item->text();
 
     controls.m_PathList->takeItem(controls.m_PathList->row(item));
     delete item;
     styleManager->RemoveStyles(dir);
   }
 
   if (!styleManager->Contains(oldStyle.fileName))
   {
     oldStyle = styleManager->GetDefaultStyle();
   }
 
   FillStyleCombo(oldStyle);
 }
 
 void QtStylePreferencePage::EditPathClicked(bool checked)
 {
   QListWidgetItem* item = controls.m_PathList->currentItem();
   QString initialDir = item->text();
   QString dir = QFileDialog::getExistingDirectory(mainWidget, "", initialDir);
 
   if (!dir.isEmpty())
   {
     this->RemovePathClicked(checked);
     this->AddPath(dir, true);
   }
 }
 
 void QtStylePreferencePage::UpdatePathListButtons()
 {
   int s = controls.m_PathList->selectedItems().size();
 
   if (s == 0)
   {
     controls.m_EditButton->setEnabled(false);
     controls.m_RemoveButton->setEnabled(false);
   }
   else if (s == 1)
   {
     controls.m_EditButton->setEnabled(true);
     controls.m_RemoveButton->setEnabled(true);
   }
   else
   {
     controls.m_EditButton->setEnabled(false);
     controls.m_RemoveButton->setEnabled(true);
   }
 }
 
 QWidget* QtStylePreferencePage::GetQtControl() const
 {
   return mainWidget;
 }
 
 bool QtStylePreferencePage::PerformOk()
 {
   m_StylePref->Put(berry::QtPreferences::QT_STYLE_NAME,
       controls.m_StylesCombo->itemData(controls.m_StylesCombo->currentIndex()).toString());
 
   QString paths;
   for (int i = 0; i < controls.m_PathList->count(); ++i)
   {
     QString path = controls.m_PathList->item(i)->text() + ";";
     paths += path;
   }
 
   QString currentTheme = QIcon::themeName();
   if(currentTheme.isEmpty())
   {
     currentTheme = QString("<<default>>");
   }
   m_StylePref->Put(berry::QtPreferences::QT_STYLE_SEARCHPATHS, paths);
   m_StylePref->Put(berry::QtPreferences::QT_ICON_THEME, currentTheme);
   return true;
 }
 
 void QtStylePreferencePage::PerformCancel()
 {
   Update();
 }
 
 void QtStylePreferencePage::Update()
 {
   styleManager->RemoveStyles();
 
   QString paths = m_StylePref->Get(berry::QtPreferences::QT_STYLE_SEARCHPATHS, "");
   QStringList pathList = paths.split(";", QString::SkipEmptyParts);
   QStringListIterator it(pathList);
   while (it.hasNext())
   {
     AddPath(it.next(), false);
   }
 
   QString iconTheme = m_StylePref->Get(berry::QtPreferences::QT_ICON_THEME, "<<default>>");
   styleManager->SetIconTheme( iconTheme );
 
   QString name = m_StylePref->Get(berry::QtPreferences::QT_STYLE_NAME, "");
   styleManager->SetStyle(name);
   oldStyle = styleManager->GetStyle();
 
   FillStyleCombo(oldStyle);
   FillIconThemeComboBox( iconTheme );
+  FillFontCombo(styleManager->GetFont()); // TODO // TODO // TODO
 }
 
 }
diff --git a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
index f83f84d622..a67ebcff55 100644
--- a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
+++ b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.h
@@ -1,81 +1,83 @@
 /*===================================================================
 
 BlueBerry Platform
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef BERRYQTSTYLEPREFERENCEPAGE_H_
 #define BERRYQTSTYLEPREFERENCEPAGE_H_
 
 #include <berryIQtPreferencePage.h>
 #include <berryIQtStyleManager.h>
 #include <berryIPreferences.h>
 
 #include <ui_berryQtStylePreferencePage.h>
 
 #include <QStringList>
 
 namespace berry {
 
 class QtStylePreferencePage : public QObject, public IQtPreferencePage
 {
 
   Q_OBJECT
   Q_INTERFACES(berry::IPreferencePage)
 
 public:
 
   QtStylePreferencePage();
 
   void Init(IWorkbench::Pointer workbench) override;
 
   void CreateQtControl(QWidget* parent) override;
   QWidget* GetQtControl() const override;
 
   bool PerformOk() override;
   void PerformCancel() override;
   void Update() override;
 
 protected:
 
   void AddPath(const QString& path, bool updateCombo);
   void FillStyleCombo(const berry::IQtStyleManager::Style& currentStyle);
   void FillIconThemeComboBox(const QString currentIconTheme);
+  void FillFontCombo(const QString& currentFont);
 
 protected slots:
 
   void StyleChanged(int /*index*/);
   void IconThemeChanged(int /*index*/);
+  void FontChanged(int /*index*/);
   void AddPathClicked(bool /*checked*/);
   void RemovePathClicked(bool /*checked*/);
   void EditPathClicked(bool checked);
 
   void UpdatePathListButtons();
 
 private:
 
   berry::IQtStyleManager* styleManager;
 
   Ui::QtStylePreferencePageUI controls;
   berry::IPreferences::Pointer m_StylePref;
   berry::IQtStyleManager::Style oldStyle;
 
   berry::IQtStyleManager::StyleList styles;
 
   QWidget* mainWidget;
 };
 
 }
 
 #endif /* BERRYQTSTYLEPREFERENCEPAGE_H_ */
diff --git a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui
index a3f939dbce..40296a3ae2 100644
--- a/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui
+++ b/Plugins/org.blueberry.ui.qt/src/internal/berryQtStylePreferencePage.ui
@@ -1,166 +1,195 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtStylePreferencePageUI</class>
  <widget class="QWidget" name="QtStylePreferencePageUI">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>348</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QFrame" name="frame">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <property name="lineWidth">
       <number>1</number>
      </property>
      <property name="midLineWidth">
       <number>0</number>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Active Style Theme</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QComboBox" name="m_StylesCombo">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="m_IconThemeFrame">
      <property name="frameShape">
       <enum>QFrame::Panel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
        <widget class="QLabel" name="m_IconThemeLabel">
         <property name="text">
          <string>Active Icon Theme</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QComboBox" name="m_IconThemeComboBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
           <horstretch>1</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QFrame" name="m_FontFrame">
+     <property name="frameShape">
+      <enum>QFrame::Panel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_4">
+      <item>
+       <widget class="QLabel" name="m_FontLabel">
+        <property name="text">
+         <string>Active Font</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="m_FontComboBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>10</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Style Search Paths</string>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QListWidget" name="m_PathList">
        <property name="selectionMode">
         <enum>QAbstractItemView::ExtendedSelection</enum>
        </property>
        <property name="sortingEnabled">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QPushButton" name="m_AddButton">
          <property name="text">
           <string>Add...</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="m_EditButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
           <string>Edit...</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="m_RemoveButton">
          <property name="enabled">
           <bool>false</bool>
          </property>
          <property name="text">
           <string>Remove</string>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>