diff --git a/mobsf/MobSF/utils.py b/mobsf/MobSF/utils.py
index dcc7bd96c9..ba88e8a89a 100755
--- a/mobsf/MobSF/utils.py
+++ b/mobsf/MobSF/utils.py
@@ -763,13 +763,14 @@ def replace(value, arg):
 
 def relative_path(value):
     """Show relative path to two parents."""
+    sep = None
     if '/' in value:
         sep = '/'
     elif '\\\\' in value:
         sep = '\\\\'
     elif '\\' in value:
         sep = '\\'
-    if value.count(sep) < 2:
+    if not sep or value.count(sep) < 2:
         return value
     path = Path(value)
     return path.relative_to(path.parent.parent).as_posix()
diff --git a/mobsf/StaticAnalyzer/views/common/shared_func.py b/mobsf/StaticAnalyzer/views/common/shared_func.py
index fd86eac656..fba6c7fe6b 100755
--- a/mobsf/StaticAnalyzer/views/common/shared_func.py
+++ b/mobsf/StaticAnalyzer/views/common/shared_func.py
@@ -382,8 +382,10 @@ def scan_library(request, checksum):
         if not is_safe_path(lib_dir.as_posix(), sfile.as_posix()):
             msg = 'Path Traversal Detected!'
             return print_n_send_error_response(request, msg)
-
         ext = sfile.suffix
+        if not ext and 'Frameworks' in relative_path:
+            # Force Dylib on Frameworks
+            ext = '.dylib'
         if not sfile.exists():
             msg = 'Library File not found'
             return print_n_send_error_response(request, msg)
diff --git a/mobsf/StaticAnalyzer/views/ios/static_analyzer.py b/mobsf/StaticAnalyzer/views/ios/static_analyzer.py
index bf513c4997..8cc547646c 100755
--- a/mobsf/StaticAnalyzer/views/ios/static_analyzer.py
+++ b/mobsf/StaticAnalyzer/views/ios/static_analyzer.py
@@ -95,6 +95,9 @@ def static_analyzer_ios(request, checksum, api=False):
                 api)
         file_type = robj[0].SCAN_TYPE
         filename = robj[0].FILE_NAME
