diff --git a/custom_field_create_modal.php b/custom_field_create_modal.php
new file mode 100644
index 00000000..0468c63a
--- /dev/null
+++ b/custom_field_create_modal.php
@@ -0,0 +1,41 @@
+<div class="modal" id="createCustomFieldModal" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Create <?php echo htmlentities($table); ?> field</h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="table" value="<?php echo htmlentities($table); ?>">
+
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Label <strong class="text-danger">*</strong></label>
+                        <input type="text" class="form-control" name="label" placeholder="Enter a custom field label" required autofocus>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Type <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-th"></i></span>
+                            </div>
+                            <select class="form-control select2" name="type" required>
+                                <option value="">- Select a field type -</option>
+                                <option>Text</option>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="create_custom_field" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Create</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/custom_field_edit_modal.php b/custom_field_edit_modal.php
new file mode 100644
index 00000000..f1cdb882
--- /dev/null
+++ b/custom_field_edit_modal.php
@@ -0,0 +1,40 @@
+<div class="modal" id="editCustomFieldModal<?php echo $custom_field_id; ?>" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content bg-dark">
+            <div class="modal-header">
+                <h5 class="modal-title"><i class="fa fa-fw fa-list mr-2"></i>Editing custom field: <strong><?php echo $custom_field_label; ?></strong></h5>
+                <button type="button" class="close text-white" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <form action="post.php" method="post" autocomplete="off">
+                <input type="hidden" name="custom_field_id" value="<?php echo $custom_field_id; ?>">
+                <div class="modal-body bg-white">
+
+                    <div class="form-group">
+                        <label>Label <strong class="text-danger">*</strong></label>
+                        <input type="text" class="form-control" name="label" value="<?php echo $custom_field_label; ?>" required>
+                    </div>
+
+                    <div class="form-group">
+                        <label>Type <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-th"></i></span>
+                            </div>
+                            <select class="form-control select2" name="type" required>
+                                <option value="">- Select a field type -</option>
+                                <option <?php if($custom_field_type == 'text') { echo "selected"; } ?> value="text">Text</option>
+                            </select>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer bg-white">
+                    <button type="submit" name="edit_custom_field" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Save</button>
+                    <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
diff --git a/database_updates.php b/database_updates.php
index 79c6fe05..99d238ee 100644
--- a/database_updates.php
+++ b/database_updates.php
@@ -987,13 +987,10 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
             `custom_field_id` int(11) NOT NULL AUTO_INCREMENT,
             `custom_field_table` varchar(255) NOT NULL,
             `custom_field_label` varchar(255) NOT NULL,
-            `custom_field_type` varchar(255) NOT NULL DEFAULT 'TEXT',
+            `custom_field_type` varchar(255) NOT NULL DEFAULT 'text',
             `custom_field_location` int(11) NOT NULL DEFAULT 0,
             `custom_field_order` int(11) NOT NULL DEFAULT 999,
-            PRIMARY KEY (`custom_field_id`),
-            UNIQUE KEY (`custom_field_table`),
-            UNIQUE KEY (`custom_field_label`),
-            UNIQUE KEY (`custom_field_type`)
+            PRIMARY KEY (`custom_field_id`)
         )");
 
         mysqli_query($mysqli, "CREATE TABLE `custom_values` (
@@ -1008,8 +1005,7 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) {
             `asset_custom_field_value` int(11) NOT NULL,
             `asset_custom_field_id` int(11) NOT NULL,
             `asset_custom_asset_id` int(11) NOT NULL,
-            PRIMARY KEY (`asset_custom_id`),
-            UNIQUE KEY (`asset_custom_field_id`)
+            PRIMARY KEY (`asset_custom_id`)
         )");
 
         // Then, update the database to the next sequential version
