diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index 44c86ae..093a091 100644
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -22,7 +22,7 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table id="accountList" class="table darkred">
-                <caption><?= $this->getHtml('Groups') ?></caption>
+                <caption><?= $this->getHtml('Groups') ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index a595c5f..acd0adf 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -105,7 +105,7 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-6">
         <table id="groupTable" class="box table darkred">
-            <caption><?= $this->getHtml('Groups') ?></caption>
+            <caption><?= $this->getHtml('Groups') ?><i class="fa fa-download floatRight download btn"></i></caption>
             <thead>
                 <tr>
                     <td>
@@ -143,7 +143,7 @@ echo $this->getData('nav')->render(); ?>
 
     <div class="col-xs-12 col-md-6">
         <table class="box table darkred">
-            <caption><?= $this->getHtml('Permissions') ?></caption>
+            <caption><?= $this->getHtml('Permissions') ?><i class="fa fa-download floatRight download btn"></i></caption>
             <thead>
                 <tr>
                     <td>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index 6d3f0d4..6eccc90 100644
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -19,7 +19,7 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <table id="groupList" class="box table darkred">
-            <caption><?= $this->getHtml('Groups') ?></caption>
+            <caption><?= $this->getHtml('Groups') ?><i class="fa fa-download floatRight download btn"></i></caption>
             <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index 2220964..b0112db 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -65,7 +65,7 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <table class="box table darkred wf-100">
-                        <caption><?= $this->getHtml('Accounts') ?></caption>
+                        <caption><?= $this->getHtml('Accounts') ?><i class="fa fa-download floatRight download btn"></i></caption>
                         <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
@@ -100,7 +100,7 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <table id="groupPermissions" class="box table darkred wf-100">
-                        <caption><?= $this->getHtml('Permissions') ?></caption>
+                        <caption><?= $this->getHtml('Permissions') ?><i class="fa fa-download floatRight download btn"></i></caption>
                         <thead>
                             <tr>
                                 <td>
@@ -194,7 +194,7 @@ echo $this->getData('nav')->render(); ?>
             <div class="row">
                 <div class="col-xs-12">
                     <table class="box table darkred wf-100">
-                        <caption><?= $this->getHtml('AuditLog') ?></caption>
+                        <caption><?= $this->getHtml('AuditLog') ?><i class="fa fa-download floatRight download btn"></i></caption>
                         <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', 0, 0); ?>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index 49567f1..bcb4ccf 100644
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -25,7 +25,7 @@ $installed = $this->app->moduleManager->getInstalledModules();
     <div class="col-xs-12">
         <div class="box wf-100">
             <table id="moduleList" class="table darkred">
-                <caption><?= $this->getHtml('Modules') ?></caption>
+                <caption><?= $this->getHtml('Modules') ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', 0, 0); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php
index f43c669..f054ea9 100644
--- a/Theme/Backend/modules-single.tpl.php
+++ b/Theme/Backend/modules-single.tpl.php
@@ -58,19 +58,31 @@ if ($nav !== null) {
                                     <button id="fModuleDeactivateButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::DEACTIVATE ?>"><?= $this->getHtml('Deactivate'); ?></button>
                                 </form>
                             <?php elseif (isset($installed[$id])) : ?>
-                                <form id="fModuleUninstall" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
-                                    <button id="fModuleUninstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::UNINSTALL ?>"><?= $this->getHtml('Uninstall'); ?></button>
-                                </form>
-                                <form id="fModuleActivate" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
-                                    <button id="fModuleActivateButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::ACTIVATE ?>"><?= $this->getHtml('Activate'); ?></button>
-                                </form>
+                                <div class="ipt-wrap">
+                                    <div class="ipt-first">
+                                        <form id="fModuleUninstall" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
+                                            <button id="fModuleUninstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::UNINSTALL ?>"><?= $this->getHtml('Uninstall'); ?></button>
+                                        </form>
+                                    </div>
+                                    <div class="ipt-second">
+                                        <form id="fModuleActivate" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
+                                            <button id="fModuleActivateButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::ACTIVATE ?>"><?= $this->getHtml('Activate'); ?></button>
+                                        </form>
+                                    </div>
+                                </div>
                             <?php elseif (isset($modules[$id])) : ?>
-                                <form id="fModuleInstall" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
-                                    <button id="fModuleInstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::INSTALL ?>"><?= $this->getHtml('Install'); ?></button>
-                                </form>
-                                <form id="fModuleDelete" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
-                                    <button id="fModuleDeleteButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::DELETE ?>"><?= $this->getHtml('Delete'); ?></button>
-                                </form>
+                                <div class="ipt-wrap">
+                                    <div class="ipt-first">
+                                        <form id="fModuleInstall" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
+                                            <button id="fModuleInstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::INSTALL ?>"><?= $this->getHtml('Install'); ?></button>
+                                        </form>
+                                    </div>
+                                    <div class="ipt-second">
+                                        <form id="fModuleDelete" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
+                                            <button id="fModuleDeleteButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::DELETE ?>"><?= $this->getHtml('Delete'); ?></button>
+                                        </form>
+                                    </div>
+                                </div>
                             <?php endif; ?>
                 </table>
             </div>