diff --git a/.env.example b/.env.example
index f233a46556cd..2d1db72861cc 100644
--- a/.env.example
+++ b/.env.example
@@ -29,7 +29,6 @@ PHANTOMJS_CLOUD_KEY='a-demo-key-with-low-quota-per-ip-address'
 LOG=single
 REQUIRE_HTTPS=false
 API_SECRET=password
-#CUSTOM_MODULES=
 
 #TRUSTED_PROXIES=
 
diff --git a/app/Libraries/ModuleUtils.php b/app/Libraries/ModuleUtils.php
deleted file mode 100644
index 53db3f23090a..000000000000
--- a/app/Libraries/ModuleUtils.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php namespace App\Libraries;
-
-class ModuleUtils
-{
-    public static function loadModules()
-    {
-        $data = [];
-        $modules = env('CUSTOM_MODULES');
-        $modules = explode(',', $modules);
-
-        foreach ($modules as $module) {
-            $info = CurlUtils::get($module . '?action=info');
-            if ($info = json_decode($info)) {
-                $info->url = $module;
-                $data[] = $info;
-            }
-        }
-
-        session(['custom_modules' => $data]);
-
-        return $data;
-    }
-}
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 7ff815970ee1..8c1d8434360a 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -423,14 +423,6 @@
                     'selected' => true,
                 ])
             @endif
-            @if ( ! Utils::isNinjaProd())
-                @if ($modules = session('custom_modules') ?: App\Libraries\ModuleUtils::loadModules())
-                    <li class="divider"></li>
-                    @foreach ($modules as $module)
-                        <li>{{ link_to($module->url, $module->name) }}</li>
-                    @endforeach
-                @endif
-            @endif
             <li class="divider"></li>
             @if (Utils::isAdmin())
               @if (count(session(SESSION_USER_ACCOUNTS)) > 1)
@@ -504,38 +496,49 @@
                 'expenses',
                 'vendors',
                 'settings',
-                //'self-update'
             ] as $option)
-            @if (in_array($option, ['dashboard', 'settings'])
-                || Auth::user()->can('view', substr($option, 0, -1))
-                || Auth::user()->can('create', substr($option, 0, -1)))
-            <li class="{{ Request::is("{$option}*") ? 'active' : '' }}">
-                @if ($option == 'settings')
-                    <a type="button" class="btn btn-default btn-sm pull-right"
-                        href="{{ Utils::getDocsUrl(request()->path()) }}" target="_blank">
-                        <i class="fa fa-question-circle" style="width:20px" title="{{ trans('texts.help') }}"></i>
-                    </a>
-                @elseif ($option != 'dashboard')
-                    @if (Auth::user()->can('create', substr($option, 0, -1)))
-                        <a type="button" class="btn btn-primary btn-sm pull-right"
-                            href="{{ url("/{$option}/create") }}">
-                            <i class="fa fa-plus-circle" style="width:20px" title="{{ trans('texts.create_new') }}"></i>
+                @if (in_array($option, ['dashboard', 'settings'])
+                    || Auth::user()->can('view', substr($option, 0, -1))
+                    || Auth::user()->can('create', substr($option, 0, -1)))
+                <li class="{{ Request::is("{$option}*") ? 'active' : '' }}">
+                    @if ($option == 'settings')
+                        <a type="button" class="btn btn-default btn-sm pull-right"
+                            href="{{ Utils::getDocsUrl(request()->path()) }}" target="_blank">
+                            <i class="fa fa-question-circle" style="width:20px" title="{{ trans('texts.help') }}"></i>
                         </a>
+                    @elseif ($option != 'dashboard')
+                        @if (Auth::user()->can('create', substr($option, 0, -1)))
+                            <a type="button" class="btn btn-primary btn-sm pull-right"
+                                href="{{ url("/{$option}/create") }}">
+                                <i class="fa fa-plus-circle" style="width:20px" title="{{ trans('texts.create_new') }}"></i>
+                            </a>
+                        @endif
                     @endif
+                    <a href="{{ url($option == 'recurring' ? 'recurring_invoice' : $option) }}"
+                        style="font-size:16px; padding-top:6px; padding-bottom:6px"
+                        class="{{ Request::is("{$option}*") ? 'active' : '' }}">
+                        <i class="fa fa-{{ \App\Models\EntityModel::getIcon($option) }}" style="width:46px; padding-right:10px"></i>
+                        {{ ($option == 'recurring_invoices') ? trans('texts.recurring') : trans("texts.{$option}") }}
+                        {!! Utils::isTrial() && in_array($option, ['quotes', 'tasks', 'expenses', 'vendors']) ? '&nbsp;<sup>' . trans('texts.pro') . '</sup>' : '' !!}
+                        @if (false && $option == 'self-update' && Updater::source()->isNewVersionAvailable('v'.NINJA_VERSION))
+                            <span class="badge alert-danger">1</span>
+                        @endif
+                    </a>
+                </li>
                 @endif
-                <a href="{{ url($option == 'recurring' ? 'recurring_invoice' : $option) }}"
-                    style="font-size:16px; padding-top:6px; padding-bottom:6px"
-                    class="{{ Request::is("{$option}*") ? 'active' : '' }}">
-                    <i class="fa fa-{{ \App\Models\EntityModel::getIcon($option) }}" style="width:46px; padding-right:10px"></i>
-                    {{ ($option == 'recurring_invoices') ? trans('texts.recurring') : trans("texts.{$option}") }}
-                    {!! Utils::isTrial() && in_array($option, ['quotes', 'tasks', 'expenses', 'vendors']) ? '&nbsp;<sup>' . trans('texts.pro') . '</sup>' : '' !!}
-                    @if (false && $option == 'self-update' && Updater::source()->isNewVersionAvailable('v'.NINJA_VERSION))
-                        <span class="badge alert-danger">1</span>
-                    @endif
-                </a>
-            </li>
-            @endif
             @endforeach
+            @if ( ! Utils::isNinjaProd())
+                @foreach (Module::all() as $module)
+                    <li class="{{ Request::is("{$module->getAlias()}*") ? 'active' : '' }}">
+                        <a href="{{ url($module->getAlias()) }}"
+                            style="font-size:16px; padding-top:6px; padding-bottom:6px"
+                            class="{{ Request::is("{$module->getAlias()}*") ? 'active' : '' }}">
+                            <i class="fa fa-{{ $module->get('icon', 'th-large') }}" style="width:46px; padding-right:10px"></i>
+                            {{ $module->getName() }}
+                        </a>
+                    </li>
+                @endforeach
+            @endif
         </ul>
     </div>
     <!-- /#left-sidebar-wrapper -->