+        if file_type == 'dylib' and not Path(filename).suffix:
+            # Force dylib extension on Frameworks
+            filename = f'{filename}.dylib'
         allowed_exts = ('ios', '.ipa', '.zip', '.dylib', '.a')
         allowed_typ = [i.replace('.', '') for i in allowed_exts]
         if (not filename.lower().endswith(allowed_exts)
diff --git a/mobsf/templates/pdf/ios_report.html b/mobsf/templates/pdf/ios_report.html
index c0aca19435..ce8f4219da 100644
--- a/mobsf/templates/pdf/ios_report.html
+++ b/mobsf/templates/pdf/ios_report.html
@@ -516,14 +516,14 @@ <h2><i class="fa fa-braille"></i> IPA BINARY ANALYSIS</h2>
                 </tbody>
                     </table>
         {% endif %}
-
-    {% if dylib_analysis and app_type not in 'A' %}
-        <h2><i class="fa fa-flag"></i> DYNAMIC LIBRARY BINARY ANALYSIS</h2>
+  {% if app_type not in 'A' %}
+    {% if dylib_analysis or framework_analysis %}
+        <h2><i class="fa fa-flag"></i> DYNAMIC LIBRARY & FRAMEWORK BINARY ANALYSIS</h2>
         <table class="basic">
                 <thead>
                     <tr>
                         <th>NO</th>
-                        <th>DYLIB</th>
+                        <th>DYLIB/FRAMEWORK</th>
                         <th>NX</th>
                         <th>STACK CANARY</th>
                         <th>ARC</th>
@@ -568,28 +568,7 @@ <h2><i class="fa fa-flag"></i> DYNAMIC LIBRARY BINARY ANALYSIS</h2>
               <br/>{{dy.symbol.description}}</td>
           </tr>
           {% endfor %}
-                  </tbody>
-                  </table>
-    {% endif %}
-
-    {% if framework_analysis and app_type not in 'A' %}
-    <h2><i class="fa fa-archive"></i> FRAMEWORK BINARY ANALYSIS</h2>
-    <table class="basic">
-            <thead>
-                <tr>
-                    <th>NO</th>
-                    <th>FRAMEWORK</th>
-                    <th>NX</th>
-                    <th>STACK CANARY</th>
-                    <th>ARC</th>
-                    <th>RPATH</th>
-                    <th>CODE SIGNATURE</th>
-                    <th>ENCRYPTED</th>
-                    <th>SYMBOLS STRIPPED</th>
-                </tr>
-            </thead>
-            <tbody>
-      {% for frm in framework_analysis %}
+          {% for frm in framework_analysis %}
       <tr>
         <td>{{ forloop.counter }}</td>
         <td>{{frm.name}}</td>
@@ -623,10 +602,10 @@ <h2><i class="fa fa-archive"></i> FRAMEWORK BINARY ANALYSIS</h2>
           <br/>{{frm.symbol.description}}</td>
       </tr>
       {% endfor %}
-              </tbody>
-              </table>
-   {% endif %}
-
+                  </tbody>
+                  </table>
+    {% endif %}
+  {% endif %}
 <!--static library-->
 {% if app_type in 'A' %}
   <h2><i class="fa fa-flag"></i> STATIC LIBRARY BINARY ANALYSIS</h2>
diff --git a/mobsf/templates/static_analysis/ios_binary_analysis.html b/mobsf/templates/static_analysis/ios_binary_analysis.html
index 15299baed6..a4a8755c5c 100755
--- a/mobsf/templates/static_analysis/ios_binary_analysis.html
+++ b/mobsf/templates/static_analysis/ios_binary_analysis.html
@@ -119,13 +119,7 @@
           <li class="nav-item">
             <a href="#dylib_analysis" class="nav-link">
               <i class="nav-icon fas fa-flag"></i>
-              <p>Dylib Analysis</p>
-            </a>
-          </li>
-          <li class="nav-item">
-            <a href="#framework_analysis" class="nav-link">
-              <i class="nav-icon fa fa-archive"></i>
-              <p>Framework Analysis</p>
+              <p>Dylib & Framework Analysis</p>
             </a>
           </li>
           {% endif %}
@@ -925,7 +919,7 @@ <h5 class="description-header">{{ binary_analysis.summary.suppressed }}</h5>
         <div class="card">
           <div class="card-body">
               <p>
-             <strong><i class="fa fa-flag"></i> DYNAMIC LIBRARY BINARY ANALYSIS</strong>
+             <strong><i class="fa fa-flag"></i> DYNAMIC LIBRARY & FRAMEWORK BINARY ANALYSIS</strong>
              </p>
               <div class="table-responsive">
               <table id="table_dylib" class="table table-bordered table-hover table-striped">
@@ -933,7 +927,7 @@ <h5 class="description-header">{{ binary_analysis.summary.suppressed }}</h5>
                       <tr>
                       {% if app_type not in 'Dylib' %}
                           <th>NO</th>
-                          <th>DYLIB</th>
+                          <th>DYLIB/FRAMEWORK</th>
                       {% endif %}
                           <th>NX</th>
                           <th>STACK CANARY</th>
@@ -945,8 +939,8 @@ <h5 class="description-header">{{ binary_analysis.summary.suppressed }}</h5>
                       </tr>
                   </thead>
                   <tbody>
-            {% if not dylib_analysis %}
-              No Dylibs found.
+            {% if not dylib_analysis and not framework_analysis %}
+              No Dylibs/Frameworks found.
             {% endif %}
              {% for dy in dylib_analysis %}
              <tr>
@@ -986,51 +980,12 @@ <h5 class="description-header">{{ binary_analysis.summary.suppressed }}</h5>
                 <br/>{{dy.symbol.description}}</td>
             </tr>
              {% endfor %}
-                    </tbody>
-                    </table>
-                  </div>
-              
-          </div>
-        </div><!-- /.card -->
-        </div>
-        <!-- end row -->
-        </div>
-    </div>
-</section>
- <!-- ===========================end dylib analysis ================================== -->
- <a id="framework_analysis" class="anchor"></a>
- <section class="content">
-  <div class="container-fluid">
-    <div class="row">
-        <div class="col-lg-12">
-        <div class="card">
-          <div class="card-body">
-              <p>
-             <strong><i class="fa fa-archive"></i> FRAMEWORK BINARY ANALYSIS</strong>
-             </p>
-              <div class="table-responsive">
-              <table id="table_framework" class="table table-bordered table-hover table-striped">
-                  <thead>
-                      <tr>
-                          <th>NO</th>
-                          <th>FRAMEWORK</th>
-                          <th>NX</th>
-                          <th>STACK CANARY</th>
-                          <th>ARC</th>
-                          <th>RPATH</th>
-                          <th>CODE SIGNATURE</th>
-                          <th>ENCRYPTED</th>
-                          <th>SYMBOLS STRIPPED</th>
-                      </tr>
-                  </thead>
-                  <tbody>
-            {% if not framework_analysis %}
-              No Frameworks found.
-            {% endif %}
              {% for frm in framework_analysis %}
              <tr>
               <td>{{ forloop.counter }}</td>
-              <td>{{frm.name}}</td>
+              <td>{{frm.name | relative_path}}</br>
+                <a class="btn btn-primary btn-xs" href="{% url 'scan_library' checksum=md5 %}?library={{ frm.name }}" target="_blank" rel="noopener noreferrer"><i class="fa fa-search"></i> Analyze</a> 
+              </td>
               <td><b>{{frm.nx.has_nx}}</b>
                 <br/>
                 <span class="badge bg-{% if frm.nx.severity == 'high' %}danger{% elif frm.nx.severity == 'warning' %}warning{% else %}info{% endif %}">{{frm.nx.severity}}</span>
@@ -1072,7 +1027,7 @@ <h5 class="description-header">{{ binary_analysis.summary.suppressed }}</h5>
         </div>
     </div>
 </section>
- <!-- ===========================end framework analysis ================================== -->
+ <!-- ===========================end dylib analysis ================================== -->
  {% endif %}
  <!--static library-->
 {% if app_type in 'A' %}