diff --git a/db.sql b/db.sql
index 45e7bc11..2e6250e5 100644
--- a/db.sql
+++ b/db.sql
@@ -65,8 +65,7 @@ CREATE TABLE `asset_custom` (
   `asset_custom_field_value` int(11) NOT NULL,
   `asset_custom_field_id` int(11) NOT NULL,
   `asset_custom_asset_id` int(11) NOT NULL,
-  PRIMARY KEY (`asset_custom_id`),
-  UNIQUE KEY `asset_custom_field_id` (`asset_custom_field_id`)
+  PRIMARY KEY (`asset_custom_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -381,13 +380,10 @@ CREATE TABLE `custom_fields` (
   `custom_field_id` int(11) NOT NULL AUTO_INCREMENT,
   `custom_field_table` varchar(255) NOT NULL,
   `custom_field_label` varchar(255) NOT NULL,
-  `custom_field_type` varchar(255) NOT NULL DEFAULT 'TEXT',
+  `custom_field_type` varchar(255) NOT NULL DEFAULT 'text',
   `custom_field_location` int(11) NOT NULL DEFAULT 0,
   `custom_field_order` int(11) NOT NULL DEFAULT 999,
-  PRIMARY KEY (`custom_field_id`),
-  UNIQUE KEY `custom_field_table` (`custom_field_table`),
-  UNIQUE KEY `custom_field_label` (`custom_field_label`),
-  UNIQUE KEY `custom_field_type` (`custom_field_type`)
+  PRIMARY KEY (`custom_field_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1544,4 +1540,4 @@ CREATE TABLE `vendors` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-05-07 19:45:11
+-- Dump completed on 2023-05-07 20:45:03
diff --git a/models/custom_field.php b/models/custom_field.php
new file mode 100644
index 00000000..2cd6fb47
--- /dev/null
+++ b/models/custom_field.php
@@ -0,0 +1,3 @@
+<?php
+$label = sanitizeInput($_POST['label']);
+$type = sanitizeInput($_POST['type']);
diff --git a/post.php b/post.php
index f1341bfb..a70f5dd1 100644
--- a/post.php
+++ b/post.php
@@ -2486,6 +2486,55 @@ if(isset($_GET['delete_category'])){
 
 }
 
+if(isset($_POST['create_custom_field'])){
+
+    require_once('models/custom_field.php');
+
+    $table = sanitizeInput($_POST['table']);
+
+    mysqli_query($mysqli,"INSERT INTO custom_fields SET custom_field_table = '$table', custom_field_label = '$label', custom_field_type = '$type'");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Field', log_action = 'Create', log_description = '$label', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "Custom field created";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if(isset($_POST['edit_custom_field'])){
+
+    require_once('models/custom_field.php');
+
+    $custom_field_id = intval($_POST['custom_field_id']);
+
+    mysqli_query($mysqli,"UPDATE custom_fields SET custom_field_label = '$label', custom_field_type = '$type' WHERE custom_field_id = $custom_field_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Field', log_action = 'Edit', log_description = '$label', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "You edited the custom field";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
+if(isset($_GET['delete_custom_field'])){
+    $custom_field_id = intval($_GET['delete_custom_field']);
+
+    mysqli_query($mysqli,"DELETE FROM custom_fields WHERE custom_field_id = $custom_field_id");
+
+    //Logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Custom Fields', log_action = 'Delete', log_description = '$custom_field_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");
+
+    $_SESSION['alert_message'] = "You deleted custom field";
+    $_SESSION['alert_type'] = "error";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 
 //Tags
 
diff --git a/settings_custom_fields.php b/settings_custom_fields.php
new file mode 100644
index 00000000..a95f8e7e
--- /dev/null
+++ b/settings_custom_fields.php
@@ -0,0 +1,119 @@
+<?php
+
+// Default Column Sortby Filter
+$sb = "custom_field_label";
+$o = "ASC";
+
+require_once("inc_all_settings.php");
+
+if (isset($_GET['table'])) {
+    $table = sanitizeInput($_GET['table']);
+} else {
+    $table = "client_assets";
+}
+
+//Rebuild URL
+$url_query_strings_sb = http_build_query(array_merge($_GET, array('sb' => $sb, 'o' => $o)));
+
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM custom_fields
+    WHERE custom_field_label LIKE '%$q%'
+    AND custom_field_table = '$table'
+    ORDER BY $sb $o LIMIT $record_from, $record_to"
+);
+
+$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
+
+?>
+
+
+    <div class="card card-dark">
+        <div class="card-header py-2">
+            <h3 class="card-title mt-2"><i class="fa fa-fw fa-list mr-2"></i><?php echo htmlentities($table); ?> Fields</h3>
+            <div class="card-tools">
+                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#createCustomFieldModal"><i class="fas fa-plus mr-2"></i>Create</button>
+            </div>
+        </div>
+        <div class="card-body">
+            <form autocomplete="off">
+                <input type="hidden" name="table" value="<?php echo htmlentities($table); ?>">
+                <div class="row">
+                    <div class="col-sm-4 mb-2">
+                        <div class="input-group">
+                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(htmlentities($q)); } ?>" placeholder="Search">
+                            <div class="input-group-append">
+                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-8">
+                        <div class="btn-group float-right">
+                            <a href="?table=client_assets" class="btn <?php if ($table == 'client_assets') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Assets</a>
+                            <a href="?table=clients" class="btn <?php if ($table == 'clients') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Clients</a>
+                        </div>
+                    </div>
+                </div>
+            </form>
+            <hr>
+            <div class="table-responsive-sm">
+                <table class="table table-striped table-borderless table-hover">
+                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                    <tr>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=custom_field_label&o=<?php echo $disp; ?>">Label</a></th>
+                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sb; ?>&sb=custom_field_type&o=<?php echo $disp; ?>">Type</a></th>
+                        <th class="text-center">Action</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php
+
+                    while ($row = mysqli_fetch_array($sql)) {
+                        $custom_field_id = intval($row['custom_field_id']);
+                        $custom_field_label = htmlentities($row['custom_field_label']);
+                        $custom_field_type = htmlentities($row['custom_field_type']);
+                        $custom_field_location = intval($row['custom_field_location']);
+                        $custom_field_order = intval($row['custom_field_order']);
+                        
+                        ?>
+                        <tr>
+                            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editCustomFieldModal<?php echo $custom_field_id; ?>"><?php echo $custom_field_label; ?></a></td>
+                            <td><?php echo $custom_field_type; ?>;"></td>
+                            <td>
+                                <div class="dropdown dropleft text-center">
+                                    <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">
+                                        <i class="fas fa-ellipsis-h"></i>
+                                    </button>
+                                    <div class="dropdown-menu">
+                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editCustomFieldModal<?php echo $custom_field_id; ?>">
+                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                        </a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item text-danger text-bold" href="post.php?delete_custom_field=<?php echo $custom_field_id; ?>">
+                                            <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                        </a>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
+                        <?php
+
+                        //$colors_diff = array_diff($colors_array,$colors_used_array);
+
+                        include("custom_field_edit_modal.php");
+
+                    }
+
+                    ?>
+
+                    </tbody>
+                </table>
+            </div>
+            <?php require_once("pagination.php"); ?>
+        </div>
+    </div>
+
+<?php
+require_once("custom_field_create_modal.php");
+require_once("footer.php");
diff --git a/settings_side_nav.php b/settings_side_nav.php
index 1f555fdb..4bbea8a5 100644
--- a/settings_side_nav.php
+++ b/settings_side_nav.php
@@ -49,6 +49,13 @@
           </a>
         </li>
 
+        <li class="nav-item">
+          <a href="settings_custom_fields.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_custom_fields.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-list"></i>
+            <p>Custom Fields</p>
+          </a>
+        </li>
+
         <li class="nav-item">
           <a href="settings_tags.php" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "settings_tags.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-tag"></i>